Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Migrate the merge-conflict UI to @pierre/diffs (#3894)

shagun-singh-inkeepfdf191f3e37b
diff --git a/.changeset/conflict-view-rebuild.md b/.changeset/conflict-view-rebuild.md
new file mode 100644
index 000000000..a217a8197
--- /dev/null
+++ b/.changeset/conflict-view-rebuild.md
@@ -0,0 +1,19 @@
+---
+"@inkeep/open-knowledge": minor
+---
+
+Merge conflicts get a rebuilt resolution view.
+
+Every conflicted region now carries **Accept current**, **Accept incoming**, and **Accept both**, and the differing words inside a region are highlighted, so two long paragraphs that disagree on one clause no longer have to be compared by eye. **Undo** and **Redo** step back and forth through resolutions, and nothing is written until you press **Apply changes**.
+
+**Show original** reveals the version both sides started from. Current-and-incoming alone shows you two endpoints, not two intentions: when a sentence is shorter on one side, that is either someone trimming a clause or you having deleted one, and those call for opposite resolutions while looking identical. The original tells them apart. It stays hidden until asked for, so a conflict still opens as the familiar two-way comparison.
+
+Handing the file to an agent no longer means retyping the request: opening a conflicted document seeds the Ask AI composer with the resolve instruction, staged for you to read and extend rather than sent — resolving writes to disk and commits, so it waits for you.
+
+Conflicts where one side is missing the file entirely — you edited and they deleted it, they edited and you deleted it, or you both added it with no shared history — now each explain themselves, so an empty pane never reads as a view that failed to load.
+
+Resolutions round-trip byte for byte, including CRLF line endings, leading tabs, and trailing spaces. The one normalisation: when the two sides disagree about whether the file ends with a newline, the result ends with one.
+
+A document can contain a line that looks exactly like a conflict marker — a heading underlined with `=`, a divider rule, or a quoted marker in a note about git. Inside a conflicted region there is then nothing to say which line is structural, and resolving against the wrong one drops your own text. Such a file is now refused with an explanation rather than resolved: the buttons do not appear, and it stays yours to resolve by hand or with your agent.
+
+Several fixes ride along. Undoing a resolution used to leave the last conflict in a file with no buttons for the rest of the session. A resolution still carrying conflict markers — something an agent can produce when asked to fix one region and leave the others — was written to disk and marked resolved, leaving a broken document behind a clean conflict list; that is refused now, without also turning away the ordinary documents whose prose happens to contain a row of `=`. A conflict whose three-way merge comes back clean now offers Apply instead of stranding the file with no way to resolve it. A file both sides left unterminated stays unterminated. Apply commits once however fast you click it.
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index ddd2f5be7..04af1169f 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -765,6 +765,56 @@ Homepage: https://github.com/oramasearch/orama
Copyright 2023 OramaSearch Inc
+### `@pierre/[email protected]`
+
+Copyright 2025 Pierre Computer Company
+
+### `@pierre/[email protected]`
+Homepage: https://github.com/pierrecomputer/pierre/tree/main/packages/theme
+
+Copyright 2025 Pierre Computer Company
+
+NOTICE:
+
+```
+This theme was built on top of
+[GitHub's Visual Studio Code Theme](https://github.com/primer/github-vscode-theme),
+reusing its technique and build tooling, which we have since iterated on for
+more specific language tokens.
+
+`@pierre/theme` is licensed under Apache-2.0 (see `LICENSE`). The original MIT
+license for `primer/github-vscode-theme` is included below for attribution.
+
+Original license for `primer/github-vscode-theme`:
+
+```
+MIT License
+
+Copyright (c) 2020 Primer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+```
+```
+
+### `@pierre/[email protected]`
+
+Copyright 2025 Pierre Computer Company
+
### `@pierre/[email protected]`
Copyright 2025 Pierre Computer Company
@@ -1261,11 +1311,6 @@ Homepage: https://code.haverbeke.berlin/codemirror/lint
Copyright (C) 2018-2021 by Marijn Haverbeke <[email protected]> and others
-### `@codemirror/[email protected]`
-Homepage: https://code.haverbeke.berlin/codemirror/merge
-
-Copyright (C) 2018-2022 by Marijn Haverbeke <[email protected]> and others
-
### `@codemirror/[email protected]`
Homepage: https://code.haverbeke.berlin/codemirror/search
@@ -2074,6 +2119,11 @@ Homepage: https://github.com/shikijs/shiki#readme
Copyright (c) 2021 Pine Wu Copyright (c) 2023 Anthony Fu <https://github.com/antfu>
+### `@shikijs/[email protected]`
+Homepage: https://github.com/shikijs/shiki#readme
+
+Copyright (c) 2021 Pine Wu Copyright (c) 2023 Anthony Fu <https://github.com/antfu>
+
### `@shikijs/[email protected]`
Homepage: https://github.com/shikijs/shiki#readme
@@ -4142,6 +4192,11 @@ Homepage: https://github.com/wooorm/lowlight
Copyright (c) Titus Wormer <[email protected]>
+Homepage: https://github.com/rsms/js-lru#readme
+
+_(No LICENSE file in package; SPDX identifier in `package.json` is the sole declared grant.)_
+
Homepage: https://github.com/wooorm/markdown-table
@@ -6426,6 +6481,11 @@ Homepage: https://github.com/kpdecker/jsdiff
Copyright (c) 2009-2015, Kevin Decker <[email protected]>
+Homepage: https://github.com/kpdecker/jsdiff
+
+Copyright (c) 2009-2015, Kevin Decker <[email protected]>
+
Homepage: https://github.com/fastify/fast-uri
@@ -6629,6 +6689,7 @@ The following MIT-licensed packages are patched in this repository via pnpm's `p
| --- | --- |
| `@handlewithcare/[email protected]` | `patches/@handlewithcare%[email protected]` |
| `@lingui/[email protected]` | `patches/@lingui%[email protected]` |
+| `@pierre/[email protected]` | `patches/@pierre%[email protected]` |
| `@pierre/[email protected]` | `patches/@pierre%[email protected]` |
| `@tiptap/[email protected]` | `patches/@tiptap%[email protected]` |
| `@tiptap/[email protected]` | `patches/@tiptap%[email protected]` |
diff --git a/packages/app/BUNDLE-SIZE.md b/packages/app/BUNDLE-SIZE.md
index e92e8d621..6e31c2d22 100644
--- a/packages/app/BUNDLE-SIZE.md
+++ b/packages/app/BUNDLE-SIZE.md
@@ -78,3 +78,9 @@ Combined-chunks 6.55->6.56 MB for reload-safe terminal consent across config-epo
The `<Excalidraw src>` document embed adds a second reachability path into the same chunk: it lazy-imports `@excalidraw/excalidraw` on first embed mount, so the download now also fires when a markdown document containing the block renders — a passive document view, not just the explicit act of opening a `.excalidraw` doc. The bytes dedupe into the same chunk (byte-neutral for the budget); only *when* they arrive changed.
Combined-chunks 6.56->6.6 MB after the embed's review remediation landed CI at 6,550,489 B — 489 B over the pre-terminal-consent ceiling. The delta is small and diffuse (the embed's retry/provenance handling, the shared live-doc pool gates, and new error strings compiled into all 13 locale catalogs, which ship as JS chunks); the prior local measurement's assumed headroom did not survive the CI toolchain's chunking. 6.6 MB carries both measured additions (the embed's and the terminal-consent ratchet merged in from main) with ~49 kB of local-to-CI variance headroom rather than a ceiling calibrated to a single local run.
+
+Combined-chunks 6.6->8.4 MB for `@pierre/[email protected]`, the merge-conflict and diff renderer replacing `@codemirror/merge`. The weight is one dependency's transitive shiki grammar set, not the feature: `dist/highlighter/languages/resolveLanguage.js` statically imports `bundledLanguages` from `shiki`, so Vite emits a chunk per grammar and the build gains roughly 310 of them — `apl`, `blade`, `bsl`, `cairo`, and so on. Measured against a `main` build: all JS chunks 6.22 -> 7.94 MB gz, chunk count 464 -> 775. None of it is delivered. Every grammar chunk is dynamic-import-only, the entry HTML preloads the same 179 files it did before, and a session downloads 2.04 -> 2.17 MB gz.
+
+The eager budgets did not move, and that is the load-bearing fact. Main app bundle stays at 487 kB and CSS at 59 kB. The first revision of this work did put Pierre in the eager chunk — every surface was statically imported from always-mounted chrome, measuring 459.28 kB — which was then code-split behind the boundaries that already gate those surfaces (`DiffViewBoundary` on `lifecycle.status`, the two Skill dialogs on user action). Measured after: **437.42 kB against main's own 438.38 kB**, so the swap costs the eager bundle nothing.
+
+Transitive additions worth attributing: `@pierre/[email protected]`, `@pierre/[email protected]`, `@shikijs/transformers`, `diff@9`, `lru_map` arrive while `@shikijs/themes` leaves `dependencies`, so the gross Pierre cost exceeds the 1.85 MB delta. **Reclamation lever:** alias the bare `shiki` specifier to a shim exporting `bundledLanguages = {}` and register only the grammars a diff needs through Pierre's `RegisteredCustomLanguages`. The app's own highlighter imports `shiki/core` plus individual `@shikijs/langs/*` entries and never the full-bundle entry, so such a shim would not touch it. Deliberately not done here: it caps which languages highlight inside a diff, and the bytes it reclaims are ones no session downloads.
diff --git a/packages/app/package.json b/packages/app/package.json
index f45259fe2..36323d688 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -55,7 +55,7 @@
{
"name": "all JS chunks combined (gzipped)",
"path": "dist/assets/*.js",
- "limit": "6.6 MB",
+ "limit": "8.4 MB",
"gzip": true,
"running": false
},
@@ -81,7 +81,6 @@
"@codemirror/language": "^6.12.3",
"@codemirror/legacy-modes": "^6.5.1",
"@codemirror/lint": "^6.9.7",
- "@codemirror/merge": "^6.12.1",
"@codemirror/search": "^6.6.0",
"@codemirror/state": "^6.6.0",
"@codemirror/view": "^6.43.3",
@@ -111,10 +110,10 @@
"@opentelemetry/sdk-trace-web": "^2.0.0",
"@opentelemetry/semantic-conventions": "^1.30.0",
"@panzoom/panzoom": "^4.6.2",
+ "@pierre/diffs": "1.3.6",
"@pierre/trees": "1.0.0-beta.4",
"@shadcn/react": "^0.2.1",
"@shikijs/langs": "^3.23.0",
- "@shikijs/themes": "^3.23.0",
"@tanstack/react-query": "^5.99.0",
"@tiptap/core": "^3.22.3",
"@tiptap/extension-collaboration": "^3.22.3",
@@ -200,6 +199,7 @@
"@types/react-dom": "^19.2.3",
"@types/ws": "^8.18.1",
"@vitejs/plugin-react": "^6.0.1",
+ "axe-core": "~4.12.1",
"babel-plugin-react-compiler": "0.0.0-experimental-a8e64ef-20260402",
"chokidar": "^5.0.0",
"commonmark.json": "0.31.0",
diff --git a/packages/app/src/color-themes.generated.css b/packages/app/src/color-themes.generated.css
index 1c0afdc4b..c13b79837 100644
--- a/packages/app/src/color-themes.generated.css
+++ b/packages/app/src/color-themes.generated.css
@@ -54,6 +54,7 @@ html[data-color-theme="dracula"] {
--lint-error-color: #ff5555;
--diff-added: #50fa7b;
--diff-removed: #ff5555;
+ --diff-modified: #bd93f9;
--callout-note-color: #bd93f9;
--callout-info-color: #bd93f9;
--callout-todo-color: #bd93f9;
@@ -141,6 +142,7 @@ html[data-color-theme="catppuccin-frappe"] {
--lint-error-color: #e78284;
--diff-added: #a6d189;
--diff-removed: #e78284;
+ --diff-modified: #8caaee;
--callout-note-color: #8caaee;
--callout-info-color: #8caaee;
--callout-todo-color: #8caaee;
@@ -228,6 +230,7 @@ html[data-color-theme="catppuccin-latte"] {
--lint-error-color: #d20f39;
--diff-added: #40a02b;
--diff-removed: #d20f39;
+ --diff-modified: #1d62ec;
--callout-note-color: #1d62ec;
--callout-info-color: #1d62ec;
--callout-todo-color: #1d62ec;
@@ -315,6 +318,7 @@ html[data-color-theme="monokai"] {
--lint-error-color: #f92672;
--diff-added: #a6e22e;
--diff-removed: #f92672;
+ --diff-modified: #66d9ef;
--callout-note-color: #66d9ef;
--callout-info-color: #66d9ef;
--callout-todo-color: #66d9ef;
@@ -402,6 +406,7 @@ html[data-color-theme="gruvbox"] {
--lint-error-color: #fb4934;
--diff-added: #b8bb26;
--diff-removed: #fb4934;
+ --diff-modified: #83a598;
--callout-note-color: #83a598;
--callout-info-color: #83a598;
--callout-todo-color: #83a598;
@@ -489,6 +494,7 @@ html[data-color-theme="solarized"] {
--lint-error-color: #dc322f;
--diff-added: #859900;
--diff-removed: #dc322f;
+ --diff-modified: #2995e1;
--callout-note-color: #2995e1;
--callout-info-color: #2995e1;
--callout-todo-color: #2995e1;
diff --git a/packages/app/src/components/BottomComposer.tsx b/packages/app/src/components/BottomComposer.tsx
index ae0ea2a75..c85f8704e 100644
--- a/packages/app/src/components/BottomComposer.tsx
+++ b/packages/app/src/components/BottomComposer.tsx
@@ -69,6 +69,7 @@ import {
selectionSnapshotToCompose,
} from '@/editor/selection-context';
import type { EditorSurface } from '@/editor/selection-stats';
+import { useConflictComposerPrefill } from '@/hooks/use-conflict-composer-prefill';
import { useReducedMotion } from '@/hooks/use-reduced-motion';
import { useSelectionContext } from '@/hooks/use-selection-context';
import { isDesktopTargetEnabled, isInAppAgentEnabled } from '@/lib/acp/agent-visibility';
@@ -102,6 +103,7 @@ import { cn } from '@/lib/utils';
import { docNameToRelativePath } from '@/lib/workspace-paths';
import { emitOpenAskAiComposer, subscribeToOpenAskAiComposer } from './ask-ai-composer-events';
import { clearComposerDraft, getComposerDraft, setComposerDraftDoc } from './composer-draft-store';
+import { nextTouchedFiles } from './composer-touched-files';
import { focusComposerInputOnCardPointer } from './focus-composer-on-card-pointer';
import { usePageList } from './PageListContext';
@@ -115,12 +117,6 @@ function docNameToComposerRelativePath(docName: string, docExt?: string): string
return docExt ? `${docName}${docExt}` : docNameToRelativePath(docName);
}
-function markdownRelativePathStem(path: string): string | null {
- return MARKDOWN_RELATIVE_PATH_EXTENSION.test(path)
- ? path.replace(MARKDOWN_RELATIVE_PATH_EXTENSION, '')
- : null;
-}
-
/**
* Whether a keydown originated inside a native form field. ⇧⌘L should still fire
* from the ProseMirror body (a contentEditable root), so this is deliberately
@@ -229,6 +225,15 @@ export function BottomComposer({
const [isEmpty, setIsEmpty] = useState(true);
const [pending, setPending] = useState(false);
const inputRef = useRef<ComposerMentionInputHandle>(null);
+ // Conflicted doc: seed the resolve-conflicts instruction so the agent route is
+ // reachable without retyping it. Guarded against clobbering an in-progress
+ // draft; see the hook. `isSeedIntact` marks
+ // a draft nobody typed, which the touched-file effect below must not read as
+ // composing.
+ const { isSeedIntact, onContentChanged: onPrefillContentChanged } = useConflictComposerPrefill(
+ activeDocOrNull,
+ inputRef,
+ );
const cardRef = useRef<HTMLDivElement>(null);
// Shared draft doc — the SAME store the create/empty-screen hero composer
@@ -460,19 +465,8 @@ export function BottomComposer({
// Folder mode has no active doc to "touch" — its single top-row chip is the
// folder itself, derived below, not the touched-file set.
if (folderMode || isEmpty) return;
- setTouchedFiles((prev) => {
- if (dismissedFiles.has(activeFilePath)) return prev;
- const activeStem = markdownRelativePathStem(activeFilePath);
- const next =
- activeStem === null
- ? prev
- : prev.filter(
- (path) => path === activeFilePath || markdownRelativePathStem(path) !== activeStem,
- );
- if (next.includes(activeFilePath)) return next.length === prev.length ? prev : next;
- return [...next, activeFilePath];
- });
- }, [folderMode, isEmpty, activeFilePath, dismissedFiles]);
+ setTouchedFiles((prev) => nextTouchedFiles(prev, activeFilePath, dismissedFiles, isSeedIntact));
+ }, [folderMode, isEmpty, isSeedIntact, activeFilePath, dismissedFiles]);
// The visible top-row context chips.
// - Folder mode: the folder is the sole chip — the composer's scope — present
@@ -1094,7 +1088,10 @@ export function BottomComposer({
ref={inputRef}
ariaLabel={t`Ask AI`}
onEmptyChange={setIsEmpty}
- onContentChange={setComposerDraftDoc}
+ onContentChange={(doc) => {
+ setComposerDraftDoc(doc);
+ onPrefillContentChanged();
+ }}
onMentionsChange={setInlineMentions}
onSubmit={submit}
initialDoc={initialDraftDoc}
diff --git a/packages/app/src/components/ConflictFilePreview.tsx b/packages/app/src/components/ConflictFilePreview.tsx
new file mode 100644
index 000000000..da5f76a5f
--- /dev/null
+++ b/packages/app/src/components/ConflictFilePreview.tsx
@@ -0,0 +1,58 @@
+/**
+ * ConflictFilePreview — renders a single file through Pierre's vanilla File
+ * class for delete-vs-modify resolution surfaces.
+ *
+ * overflow:'wrap' is mandatory (not optional): the default 'scroll' produces
+ * 17.4x horizontal overflow on a 2,800-char prose paragraph, making the file
+ * unreadable behind a scrollbar. The file header is always visible so an empty
+ * file does not collapse to an unidentifiable sliver.
+ */
+
+import { useLingui } from '@lingui/react/macro';
+import { File as PierreFile } from '@pierre/diffs';
+import { useEffect, useRef } from 'react';
+import { okPierreTheme } from '@/lib/pierre-theme';
+
+interface ConflictFilePreviewProps {
+ filename: string;
+ content: string;
+}
+
+export function ConflictFilePreview({ filename, content }: ConflictFilePreviewProps) {
+ const { t } = useLingui();
+ const containerRef = useRef<HTMLElement>(null);
+
+ useEffect(() => {
+ const container = containerRef.current;
+ if (!container) return;
+
+ const inst = new PierreFile({ overflow: 'wrap', theme: okPierreTheme() });
+ inst.render({
+ file: { name: filename, contents: content },
+ containerWrapper: container,
+ });
+
+ return () => {
+ inst.cleanUp();
+ };
+ }, [filename, content]);
+
+ return (
+ // Focusable and named for the same reason as ConflictView's diff region:
+ // this renders read-only, so it has no focusable descendants at all and a
+ // keyboard user cannot scroll it. They are being asked to choose between
+ // keeping a deletion and restoring the file — against a body they cannot
+ // read past the first screen.
+ <section
+ ref={containerRef}
+ // Read-only, so it has no focusable descendants at all — without a tab
+ // stop the body cannot be scrolled by keyboard. The user is being asked
+ // to choose between keeping a deletion and restoring the file, against
+ // content they could otherwise only read the first screen of.
+ // biome-ignore lint/a11y/noNoninteractiveTabindex: keyboard-focusable scroll container — this render has no focusable descendants at all, so without the stop the body cannot be scrolled by keyboard. Same pattern as SyncStatusBadge's scroll container.
+ tabIndex={0}
+ aria-label={t`Preview of ${filename}`}
+ className="conflict-view h-full overflow-y-auto subtle-scrollbar"
+ />
+ );
+}
diff --git a/packages/app/src/components/ConflictView.dom.test.tsx b/packages/app/src/components/ConflictView.dom.test.tsx
new file mode 100644
index 000000000..064181e6f
--- /dev/null
+++ b/packages/app/src/components/ConflictView.dom.test.tsx
@@ -0,0 +1,630 @@
+// @vitest-environment jsdom
+/**
+ * Behavioral tests for ConflictView.
+ *
+ * Pins two properties that the portal approach depends on:
+ * 1. Resolution buttons land in the document's light DOM, not in Pierre's
+ * shadow root — `button.getRootNode() === document`.
+ * 2. Clicking a resolution button fires onResolve with merged content that
+ * contains no remaining conflict markers.
+ *
+ * The resolution sweep verifies byte-exact readback for each resolution type
+ * across the diff3 and 2-way marker shapes.
+ */
+
+import * as actualLinguiMacro from '@lingui/react/macro';
+import { act, cleanup, render, screen } from '@testing-library/react';
+import axe from 'axe-core';
+import type { ReactNode } from 'react';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { renderLinguiTemplate } from '@/test-utils/lingui-mock';
+
+vi.doMock('@lingui/react/macro', () => ({
+ ...actualLinguiMacro,
+ Trans: ({ children }: { children?: ReactNode }) => <>{children}</>,
+ useLingui: () => ({ t: renderLinguiTemplate }),
+}));
+
+const { ConflictView } = await import('./ConflictView');
+
+const OUR_CONTENT = 'Our version of the line.\n';
+const BASE_CONTENT = 'Original line.\n';
+const THEIR_CONTENT = 'Their version of the line.\n';
+
+async function renderConflictView(onResolve = vi.fn()) {
+ render(
+ <ConflictView
+ fileName="notes/sync-engine.md"
+ ours={OUR_CONTENT}
+ base={BASE_CONTENT}
+ theirs={THEIR_CONTENT}
+ onResolve={onResolve}
+ />,
+ );
+ // Pierre finishes its render across queued tasks. Wait a macrotask so the
+ // full Pierre render + React portal flush complete.
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ return onResolve;
+}
+
+async function resolveWith(btnName: string, onResolve = vi.fn()) {
+ await renderConflictView(onResolve);
+ // aria-label carries a per-conflict suffix, so match the label prefix.
+ screen.getByRole('button', { name: new RegExp(`^${btnName}`) }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ // onResolve is deferred until the user confirms with "Apply changes".
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ return onResolve;
+}
+
+describe('ConflictView', () => {
+ afterEach(() => {
+ cleanup();
+ });
+
+ test('the file header shows the real document name', async () => {
+ await renderConflictView();
+
+ const root = document.querySelector('diffs-container')?.shadowRoot;
+ expect(root?.textContent).toContain('sync-engine.md');
+ expect(root?.textContent).not.toContain('conflict.md');
+ });
+
+ test('base section is hidden by default', async () => {
+ await renderConflictView();
+
+ const root = document.querySelector('diffs-container')?.shadowRoot;
+ expect(root?.querySelector('[data-merge-conflict="marker-base"]')).toBeNull();
+ });
+
+ test('Show original reveals the base section', async () => {
+ await renderConflictView();
+
+ screen.getByRole('button', { name: 'Show original' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+
+ const root = document.querySelector('diffs-container')?.shadowRoot;
+ expect(root?.querySelector('[data-merge-conflict="marker-base"]')).not.toBeNull();
+ // The accessible name is pinned to "Show original" so the toggle's label
+ // does not move with its state (APG). The VISIBLE label still swaps, which
+ // is what a sighted user reads, and `aria-pressed` carries the state.
+ const toggle = screen.getByRole('button', { name: 'Show original' });
+ expect(toggle.textContent).toBe('Hide original');
+ expect(toggle.getAttribute('aria-pressed')).toBe('true');
+ });
+
+ test('conflict bodies wrap instead of scrolling horizontally', async () => {
+ // Prose paragraphs are long. Pierre defaults to horizontal scroll, which
+ // shows only the opening of each version and makes the three sides look
+ // identical. jsdom has no layout, so assert the attribute Pierre's own
+ // stylesheet keys off rather than measuring scrollWidth.
+ await renderConflictView();
+
+ const diffs = document.querySelector('diffs-container');
+ const root = diffs?.shadowRoot;
+ expect(root).toBeTruthy();
+
+ const overflowed = root?.querySelector('[data-overflow]');
+ expect(overflowed?.getAttribute('data-overflow')).toBe('wrap');
+ });
+
+ test('resolution buttons land in the document light DOM, not in a shadow root', async () => {
+ await renderConflictView();
+
+ const btn = screen.getByRole('button', { name: /^Accept current/ });
+ expect(btn.getRootNode()).toBe(document);
+ });
+
+ test('clicking Accept current fires onResolve with conflict-marker-free content', async () => {
+ const onResolve = vi.fn();
+ await renderConflictView(onResolve);
+
+ const btn = screen.getByRole('button', { name: /^Accept current/ });
+ btn.click();
+
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+
+ // onResolve is deferred until the user confirms with "Apply changes".
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+
+ expect(onResolve).toHaveBeenCalledOnce();
+ const resolved = onResolve.mock.calls[0][0] as string;
+ expect(resolved).not.toContain('<<<<<<<');
+ expect(resolved).toContain('Our version');
+ });
+ test('Pierre paints from the app theme, not its bundled palette', async () => {
+ // The regression this guards: constructing UnresolvedFile without a
+ // `theme` silently falls back to Pierre's own `pierre-light`/`pierre-dark`,
+ // and the code inside the conflict stops tracking the user's color theme
+ // while the chrome around it keeps tracking it.
+ //
+ // Asserted on the `:host` block Pierre writes into its shadow root. The
+ // custom-property names are the tell: the single-theme branch emits
+ // `--diffs-fg`/`--diffs-bg`, the default light/dark pair emits
+ // `--diffs-light`/`--diffs-dark`.
+ await renderConflictView();
+
+ const root = document.querySelector('diffs-container')?.shadowRoot;
+ const themeCSS = Array.from(root?.querySelectorAll('style') ?? [])
+ .map((node) => node.textContent ?? '')
+ .join('');
+
+ expect(themeCSS).toContain('--diffs-fg:var(--foreground)');
+ expect(themeCSS).toContain('--diffs-bg:var(--background)');
+ // The pair branch would emit these instead, and they shadow the plain
+ // `--diffs-*` names globals.css sets.
+ expect(themeCSS).not.toContain('--diffs-light');
+ expect(themeCSS).not.toContain('--diffs-dark');
+ // The conflict fills must NOT appear here. Pierre writes them at `:host`
+ // whenever the theme carries gitDecoration or ANSI colors, which outranks
+ // the `.conflict-view` block in globals.css that is supposed to own them.
+ expect(themeCSS).not.toContain('--diffs-addition-color');
+ expect(themeCSS).not.toContain('--diffs-modified-color');
+ expect(themeCSS).not.toContain('--diffs-deletion-color');
+ });
+});
+
+describe('ConflictView resolution sweep — byte-exact readback', () => {
+ afterEach(() => {
+ cleanup();
+ });
+
+ test('current resolution reproduces ours byte-exactly', async () => {
+ const onResolve = await resolveWith('Accept current');
+ expect(onResolve).toHaveBeenCalledOnce();
+ expect(onResolve.mock.calls[0][0]).toBe(OUR_CONTENT);
+ });
+
+ test('incoming resolution reproduces theirs byte-exactly', async () => {
+ const onResolve = await resolveWith('Accept incoming');
+ expect(onResolve).toHaveBeenCalledOnce();
+ expect(onResolve.mock.calls[0][0]).toBe(THEIR_CONTENT);
+ });
+
+ test('both resolution concatenates ours and theirs without a separator', async () => {
+ // Known limitation, pinned deliberately. A post-processing pass used to
+ // insert a blank line here so two prose paragraphs did not weld into one.
+ // It did so by editing Pierre's output while handing back Pierre's own
+ // `fileDiff` for the unedited text, which put every later conflict's
+ // indices out by the inserted lines — the second resolution spliced into a
+ // marker and dropped both its content lines. A run-on paragraph is
+ // cosmetic and editable; that was silent data loss.
+ const onResolve = await resolveWith('Accept both');
+ const resolved = onResolve.mock.calls[0][0] as string;
+ expect(resolved).toBe(`${OUR_CONTENT}${THEIR_CONTENT}`);
+ });
+
+ test('base section absent from every resolved output', async () => {
+ for (const btnName of ['Accept current', 'Accept incoming', 'Accept both'] as const) {
+ cleanup();
+ const onResolve = await resolveWith(btnName);
+ const resolved = onResolve.mock.calls[0][0] as string;
+ expect(resolved).not.toContain('|||||||');
+ expect(resolved).not.toContain(BASE_CONTENT.trim());
+ }
+ });
+
+ test('base section absent from every resolved output WITH the base shown', async () => {
+ // The sibling above resolves with the base hidden, which is the default —
+ // so the base never enters the buffer and it passes without exercising this.
+ // Here the base rows are on screen when the button is pressed, which is the
+ // state a user is in whenever they looked at the original before deciding.
+ for (const btnName of ['Accept current', 'Accept incoming', 'Accept both'] as const) {
+ cleanup();
+ const onResolve = vi.fn();
+ await renderConflictView(onResolve);
+
+ screen.getByRole('button', { name: 'Show original' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+
+ screen.getByRole('button', { name: new RegExp(`^${btnName}`) }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+
+ const resolved = onResolve.mock.calls[0][0] as string;
+ expect(resolved).not.toContain('|||||||');
+ expect(resolved).not.toContain('<<<<<<<');
+ expect(resolved).not.toContain('=======');
+ expect(resolved).not.toContain('>>>>>>>');
+ expect(resolved).not.toContain(BASE_CONTENT.trim());
+ }
+ });
+
+ test('CRLF line endings preserved through current resolution', async () => {
+ const oursCrlf = 'Our CRLF line.\r\n';
+ const baseCrlf = 'Original.\r\n';
+ const theirsCrlf = 'Their CRLF line.\r\n';
+ const onResolve = vi.fn();
+ render(
+ <ConflictView ours={oursCrlf} base={baseCrlf} theirs={theirsCrlf} onResolve={onResolve} />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(onResolve.mock.calls[0][0]).toBe(oursCrlf);
+ });
+
+ test('CRLF line endings preserved through incoming resolution', async () => {
+ const oursCrlf = 'Our CRLF line.\r\n';
+ const baseCrlf = 'Original.\r\n';
+ const theirsCrlf = 'Their CRLF line.\r\n';
+ const onResolve = vi.fn();
+ render(
+ <ConflictView ours={oursCrlf} base={baseCrlf} theirs={theirsCrlf} onResolve={onResolve} />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: /^Accept incoming/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(onResolve.mock.calls[0][0]).toBe(theirsCrlf);
+ });
+
+ test('leading tabs and trailing spaces survive current resolution', async () => {
+ const oursTabbed = '\tindented line \n';
+ const baseTabbed = '\toriginal \n';
+ const theirsTabbed = '\ttheirs \n';
+ const onResolve = vi.fn();
+ render(
+ <ConflictView
+ fileName="notes/sync-engine.md"
+ ours={oursTabbed}
+ base={baseTabbed}
+ theirs={theirsTabbed}
+ onResolve={onResolve}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(onResolve.mock.calls[0][0]).toBe(oursTabbed);
+ });
+
+ test('2-way (null base) current resolution reproduces ours byte-exactly', async () => {
+ const onResolve = vi.fn();
+ render(
+ <ConflictView ours={OUR_CONTENT} base="" theirs={THEIR_CONTENT} onResolve={onResolve} />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(onResolve.mock.calls[0][0]).toBe(OUR_CONTENT);
+ });
+
+ test('both button is available and not suppressed for prose content', async () => {
+ await renderConflictView();
+ expect(screen.getByRole('button', { name: /^Accept both/ })).not.toBeNull();
+ });
+
+ test('preamble and postamble pass through both-modified resolution unchanged', async () => {
+ const preamble = '# Header\n\n';
+ const postamble = '\nFooter paragraph.\n';
+ const ours = `${preamble}Our paragraph.\n${postamble}`;
+ const base = `${preamble}Original paragraph.\n${postamble}`;
+ const theirs = `${preamble}Their paragraph.\n${postamble}`;
+ const onResolve = vi.fn();
+ render(<ConflictView ours={ours} base={base} theirs={theirs} onResolve={onResolve} />);
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ const resolved = onResolve.mock.calls[0][0] as string;
+ expect(resolved).toContain('# Header');
+ expect(resolved).toContain('Our paragraph.');
+ expect(resolved).toContain('Footer paragraph.');
+ expect(resolved).not.toContain('Their paragraph.');
+ });
+});
+
+describe('ConflictView focus management (US-009)', () => {
+ afterEach(() => {
+ cleanup();
+ });
+
+ test('focus is not on body after a resolution is applied', async () => {
+ await renderConflictView();
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(document.activeElement).not.toBe(document.body);
+ });
+
+ test('focus is not on body after a resolution is undone', async () => {
+ await renderConflictView();
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ screen.getByRole('button', { name: 'Undo' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(document.activeElement).not.toBe(document.body);
+ });
+});
+
+describe('ConflictView absent-stage banners — one fixture per kind', () => {
+ afterEach(() => {
+ cleanup();
+ });
+
+ test('delete-modify (empty ours) shows the deleted-on-current-branch banner', async () => {
+ render(
+ <ConflictView
+ fileName="notes/sync-engine.md"
+ ours=""
+ base="Original shared content.\n"
+ theirs="Upstream modification.\n"
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ const banner = document.body.querySelector('p');
+ expect(banner?.textContent).toContain('current branch');
+ });
+
+ test('modify-delete (empty theirs) shows the deleted-on-incoming-branch banner', async () => {
+ render(
+ <ConflictView
+ fileName="notes/sync-engine.md"
+ ours="Local modification.\n"
+ base="Original shared content.\n"
+ theirs=""
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ const banner = document.body.querySelector('p');
+ expect(banner?.textContent).toContain('incoming branch');
+ });
+
+ test('add/add (empty base) shows the no-common-ancestor banner', async () => {
+ render(
+ <ConflictView
+ fileName="notes/sync-engine.md"
+ ours="Content added on current branch.\n"
+ base=""
+ theirs="Content added on incoming branch.\n"
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ const banner = document.body.querySelector('p');
+ expect(banner?.textContent).toContain('No common ancestor');
+ });
+});
+
+describe('ConflictView axe accessibility scan', () => {
+ afterEach(() => {
+ cleanup();
+ });
+
+ test('conflict surface has no detectable WCAG violations', async () => {
+ render(
+ <ConflictView
+ fileName="notes/sync-engine.md"
+ ours={OUR_CONTENT}
+ base={BASE_CONTENT}
+ theirs={THEIR_CONTENT}
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ // color-contrast and scrollable-region-focusable require computed styles that
+ // jsdom cannot provide; all other WCAG 2.x rules run against the live DOM.
+ const results = await axe.run(document.body, {
+ // Restrict to WCAG 2.x standards only — mirrors the `.withTags` scope
+ // used in the Playwright a11y suite. Excludes best-practice rules like
+ // `region` (page-level landmark requirement not applicable to isolated
+ // component renders) and `color-contrast` (requires computed styles that
+ // jsdom cannot provide).
+ runOnly: { type: 'tag', values: ['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa'] },
+ });
+ expect(results.violations).toEqual([]);
+ });
+});
+
+describe('ConflictView — controls after undo', () => {
+ // Two conflicts separated by shared context, so diff3 keeps them distinct.
+ const TWO_BASE = '# Pricing\n\nLine A base.\n\nShared context line.\n\nLine B base.\n';
+ const TWO_OURS = '# Pricing\n\nLine A ours.\n\nShared context line.\n\nLine B ours.\n';
+ const TWO_THEIRS = '# Pricing\n\nLine A theirs.\n\nShared context line.\n\nLine B theirs.\n';
+
+ async function renderTwo() {
+ render(
+ <ConflictView
+ fileName="notes/pricing.md"
+ ours={TWO_OURS}
+ base={TWO_BASE}
+ theirs={TWO_THEIRS}
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ }
+
+ const rows = () => screen.queryAllByRole('button', { name: /^Accept current/ }).length;
+
+ test('every unresolved conflict keeps its controls after an undo', async () => {
+ await renderTwo();
+ expect(rows()).toBe(2);
+
+ // The BOTTOM conflict, not the top one: indices renumber on every re-parse,
+ // so which one is resolved changes what the restore has to rebuild.
+ const before = screen.getAllByRole('button', { name: /^Accept current/ });
+ before[before.length - 1].click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ expect(rows()).toBe(1);
+
+ screen.getByRole('button', { name: 'Undo' }).click();
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+ // Both conflicts are unresolved again, so both must be actionable.
+ expect(rows()).toBe(2);
+ });
+});
+
+describe('ConflictView — word-level highlighting inside conflicts', () => {
+ // Upstream pins lineDiffType to 'none' in the unresolved-file renderer; a
+ // patch restores the option. These pin BOTH halves of that decision, because
+ // a silent patch failure would look like a styling regression, not a broken
+ // dependency.
+ const pad = (n: number) => 'filler '.repeat(n);
+ const doc = (tier: string, n: number) => `# P\n\n${pad(n)}The ${tier} tier ships in Q4.\n`;
+
+ async function spanCount(n: number, showBase: boolean) {
+ const { container } = render(
+ <ConflictView
+ fileName="notes/pricing.md"
+ ours={doc('Team', n)}
+ base={doc('Base', n)}
+ theirs={doc('Pro', n)}
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((r) => setTimeout(r, 0));
+ });
+ if (showBase) {
+ screen.getByRole('button', { name: 'Show original' }).click();
+ await act(async () => {
+ await new Promise<void>((r) => setTimeout(r, 0));
+ });
+ }
+ const root = container.querySelector('diffs-container')?.shadowRoot;
+ return root?.querySelectorAll('[data-diff-span]').length ?? 0;
+ }
+
+ test('marks the differing words on a short line', async () => {
+ expect(await spanCount(2, false)).toBeGreaterThan(0);
+ });
+
+ test('those spans are actually styled, not just present', async () => {
+ // Counting spans proves generation, not visibility. Pierre styles intra-line
+ // spans only on change-addition / change-deletion rows; conflict rows are
+ // `context`, so without our injected rules the spans render with no fill and
+ // the feature looks like it never shipped.
+ const { container } = render(
+ <ConflictView
+ fileName="notes/pricing.md"
+ ours={doc('Team', 2)}
+ base={doc('Base', 2)}
+ theirs={doc('Pro', 2)}
+ onResolve={vi.fn()}
+ />,
+ );
+ await act(async () => {
+ await new Promise<void>((r) => setTimeout(r, 0));
+ });
+ const root = container.querySelector('diffs-container')?.shadowRoot;
+ const spans = [...(root?.querySelectorAll('[data-diff-span]') ?? [])];
+ expect(spans.length).toBeGreaterThan(0);
+
+ // Every span sits under a row our rules select on.
+ for (const span of spans) {
+ expect(span.closest('[data-merge-conflict]')).not.toBeNull();
+ }
+ // And OUR rule reached the shadow root. Both halves of the selector appear
+ // in Pierre's own stylesheet independently, so assert the pairing — that is
+ // the part only our injection supplies.
+ const css = [
+ ...[...(root?.querySelectorAll('style') ?? [])].map((n) => n.textContent ?? ''),
+ ...[...(root?.adoptedStyleSheets ?? [])].flatMap((sheet) =>
+ [...sheet.cssRules].map((r) => r.cssText),
+ ),
+ ].join(' ');
+ expect(css).toMatch(/\[data-merge-conflict="current"\]\s*\[data-diff-span\]/);
+ expect(css).toMatch(/\[data-merge-conflict="incoming"\]\s*\[data-diff-span\]/);
+ // Adjacent spans read as one run: Pierre never joins the final diff item,
+ // so a line whose last word changed would otherwise show a seam.
+ expect(css).toMatch(/\[data-diff-span\]\s*\+\s*\[data-diff-span\]/);
+ });
+
+ test("gives up past Pierre's 1000-char line cap", async () => {
+ // `maxLineDiffLength` defaults to 1000 and is deliberately left there:
+ // jsdiff's word diff is O(n*m), so raising it multiplies main-thread work
+ // per conflicted line. Prose paragraphs on one line therefore stay
+ // unhighlighted — the known limit, pinned so a future raise is a choice
+ // someone makes on purpose with a measurement behind it.
+ expect(await spanCount(350, false)).toBe(0);
+ });
+
+ test('is off while the base section is shown', async () => {
+ // Not a preference: with three sections the pairing yields nothing, so this
+ // pins the reason the option tracks the toggle.
+ expect(await spanCount(2, true)).toBe(0);
+ });
+});
diff --git a/packages/app/src/components/ConflictView.tsx b/packages/app/src/components/ConflictView.tsx
new file mode 100644
index 000000000..1f0872087
--- /dev/null
+++ b/packages/app/src/components/ConflictView.tsx
@@ -0,0 +1,660 @@
+/**
+ * ConflictView — renders a both-modified merge conflict through Pierre's
+ * vanilla UnresolvedFile class (not the React wrapper).
+ *
+ * Receives pre-fetched ours/base/theirs bytes from DiffViewBoundary,
+ * synthesises diff3 conflict markers, and mounts Pierre into the host div.
+ * Resolution fires onResolve once "Apply changes" is confirmed, allowing
+ * undo/redo of any resolution before the file is written.
+ *
+ * Per-conflict shadcn Buttons are portaled into light-DOM host elements
+ * that Pierre manages via mergeConflictActionsType. handleActionRef stores
+ * the action handler (defined inside the effect so inst stays in scope)
+ * so that JSX portal buttons can call it without making it a dep.
+ * The prune effect (no deps) removes disconnected hosts after each
+ * forceRender cycle.
+ */
+
+import {
+ type SynthesisedConflictRegion,
+ synthesiseConflictMarkersWithRegions,
+} from '@inkeep/open-knowledge-core';
+import { useLingui } from '@lingui/react/macro';
+import type {
+ FileDiffMetadata,
+ MergeConflictMarkerRow,
+ MergeConflictRegion,
+ MergeConflictResolution,
+} from '@pierre/diffs';
+import { UnresolvedFile } from '@pierre/diffs';
+import { useEffect, useRef, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { Button } from '@/components/ui/button';
+import { useConflictFooterHeightVar } from '@/hooks/use-conflict-footer-height';
+import { okPierreTheme } from '@/lib/pierre-theme';
+import type { ConflictSnapshot } from './conflict-history';
+import { ConflictHistory } from './conflict-history';
+
+interface ConflictViewProps {
+ /** On-disk path of the conflicted file, shown in Pierre's file header. */
+ fileName: string;
+ ours: string;
+ base: string;
+ theirs: string;
+ onResolve: (content: string) => void | Promise<void>;
+}
+
+interface ConflictControl {
+ key: string;
+ host: HTMLElement;
+ conflict: MergeConflictRegion;
+}
+
+/**
+ * Pierre styles intra-line diff spans only on `change-addition` /
+ * `change-deletion` rows. Conflict rows are neither — they carry
+ * `data-line-type="context"` plus `data-merge-conflict`, so the spans it
+ * generates land unstyled and invisible. These rules give them the fill,
+ * keyed to the same channels the row backgrounds use: ours reads as an
+ * addition, theirs as a modification.
+ *
+ * Injected through Pierre's own `unsafeCSS` rather than `globals.css` because
+ * the spans live inside the shadow root, where page rules cannot reach.
+ *
+ * Reads the app tokens, not the `--diffs-*` names globals.css derives from
+ * them: those are what Pierre would write at `:host`, and the theme test
+ * treats their appearance in shadow-root CSS as the bundled-palette
+ * regression. App tokens inherit through the boundary just as well.
+ */
+const CONFLICT_WORD_DIFF_CSS = `
+[data-merge-conflict="current"] [data-diff-span] {
+ background-color: color-mix(in oklab, var(--diff-added) 32%, transparent);
+}
+[data-merge-conflict="incoming"] [data-diff-span] {
+ background-color: color-mix(in oklab, var(--diff-modified) 32%, transparent);
+}
+/* Pierre rounds every span and never joins the final diff item into the one
+ before it, so a line whose last word changed renders as two boxes with a
+ seam — "Priya | Raman" against a single "Marcus Webb" on the other side.
+ The break is positional, not meaningful, so flatten the touching corners and
+ let adjacent spans read as one run. Cheaper than patching the span builder,
+ which is shared by every diff surface in the app. */
+[data-diff-span]:has(+ [data-diff-span]) {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+[data-diff-span] + [data-diff-span] {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+}
+`;
+
+let _nextId = 0;
+
+/**
+ * How many conflict blocks are still unresolved in a snapshot's text.
+ *
+ * Counted from the marker bytes rather than Pierre's model because resolving a
+ * region deletes its markers outright — so the count needs no bookkeeping and
+ * cannot drift from what the user is looking at.
+ */
+function remainingConflictCount(contents: string): number {
+ return contents.split('\n').filter((line) => line.startsWith('<<<<<<< ')).length;
+}
+
+/**
+ * Does one of Pierre's parsed conflict regions sit where we wrote it?
+ *
+ * The markers are unambiguous only on the way out. Seven `=` is a separator to
+ * us and to Pierre's `/^={7,}$/` — and also a line a user may have typed, as a
+ * setext heading underline, a divider rule, or a quoted conflict marker in a
+ * document about git. Once such a line sits inside a conflict section the text
+ * carries two lines that look identical and nothing says which is structural,
+ * so Pierre anchors the split on the wrong one. Resolving against those
+ * boundaries drops the user's own lines and reports success.
+ *
+ * Since we synthesised the text, we know where every marker really is.
+ * Comparing the two is exact — integers both sides should agree on, not bytes
+ * subject to normalisation — so this cannot cry wolf on a correct parse.
+ */
+function parseAgreesWithSynthesis(
+ written: readonly SynthesisedConflictRegion[],
+ parsed: MergeConflictRegion,
+): boolean {
+ const expected = written[parsed.conflictIndex];
+ if (!expected) return false;
+ return (
+ parsed.startLineIndex === expected.startLineIndex &&
+ parsed.separatorLineIndex === expected.separatorLineIndex &&
+ parsed.endLineIndex === expected.endLineIndex
+ );
+}
+
+/**
+ * Pierre rebuilds the file from its parsed rows and always terminates the last
+ * one, so a source that ended mid-line comes back with a newline it never had.
+ * Only strip when BOTH sides agree the file has no EOF newline — when they
+ * disagree the correct answer depends on which side won each region, which the
+ * rebuilt text no longer records.
+ */
+function matchTrailingNewline(resolved: string, ours: string, theirs: string): string {
+ if (ours.endsWith('\n') || theirs.endsWith('\n')) return resolved;
+ return resolved.endsWith('\n') ? resolved.slice(0, -1) : resolved;
+}
+
+// Returns true when the snapshot's diff model has no remaining divergent regions,
+// i.e. all conflicts have been accepted.
+function isSnapshotAllResolved(snapshot: ConflictSnapshot): boolean {
+ const { fileDiff } = snapshot;
+ if (!fileDiff) return false;
+ return fileDiff.additionLines.join('') === fileDiff.deletionLines.join('');
+}
+
+export function ConflictView({ fileName, ours, base, theirs, onResolve }: ConflictViewProps) {
+ const { t } = useLingui();
+ const containerRef = useRef<HTMLElement>(null);
+ const onResolveRef = useRef(onResolve);
+ const conflictFooterRef = useConflictFooterHeightVar(true);
+ // handleActionRef / handleUndoRef / handleRedoRef / handleApplyRef store handlers
+ // defined inside the [ours,base,theirs] effect so inst and history stay in scope.
+ const handleActionRef = useRef<
+ ((conflict: MergeConflictRegion, resolution: MergeConflictResolution) => void) | null
+ >(null);
+ const handleUndoRef = useRef<(() => void) | null>(null);
+ const handleRedoRef = useRef<(() => void) | null>(null);
+ const handleApplyRef = useRef<(() => void | Promise<void>) | null>(null);
+ const [controls, setControls] = useState<ConflictControl[]>([]);
+ const [canUndo, setCanUndo] = useState(false);
+ const [canRedo, setCanRedo] = useState(false);
+ const [allResolved, setAllResolved] = useState(false);
+ // Set when Pierre's parse disagrees with the markers we wrote — see
+ // `parseAgreesWithSynthesis`. Every control is withheld in that state.
+ const [parseMismatch, setParseMismatch] = useState(false);
+ // Resolve / undo / redo mutate the diff imperatively and move focus to the
+ // scroll container, so a sighted user sees the change and a screen-reader
+ // user gets silence — including when `Apply changes` appears, which is the
+ // terminal action of the whole workflow. This region is always mounted and
+ // starts empty: a live region inserted at the same moment as its text is
+ // unreliably announced.
+ // `null` = nothing announced yet, so the region renders empty on mount.
+ const [liveRemaining, setLiveRemaining] = useState<
+ number | 'all-resolved' | 'unavailable' | null
+ >(null);
+ // Apply runs `git add` + `git commit --no-edit` server-side, so a second
+ // click races the first against the working tree and reports
+ // "no conflict tracked for file" — an error toast after a success.
+ //
+ // The latch is the ref, not the state beside it. React batches, so several
+ // clicks dispatched before the next render all observe `isApplying === false`
+ // and the disabled attribute never gets a chance to apply; only a ref updates
+ // in time to turn the second click away. The state exists to grey the button.
+ const applyingRef = useRef(false);
+ const [isApplying, setIsApplying] = useState(false);
+ // The merge base is the capability this view exists to provide, but three
+ // stacked versions of a paragraph is a lot to read when you only need two.
+ // Hidden by default; revealed on demand.
+ const [showBase, setShowBase] = useState(false);
+
+ // Keep onResolve current without remounting Pierre on every render.
+ useEffect(() => {
+ onResolveRef.current = onResolve;
+ // `t` is bound to the Lingui context object, which is swapped on every
+ // `i18n.activate()` — including an external `.ok/config.yml` language edit
+ // or a change made in another window. Held in the dep array below it would
+ // re-run the mount effect: a new ConflictHistory, `inst.cleanUp()`, every
+ // state reset — silently discarding accepted-but-unapplied resolutions for
+ // a language change. Nothing in the effect needs it synchronously; Pierre
+ // renders no translated strings, and the live region composes its own text
+ // in render from the count this effect stores.
+ });
+
+ // Prune disconnected hosts after every render — Pierre removes slot wrappers
+ // on forceRender, leaving hosts detached. New hosts aren't connected yet when
+ // mergeConflictActionsType fires, so filtering by isConnected is deferred here.
+ useEffect(() => {
+ setControls((prev) => {
+ const live = prev.filter((c) => c.host.isConnected);
+ return live.length === prev.length ? prev : live;
+ });
+ });
+
+ useEffect(() => {
+ const container = containerRef.current;
+ if (!container) return;
+
+ // Treat empty-string base as absent so synthesiseConflictMarkers picks
+ // the 2-way format instead of a diff3 block with an empty base section.
+ const { text: markerText, regions: writtenRegions } = synthesiseConflictMarkersWithRegions(
+ ours,
+ base || null,
+ theirs,
+ {
+ // The base always feeds the three-way merge — it is what determines which
+ // regions actually conflict. Only its display is toggled. Passing a null
+ // base instead would collapse the entire file into one conflict block.
+ includeBaseSection: showBase,
+ },
+ );
+
+ const history = new ConflictHistory({ file: { name: fileName, contents: markerText } });
+ setCanUndo(false);
+ setCanRedo(false);
+ setAllResolved(false);
+ setParseMismatch(false);
+ // Pierre reports its regions through `mergeConflictActionsType`, which
+ // fires after render() returns rather than inside it — so the check runs
+ // per region as each arrives. It applies only to the initial parse of the
+ // text we synthesised; every later render is of Pierre's own resolved
+ // output, whose boundaries we never wrote and cannot predict.
+ let verifyParse = true;
+ let parseMismatched = false;
+
+ function syncState(resolved: boolean) {
+ setCanUndo(history.canUndo);
+ setCanRedo(history.canRedo);
+ setAllResolved(resolved);
+ const remaining = remainingConflictCount(history.current.file.contents);
+ // A COUNT, not a sentence. Lingui's `t` macro is name-based, so it only
+ // transforms a tag literally spelled `t` — aliasing it through a ref
+ // leaves a raw tagged template, which the React Compiler then refuses to
+ // lower once it carries an interpolation. Both facts are invisible to
+ // typecheck and tests and surface only in the production build. Keeping
+ // `t` out of this effect's deps (a locale change must not rebuild the
+ // instance) and composing the message in render satisfies both.
+ setLiveRemaining(resolved ? 'all-resolved' : remaining);
+ }
+
+ const inst = new UnresolvedFile({
+ theme: okPierreTheme(),
+ // Conflict bodies are prose paragraphs, not code. Pierre defaults to
+ // horizontal scroll, which hides all but the first ~110 characters of a
+ // long paragraph behind a scrollbar and makes the three versions look
+ // identical, since only their shared opening is visible.
+ overflow: 'wrap',
+ // Word-level highlighting inside conflicts, restored by our patch to
+ // Pierre's UnresolvedFileHunksRenderer, which otherwise pins this to
+ // 'none'. Measured on a genuine three-way divergence: it pairs ours
+ // against theirs and marks the differing words on each side.
+ //
+ // Only in two-way mode. With a base section present the pairing produces
+ // nothing at all, so leaving it on there would make highlighting appear
+ // and vanish as the user toggles Show original — which is very likely why
+ // upstream pins it off rather than reasoning per-mode. Tying it to the
+ // toggle makes the capability change something the user just asked for.
+ lineDiffType: showBase ? 'none' : 'word-alt',
+ unsafeCSS: CONFLICT_WORD_DIFF_CSS,
+ // onMergeConflictAction keeps Pierre in controlled mode so
+ // inst.render({ ...resolved, forceRender: true }) works correctly.
+ onMergeConflictAction: (payload) => {
+ handleActionRef.current?.(payload.conflict, payload.resolution);
+ },
+ mergeConflictActionsType: (action) => {
+ const host = document.createElement('div');
+ _nextId += 1;
+ const key = `cc-${_nextId}`;
+ // Append-only: host isn't connected yet when this fires (Pierre
+ // connects it after the function returns). Pruning happens in the
+ // no-dep effect above, which runs after each render.
+ // Latched, not per-region: Pierre reports each region separately, so
+ // clearing `controls` on the one that disagrees still let every LATER
+ // region append to the freshly emptied array — a refusal banner beside
+ // live Accept buttons on the same file.
+ if (parseMismatched) return host;
+ if (verifyParse && !parseAgreesWithSynthesis(writtenRegions, action.conflict)) {
+ // With a boundary wrong, "accept current" writes the wrong bytes.
+ // No control on this file can be trusted, so withhold all of them:
+ // an honest dead end beats a silent one.
+ parseMismatched = true;
+ // The only controlless state that emitted nothing. A mismatch means
+ // either a document carrying marker-lookalike lines or a Pierre
+ // parser regression, and the two are indistinguishable from the UI —
+ // so a "blank conflict pane" report arrives with no way to tell them
+ // apart. Expected-vs-parsed is the whole diagnosis in one line.
+ console.warn(
+ JSON.stringify({
+ event: 'conflict-parse-mismatch',
+ 'doc.name': fileName,
+ conflictIndex: action.conflict.conflictIndex,
+ expected: writtenRegions[action.conflict.conflictIndex] ?? null,
+ parsed: {
+ startLineIndex: action.conflict.startLineIndex,
+ separatorLineIndex: action.conflict.separatorLineIndex,
+ endLineIndex: action.conflict.endLineIndex,
+ },
+ }),
+ );
+ setParseMismatch(true);
+ setControls([]);
+ return host;
+ }
+ setControls((prev) => [...prev, { key, host, conflict: action.conflict }]);
+ return host;
+ },
+ });
+
+ // After every forceRender, restore scroll position (line-anchor: save before
+ // render, restore after — browser clamps when content shrinks, so this does
+ // not leave the viewport past the end) and return focus to the scrollable
+ // container so keyboard users can immediately navigate to the next conflict.
+ function rerenderAndRestore(snapshot: ConflictSnapshot) {
+ if (!container) return;
+ verifyParse = false;
+ const scrollTop = container.scrollTop;
+ inst.render({ ...snapshot, forceRender: true });
+ container.scrollTop = scrollTop;
+ container.focus();
+ }
+
+ handleActionRef.current = (conflict, resolution) => {
+ // The four render sites withhold every control once the parse is
+ // mismatched, so this is unreachable through the UI. It is here because
+ // the render gate protects the *controls*, not the mutation: Pierre owns
+ // the shadow DOM these buttons live in and reuses its hosts, so a control
+ // that outlives a re-parse could reach this with an index the refusal was
+ // declared against. `parseMismatched` is the effect-scoped latch, not the
+ // state — it flips before React re-renders the gates.
+ //
+ // Announced and logged for the same reason the `!resolved` branch below
+ // is: this fires only when a control the gates cannot reach was clicked,
+ // so a bare return would leave the user clicking a live-looking button
+ // in silence, in the one case the guard exists for. Its own event name —
+ // the diagnosis is "the parse check fired", which pairs with the
+ // `conflict-parse-mismatch` warn and is a different fault from the stale
+ // `conflictIndex` the sibling reports.
+ if (parseMismatched) {
+ console.warn(
+ JSON.stringify({
+ event: 'conflict-action-refused-parse-mismatch',
+ 'doc.name': fileName,
+ conflictIndex: conflict.conflictIndex,
+ resolution,
+ }),
+ );
+ setLiveRemaining('unavailable');
+ return;
+ }
+ const resolved = inst.resolveConflict(conflict.conflictIndex, resolution);
+ if (!resolved) {
+ // Reachable, not theoretical: controls are deliberately NOT cleared on
+ // undo (Pierre reuses its hosts), so a retained control can carry a
+ // conflictIndex from an earlier parse — and a stale index leaves that
+ // button dead for the rest of the session. Bare `return` made the click
+ // land on an enabled control and do nothing, with no log and total
+ // silence for a screen-reader user. Contrast history.undo()/redo(),
+ // whose null returns are unreachable behind their disabled attributes.
+ console.warn(
+ JSON.stringify({
+ event: 'conflict-resolve-declined',
+ 'doc.name': fileName,
+ conflictIndex: conflict.conflictIndex,
+ resolution,
+ }),
+ );
+ setLiveRemaining('unavailable');
+ return;
+ }
+
+ // Pierre's output is used as-is. Patching it here corrupted every
+ // conflict after the first: the snapshot carried our edited
+ // `file.contents` alongside Pierre's `fileDiff` describing the UNedited
+ // text, and Pierre positions conflicts from `fileDiff`. The second
+ // resolution then spliced into the separator line and dropped both of its
+ // content lines. `both` on two prose paragraphs consequently produces a
+ // run-on where a blank line belongs — cosmetic, editable, and much
+ // cheaper than silent data loss.
+ const snapshot: ConflictSnapshot = resolved;
+ history.push(snapshot);
+
+ const done = isSnapshotAllResolved(snapshot);
+ syncState(done);
+ if (done) setControls([]);
+
+ rerenderAndRestore(snapshot);
+ };
+
+ handleUndoRef.current = () => {
+ const snapshot = history.undo();
+ if (!snapshot) return;
+ syncState(isSnapshotAllResolved(snapshot));
+ // Deliberately NOT clearing controls here. Pierre only calls
+ // mergeConflictActionsType for conflicts whose action set changed; it
+ // reuses the host for any it considers unchanged. Wiping the list assumed
+ // every host would be re-requested, so a reused host lost its entry and
+ // never regained one — its buttons were gone for the rest of the session.
+ // Visible only when undoing a resolve of the LAST conflict, since
+ // resolving an earlier one renumbers the survivor and makes Pierre treat
+ // it as changed. The prune effect drops genuinely detached hosts.
+ rerenderAndRestore(snapshot);
+ };
+
+ handleRedoRef.current = () => {
+ const snapshot = history.redo();
+ if (!snapshot) return;
+ const done = isSnapshotAllResolved(snapshot);
+ syncState(done);
+ if (done) setControls([]);
+ rerenderAndRestore(snapshot);
+ };
+
+ handleApplyRef.current = () =>
+ onResolveRef.current(matchTrailingNewline(history.current.file.contents, ours, theirs));
+
+ inst.render({
+ file: { name: fileName, contents: markerText },
+ containerWrapper: container,
+ });
+
+ // Pierre's parseMergeConflictDiffFromFile runs synchronously inside render(),
+ // so computedCache.fileDiff is already populated here. Backfill the initial
+ // history entry with the full snapshot so rerenderAndRestore() can pass
+ // fileDiff+actions to forceRender when undoing to the initial state — passing
+ // only `file` after initialization throws inside UnresolvedFile.getOrComputeDiff.
+ const initCache = (
+ inst as unknown as {
+ computedCache: {
+ fileDiff?: FileDiffMetadata;
+ actions?: ConflictSnapshot['actions'];
+ markerRows?: MergeConflictMarkerRow[];
+ };
+ }
+ ).computedCache;
+ if (initCache.fileDiff) {
+ const initial: ConflictSnapshot = {
+ file: { name: fileName, contents: markerText },
+ fileDiff: initCache.fileDiff,
+ actions: initCache.actions,
+ markerRows: initCache.markerRows,
+ };
+ history.reset(initial);
+ // A file can arrive with no divergent region at all: the server records a
+ // conflict whenever the three-way merge declines, and it declines on
+ // grounds a line-level re-merge does not reproduce. Seeding from the
+ // parse rather than from `false` is what puts Apply on screen — with no
+ // regions there is no Accept control to press, so nothing would ever set
+ // it and the file could only be resolved by handing it to an agent.
+ setAllResolved(isSnapshotAllResolved(initial));
+ }
+
+ return () => {
+ inst.cleanUp();
+ handleActionRef.current = null;
+ handleUndoRef.current = null;
+ handleRedoRef.current = null;
+ handleApplyRef.current = null;
+ setControls([]);
+ setCanUndo(false);
+ setCanRedo(false);
+ setAllResolved(false);
+ setParseMismatch(false);
+ };
+ }, [fileName, ours, base, theirs, showBase]);
+
+ // Derive the absent-stage kind from the incoming props. These banners
+ // surface context that Pierre's own rendering cannot express: an empty ours
+ // section looks identical to a render failure without a label.
+ const absentStageBanner = !ours
+ ? t`This file was deleted on the current branch (delete-modify conflict).`
+ : !theirs
+ ? t`This file was deleted on the incoming branch (modify-delete conflict).`
+ : !base
+ ? t`No common ancestor — both branches added this file (add/add conflict).`
+ : null;
+
+ return (
+ <div className="flex h-full flex-col">
+ {/* Both strips are `role="status"`: the boundary swaps this view in without
+ a navigation, so a screen reader reaching the pane in document order
+ would otherwise meet an empty diff and no reason for it. Announcing
+ them is what makes the absent stage and the refusal legible at all —
+ they exist precisely because there is nothing to render. */}
+ {absentStageBanner && (
+ <p role="status" className="shrink-0 border-b px-3 py-2 text-xs text-muted-foreground">
+ {absentStageBanner}
+ </p>
+ )}
+ {/* Light DOM on purpose: a live region inside Pierre's `<diffs-container>`
+ shadow root is announced unreliably across screen readers. */}
+ <div aria-live="polite" aria-atomic="true" className="sr-only">
+ {liveRemaining === null
+ ? ''
+ : liveRemaining === 'all-resolved'
+ ? t`All conflicts resolved. Apply changes to save.`
+ : liveRemaining === 'unavailable'
+ ? t`That conflict is no longer available.`
+ : t`Conflicts remaining: ${liveRemaining}.`}
+ </div>
+ {parseMismatch && (
+ <p role="status" className="shrink-0 border-b px-3 py-2 text-xs text-muted-foreground">
+ {t`This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI.`}
+ </p>
+ )}
+ <div className="flex shrink-0 items-center gap-1 border-b px-3 py-2">
+ <Button
+ type="button"
+ size="xs"
+ variant="ghost"
+ disabled={parseMismatch || !canUndo}
+ onClick={() => handleUndoRef.current?.()}
+ >
+ {t`Undo`}
+ </Button>
+ <Button
+ type="button"
+ size="xs"
+ variant="ghost"
+ disabled={parseMismatch || !canRedo}
+ onClick={() => handleRedoRef.current?.()}
+ >
+ {t`Redo`}
+ </Button>
+ {base ? (
+ <Button
+ type="button"
+ size="xs"
+ variant="ghost"
+ aria-pressed={showBase}
+ // The visible label swaps to name the ACTION; the accessible name
+ // stays put. APG is explicit that a toggle's label should not move
+ // with its state — "Hide original, toggle button, pressed" has the
+ // label describing the undo and `pressed` describing the state.
+ aria-label={t`Show original`}
+ // The rationale below never reached the user: the control simply
+ // went dead after the first resolve. `title` rather than a Tooltip
+ // because a disabled button swallows the pointer events Radix
+ // needs.
+ title={canUndo || canRedo ? t`Undo your resolutions to change this.` : undefined}
+ // Toggling re-synthesises the marker text, which re-parses every
+ // conflict and renumbers their indices, so any in-progress
+ // resolution would be discarded. Gate on either direction being
+ // live rather than silently dropping the user's work: undoing back
+ // to the start leaves canUndo false while a full redo stack is
+ // still standing, and that stack is work too.
+ disabled={parseMismatch || canUndo || canRedo}
+ onClick={() => setShowBase((v) => !v)}
+ >
+ {showBase ? t`Hide original` : t`Show original`}
+ </Button>
+ ) : null}
+ </div>
+ <section
+ ref={containerRef}
+ // A scrollable region needs a real tab stop or a keyboard user cannot
+ // scroll it (WCAG 2.1.1). Normally they would tab into an Accept
+ // button, but in the refusal and all-resolved states there are no
+ // controls at all and the whole diff becomes mouse-only. Being
+ // focusable also gives rerenderAndRestore() a named place to return
+ // focus to, rather than an anonymous div.
+ // biome-ignore lint/a11y/noNoninteractiveTabindex: keyboard-focusable scroll container — Chromium doesn't make overflow:auto elements focusable without tabIndex, and axe's scrollable-region-focusable requires the stop. Same pattern as SyncStatusBadge's scroll container.
+ tabIndex={0}
+ aria-label={t`Conflict diff for ${fileName}`}
+ className="conflict-view min-h-0 flex-1 overflow-y-auto subtle-scrollbar"
+ />
+ {/* The footer stays mounted even while empty: useConflictFooterHeightVar
+ publishes its height so the floating Ask AI composer stacks above it. */}
+ <div
+ ref={conflictFooterRef}
+ className="flex shrink-0 items-center justify-end gap-2 border-t px-3 py-2"
+ >
+ {allResolved && !parseMismatch && (
+ <Button
+ type="button"
+ size="sm"
+ disabled={isApplying}
+ onClick={() => {
+ if (applyingRef.current) return;
+ applyingRef.current = true;
+ setIsApplying(true);
+ void Promise.resolve(handleApplyRef.current?.()).finally(() => {
+ applyingRef.current = false;
+ setIsApplying(false);
+ });
+ }}
+ >
+ {t`Apply changes`}
+ </Button>
+ )}
+ </div>
+ {/* Each trio repeats verbatim per conflict, so the visible labels alone give
+ a screen-reader user browsing by button "Accept current" N times with
+ nothing to tell them apart. The 1-based conflict number is the
+ disambiguator, and it is already in hand — the same `conflictIndex` the
+ click handler resolves against. */}
+ {!parseMismatch &&
+ controls.map((control) =>
+ createPortal(
+ <div className="flex items-center gap-1">
+ <Button
+ type="button"
+ size="xs"
+ variant="outline"
+ aria-label={t`Accept current version for conflict ${control.conflict.conflictIndex + 1}`}
+ onClick={() => handleActionRef.current?.(control.conflict, 'current')}
+ >
+ {t`Accept current`}
+ </Button>
+ <Button
+ type="button"
+ size="xs"
+ variant="outline"
+ aria-label={t`Accept incoming version for conflict ${control.conflict.conflictIndex + 1}`}
+ onClick={() => handleActionRef.current?.(control.conflict, 'incoming')}
+ >
+ {t`Accept incoming`}
+ </Button>
+ <Button
+ type="button"
+ size="xs"
+ variant="outline"
+ aria-label={t`Accept both versions for conflict ${control.conflict.conflictIndex + 1}`}
+ onClick={() => handleActionRef.current?.(control.conflict, 'both')}
+ >
+ {t`Accept both`}
+ </Button>
+ </div>,
+ control.host,
+ control.key,
+ ),
+ )}
+ </div>
+ );
+}
diff --git a/packages/app/src/components/DiffView.dom.test.tsx b/packages/app/src/components/DiffView.dom.test.tsx
deleted file mode 100644
index 8b217b775..000000000
--- a/packages/app/src/components/DiffView.dom.test.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * RTL behavioral test for `DiffView`'s `oursOverride` prop.
- *
- * Pins the contract: when an explicit `oursOverride` is passed, the
- * conflict-mode merge view displays those bytes as the `ours` pane instead
- * of `newContent`. This closes the byte-divergence class where the
- * editor-area DiffView showed `git show :2:` bytes while a "Keep mine"
- * dispatch with `strategy: 'content'` would write the (different) Y.Text
- * snapshot. Now both surfaces show the same string.
- *
- * Substrate: jsdom via `bun run test:dom`.
- */
-
-import { cleanup, fireEvent, render, screen } from '@testing-library/react';
-import { afterEach, describe, expect, test } from 'vitest';
-import { DiffView } from './DiffView';
-
-describe('DiffView oursOverride (FR3)', () => {
- afterEach(() => {
- cleanup();
- });
-
- test('uses oursOverride as the ours pane content when present', () => {
- const { container } = render(
- <DiffView
- oldContent="# Base\nold paragraph\n"
- newContent="# DEFAULT_NEW\nignored bytes\n"
- oursOverride="# OVERRIDE\nhello world\n"
- layout="unified"
- conflictMode
- />,
- );
-
- // CodeMirror renders the doc text inside a `.cm-content` container. The
- // bytes the override carries should appear; the bytes `newContent`
- // carries should NOT (since override fully replaces it).
- const cmContent = container.querySelector('.cm-content');
- expect(cmContent).not.toBeNull();
- const rendered = cmContent?.textContent ?? '';
- expect(rendered).toContain('OVERRIDE');
- expect(rendered).toContain('hello world');
- expect(rendered).not.toContain('DEFAULT_NEW');
- expect(rendered).not.toContain('ignored bytes');
- });
-
- test('falls back to newContent when oursOverride is absent', () => {
- const { container } = render(
- <DiffView
- oldContent="# Base\nold paragraph\n"
- newContent="# DEFAULT_NEW\nlegacy bytes\n"
- layout="unified"
- conflictMode
- />,
- );
-
- const cmContent = container.querySelector('.cm-content');
- expect(cmContent).not.toBeNull();
- const rendered = cmContent?.textContent ?? '';
- expect(rendered).toContain('DEFAULT_NEW');
- expect(rendered).toContain('legacy bytes');
- });
-
- test('renders conflict merge controls with shadcn Button', async () => {
- const { container } = render(
- <DiffView
- oldContent="# DiffView conflict sample\n\nThe incoming branch replaces the editor copy.\n"
- newContent="# DiffView conflict sample\n\nThe local branch keeps the current editor copy.\n"
- layout="unified"
- conflictMode
- />,
- );
-
- const accept = await screen.findByRole('button', { name: 'Accept' });
- const reject = await screen.findByRole('button', { name: 'Reject' });
- expect(accept.closest('.cm-chunkButtons')).not.toBeNull();
- expect(reject.closest('.cm-chunkButtons')).not.toBeNull();
- expect(accept.getAttribute('data-slot')).toBe('button');
- expect(reject.getAttribute('data-slot')).toBe('button');
- expect(accept.getAttribute('data-size')).toBe('xs');
- expect(reject.getAttribute('data-size')).toBe('xs');
- expect(accept.getAttribute('data-variant')).toBe('default');
- expect(reject.getAttribute('data-variant')).toBe('destructive');
- expect(container.querySelectorAll('.cm-chunkButtons button[data-slot="button"]').length).toBe(
- 2,
- );
- fireEvent.click(accept);
- await screen.findByText('All hunks resolved');
- });
-});
-
-describe('DiffView conflict footer height contract', () => {
- afterEach(() => {
- cleanup();
- });
-
- // The conflict footer (Exit merge / Undo / Save resolution) must stay
- // clickable while the floating Ask AI composer is visible. The composer
- // anchors its bottom to `--conflict-footer-height` (the counterpart of the
- // composer's own `--ask-composer-height`), so DiffView must publish the
- // footer's measured height on the document root for the whole conflict
- // session and reclaim it afterward.
- test('conflictMode publishes --conflict-footer-height on the document root while mounted', () => {
- const { unmount } = render(
- <DiffView
- oldContent="# Base\ntheirs\n"
- newContent="# Base\nours\n"
- layout="unified"
- conflictMode
- />,
- );
-
- const value = document.documentElement.style.getPropertyValue('--conflict-footer-height');
- // jsdom: offsetHeight=0, so this is a lifecycle pin (published vs not),
- // not a geometry assertion; real browsers produce the actual height.
- expect(value).toBe('0px');
-
- unmount();
- expect(document.documentElement.style.getPropertyValue('--conflict-footer-height')).toBe('');
- });
-
- test('non-conflict renders never publish --conflict-footer-height', () => {
- render(<DiffView oldContent="# Base\ntheirs\n" newContent="# Base\nours\n" layout="unified" />);
-
- expect(document.documentElement.style.getPropertyValue('--conflict-footer-height')).toBe('');
- });
-});
diff --git a/packages/app/src/components/DiffView.tsx b/packages/app/src/components/DiffView.tsx
deleted file mode 100644
index 7835d7836..000000000
--- a/packages/app/src/components/DiffView.tsx
+++ /dev/null
@@ -1,358 +0,0 @@
-import { undo } from '@codemirror/commands';
-import { markdown } from '@codemirror/lang-markdown';
-import { getChunks, MergeView, unifiedMergeView } from '@codemirror/merge';
-import { EditorState } from '@codemirror/state';
-import { EditorView } from '@codemirror/view';
-import { plural } from '@lingui/core/macro';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { basicSetup } from 'codemirror';
-import { useTheme } from 'next-themes';
-import { useEffect, useRef, useState } from 'react';
-import { createPortal } from 'react-dom';
-import { okCmTheme } from '@/editor/extensions/cm-theme';
-import { useConflictFooterHeightVar } from '@/hooks/use-conflict-footer-height';
-import { mergeAcceptHistory } from './conflict-merge-history';
-import { Button } from './ui/button';
-
-const darkTheme = okCmTheme({
- dark: true,
- background: 'var(--background)',
- gutterBackground: 'var(--muted)',
-});
-const lightTheme = okCmTheme({
- dark: false,
- background: 'var(--background)',
- gutterBackground: 'var(--muted)',
-});
-
-const conflictMergeControlTheme = EditorView.theme({
- '.cm-deletedChunk .cm-chunkButtons': {
- display: 'flex',
- gap: '0.25rem',
- },
- ".cm-deletedChunk .cm-chunkButtons button[data-slot='button']": {
- margin: '0',
- border: '1px solid transparent',
- borderRadius: 'min(var(--radius-md), 10px)',
- color: 'var(--primary-foreground)',
- },
- ".cm-deletedChunk .cm-chunkButtons button[data-slot='button'][data-variant='destructive']": {
- color: 'var(--destructive)',
- },
-});
-
-type DiffLayout = 'unified' | 'split';
-
-interface MergeControlPortal {
- id: number;
- host: HTMLElement;
- type: 'reject' | 'accept';
- action: (event: MouseEvent) => void;
-}
-
-function createMergeControlRenderer({
- addControl,
- nextId,
- removeControl,
- root,
-}: {
- addControl: (control: MergeControlPortal) => void;
- nextId: () => number;
- removeControl: (id: number) => void;
- root: HTMLElement;
-}) {
- return (type: 'reject' | 'accept', action: (event: MouseEvent) => void): HTMLElement => {
- const host = document.createElement('span');
- host.className = 'inline-flex';
- const id = nextId();
- addControl({ id, host, type, action });
- queueMicrotask(() => {
- if (!root.contains(host)) removeControl(id);
- });
- return host;
- };
-}
-
-interface DiffViewProps {
- oldContent: string;
- newContent: string;
- layout: DiffLayout;
- /** When true, renders a conflict-resolution editor with per-hunk Accept/Reject. */
- conflictMode?: boolean;
- /**
- * When true, renders `newContent` as a plain read-only CodeMirror surface
- * — no diff against `oldContent`, no hunks, no merge controls. Used by the
- * delete-vs-modify resolution surfaces in `DiffViewBoundary` to preview
- * the surviving file content without diff coloring (the user is choosing
- * between "keep this file" and "delete this file"; the changes-since-base
- * view added noise without informing the decision). When set, `layout`
- * and `conflictMode` are ignored; `oldContent` is unused.
- */
- previewMode?: boolean;
- /**
- * When provided, replaces `newContent` as the bytes shown in the `ours`
- * pane. Lets the conflict-mode caller surface the in-memory Y.Text snapshot
- * (what the user typed mid-conflict, including pre-conflict unflushed
- * edits) instead of the git-index `:2:` bytes — so what the user SEES in
- * the diff IS what a `strategy: 'content'` resolve would write. When
- * omitted the component behaves identically to before.
- */
- oursOverride?: string;
- /** Called with the merged document when all hunks are resolved. */
- onResolve?: (content: string) => void;
- /** Called when the user aborts the merge. */
- onAbort?: () => void;
-}
-
-export function DiffView({
- oldContent,
- newContent,
- layout,
- conflictMode,
- previewMode,
- oursOverride,
- onResolve,
- onAbort,
-}: DiffViewProps) {
- const { t } = useLingui();
- // When the caller hands us an explicit `ours` snapshot (the Y.Text bytes
- // the user has been seeing in the editor), it takes precedence over the
- // legacy `newContent` prop. This keeps the displayed `ours` pane equal
- // to what a `strategy: 'content'` resolve would write — closing the
- // byte-divergence vs `git show :2:` for any loaded doc with unflushed
- // pre-conflict Y.Text edits.
- const effectiveNewContent = oursOverride ?? newContent;
- const containerRef = useRef<HTMLDivElement>(null);
- const viewRef = useRef<MergeView | EditorView | null>(null);
- const mergeControlIdRef = useRef(0);
- const { resolvedTheme } = useTheme();
- const onResolveRef = useRef(onResolve);
- const onAbortRef = useRef(onAbort);
- // Tracks unresolved hunk count in conflictMode so the "Save resolution"
- // button can gate on it. null = pre-init (no view yet).
- const [chunksRemaining, setChunksRemaining] = useState<number | null>(null);
- const [mergeControls, setMergeControls] = useState<MergeControlPortal[]>([]);
- // Keeps the floating Ask AI composer stacked above the conflict footer —
- // see the contract note in use-conflict-footer-height.ts.
- const conflictFooterRef = useConflictFooterHeightVar(conflictMode === true);
- useEffect(() => {
- onResolveRef.current = onResolve;
- onAbortRef.current = onAbort;
- });
-
- useEffect(() => {
- const root = containerRef.current;
- if (!root) return;
- setMergeControls([]);
- const mergeControlHosts = new Map<number, HTMLElement>();
- let disposed = false;
- const removeMergeControl = (id: number) => {
- if (disposed || !mergeControlHosts.delete(id)) return;
- setMergeControls((controls) => controls.filter((control) => control.id !== id));
- };
- const mergeControlObserver = new MutationObserver(() => {
- for (const [id, host] of mergeControlHosts) {
- if (!root.contains(host)) removeMergeControl(id);
- }
- });
- mergeControlObserver.observe(root, { childList: true, subtree: true });
-
- const theme = resolvedTheme === 'dark' ? darkTheme : lightTheme;
- const readOnly = [EditorView.editable.of(false), EditorState.readOnly.of(true)];
- const sharedExtensions = [basicSetup, markdown(), ...readOnly, theme, EditorView.lineWrapping];
-
- // Clear any previous view
- if (viewRef.current) {
- viewRef.current.destroy();
- viewRef.current = null;
- }
-
- if (previewMode) {
- // Preview mode: plain read-only CodeMirror surface for `newContent`.
- // No `unifiedMergeView` extension — no diff against `oldContent`,
- // no hunk markers, no gutter chrome. Used by the delete-vs-modify
- // resolution surfaces to show the surviving file as-is; the user
- // is choosing whether to keep or delete it, not which hunks to
- // accept. Resets `chunksRemaining` to null since the concept does
- // not apply here — the merge-resolution footer (rendered below in
- // conflictMode) is intentionally hidden in this mode by the
- // `conflictMode && ...` guards at the JSX layer.
- const view = new EditorView({
- doc: effectiveNewContent,
- extensions: sharedExtensions,
- parent: root,
- });
- viewRef.current = view;
- setChunksRemaining(null);
- } else if (conflictMode) {
- // Conflict mode: unified diff with per-hunk Accept/Reject buttons.
- // editable=false prevents typing; readOnly is NOT set so merge ops can mutate the doc.
- const renderMergeControl = createMergeControlRenderer({
- addControl: (control) => {
- if (disposed) return;
- mergeControlHosts.set(control.id, control.host);
- setMergeControls((controls) => [...controls, control]);
- },
- nextId: () => {
- mergeControlIdRef.current += 1;
- return mergeControlIdRef.current;
- },
- removeControl: removeMergeControl,
- root,
- });
- const conflictExtensions = [
- basicSetup,
- markdown(),
- EditorView.editable.of(false),
- theme,
- conflictMergeControlTheme,
- EditorView.lineWrapping,
- mergeAcceptHistory(),
- unifiedMergeView({
- original: oldContent,
- highlightChanges: true,
- gutter: true,
- mergeControls: renderMergeControl,
- collapseUnchanged: { margin: 3, minSize: 4 },
- }),
- EditorView.updateListener.of((update) => {
- // @codemirror/merge's acceptChunk dispatches effects-only (no doc
- // change), so we cannot gate on update.docChanged. Re-read chunks
- // on every update and let the explicit "Save resolution" button
- // drive completion.
- const result = getChunks(update.state);
- setChunksRemaining(result ? result.chunks.length : 0);
- }),
- ];
- const view = new EditorView({
- doc: effectiveNewContent,
- extensions: conflictExtensions,
- parent: root,
- });
- viewRef.current = view;
- // Seed initial hunk count (updateListener only fires on subsequent updates).
- const initial = getChunks(view.state);
- setChunksRemaining(initial ? initial.chunks.length : 0);
- } else if (layout === 'split') {
- const mv = new MergeView({
- a: { doc: oldContent, extensions: sharedExtensions },
- b: { doc: effectiveNewContent, extensions: sharedExtensions },
- parent: root,
- highlightChanges: true,
- gutter: true,
- collapseUnchanged: { margin: 3, minSize: 4 },
- });
- viewRef.current = mv;
- } else {
- const view = new EditorView({
- doc: effectiveNewContent,
- extensions: [
- ...sharedExtensions,
- unifiedMergeView({
- original: oldContent,
- highlightChanges: true,
- gutter: true,
- mergeControls: false,
- collapseUnchanged: { margin: 3, minSize: 4 },
- }),
- ],
- parent: root,
- });
- viewRef.current = view;
- }
-
- return () => {
- disposed = true;
- mergeControlObserver.disconnect();
- if (viewRef.current) {
- viewRef.current.destroy();
- viewRef.current = null;
- }
- };
- }, [oldContent, effectiveNewContent, layout, resolvedTheme, conflictMode, previewMode]);
-
- function handleSaveResolution() {
- const view = viewRef.current;
- if (!view || !(view instanceof EditorView)) return;
- onResolveRef.current?.(view.state.doc.toString());
- }
-
- function handleUndo() {
- const view = viewRef.current;
- if (!view || !(view instanceof EditorView)) return;
- undo(view);
- }
-
- const allResolved = chunksRemaining === 0;
- const hunksLabel =
- chunksRemaining === null
- ? ''
- : chunksRemaining === 0
- ? t`All hunks resolved`
- : plural(chunksRemaining, {
- one: '# unresolved hunk',
- other: '# unresolved hunks',
- });
-
- return (
- <div className="flex flex-col h-full">
- <div
- ref={containerRef}
- className="diff-view min-h-0 flex-1 overflow-y-auto subtle-scrollbar"
- />
- {mergeControls.map((control) =>
- createPortal(
- <Button
- type="button"
- variant={control.type === 'accept' ? 'default' : 'destructive'}
- size="xs"
- onClick={(event) => {
- control.action(event.nativeEvent);
- }}
- >
- {control.type === 'accept' ? t`Accept` : t`Reject`}
- </Button>,
- control.host,
- control.id,
- ),
- )}
- {conflictMode && (
- <div
- ref={conflictFooterRef}
- className="flex items-center justify-between gap-2 px-3 py-2 border-t shrink-0"
- >
- <span
- className={`text-xs ${allResolved ? 'text-emerald-600 dark:text-emerald-400' : 'text-muted-foreground'}`}
- >
- {hunksLabel}
- </span>
- <div className="flex items-center gap-2">
- {onAbort && (
- <Button className="uppercase font-mono" variant="ghost" size="sm" onClick={onAbort}>
- <Trans>Exit merge</Trans>
- </Button>
- )}
- <Button
- className="uppercase font-mono"
- variant="outline"
- size="sm"
- onClick={handleUndo}
- >
- <Trans>Undo</Trans>
- </Button>
- {onResolve && (
- <Button
- variant="default"
- size="sm"
- disabled={!allResolved}
- onClick={handleSaveResolution}
- >
- <Trans>Save resolution</Trans>
- </Button>
- )}
- </div>
- </div>
- )}
- </div>
- );
-}
diff --git a/packages/app/src/components/DiffViewBoundary.resolved.dom.test.tsx b/packages/app/src/components/DiffViewBoundary.resolved.dom.test.tsx
new file mode 100644
index 000000000..4a709547d
--- /dev/null
+++ b/packages/app/src/components/DiffViewBoundary.resolved.dom.test.tsx
@@ -0,0 +1,234 @@
+/**
+ * Pins the bounded conflict-entry deferral in `DiffViewBoundary`.
+ *
+ * An absent conflict entry is ambiguous. For ~100ms after this boundary swaps
+ * in it means "the CC1 signal has not caught up"; after a resolution it means
+ * "there is no conflict any more". Nothing in the entry distinguishes them, so
+ * the wait is bounded rather than guessed.
+ *
+ * The case that forces a bound rather than a latch: resolving writes the file,
+ * the watcher reloads the doc, and this boundary REMOUNTS with no entry to
+ * find. "Have we shown a conflict before" is false on a fresh mount, so a latch
+ * would leave it waiting forever — which is the hang this exists to prevent.
+ *
+ * Substrate: jsdom.
+ */
+
+import { act, cleanup, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import * as Y from 'yjs';
+
+vi.doMock('sonner', () => ({
+ toast: { error: () => {}, success: () => {}, info: () => {} },
+}));
+vi.doMock('next-themes', () => ({
+ useTheme: () => ({ resolvedTheme: 'light' }),
+}));
+vi.doMock('@/lib/documents-events', () => ({
+ subscribeToDocumentsChanged: () => () => {},
+}));
+
+let conflictsState: {
+ conflicts: { file: string; detectedAt: string }[];
+ loading: boolean;
+ error: null;
+} = { conflicts: [], loading: true, error: null };
+
+vi.doMock('@/hooks/use-conflicts', () => ({
+ useConflicts: () => conflictsState,
+}));
+
+const { DiffViewBoundary } = await import('./DiffViewBoundary');
+
+/** Comfortably past CONFLICT_ENTRY_GRACE_MS (2s), so the timer has matured. */
+const CONFLICT_GRACE_OVERSHOOT_MS = 5_000;
+
+const ENTRY = { file: 'notes/roadmap.md', detectedAt: '2026-08-25T00:00:00.000Z' };
+
+function makeProvider(body: string) {
+ const doc = new Y.Doc();
+ doc.getText('source').insert(0, body);
+ return { document: doc } as unknown as Parameters<typeof DiffViewBoundary>[0]['provider'];
+}
+
+const contentFetches: string[] = [];
+const resolvePosts: string[] = [];
+let releaseResolve: (() => void) | null = null;
+
+beforeEach(() => {
+ contentFetches.length = 0;
+ resolvePosts.length = 0;
+ releaseResolve = null;
+ conflictsState = { conflicts: [], loading: true, error: null };
+ globalThis.fetch = ((input: RequestInfo | URL) => {
+ const url = typeof input === 'string' ? input : input.toString();
+ if (url.startsWith('/api/sync/resolve-conflict')) {
+ resolvePosts.push(url);
+ // Held open so a second click lands while the first is still in flight —
+ // the window the Apply latch exists for. Server-side this is `git add`
+ // plus a commit, so a latch released before it settles is no latch.
+ return new Promise<Response>((resolveFetch) => {
+ releaseResolve = () =>
+ resolveFetch(
+ new Response(JSON.stringify({}), {
+ status: 200,
+ headers: { 'Content-Type': 'application/json' },
+ }),
+ );
+ });
+ }
+ if (url.startsWith('/api/sync/conflict-content')) contentFetches.push(url);
+ if (url.startsWith('/api/sync/conflict-content')) {
+ return Promise.resolve(
+ new Response(
+ JSON.stringify({
+ file: 'notes/roadmap.md',
+ kind: 'both-modified',
+ base: '# Roadmap\n\n- Ship date: October 14\n',
+ // Diverges from base as well as from theirs — with ours === base, diff3
+ // auto-merges and the view renders with no conflict regions at all.
+ ours: '# Roadmap\n\n- Ship date: October 21\n',
+ theirs: '# Roadmap\n\n- Ship date: Q4\n',
+ }),
+ { status: 200, headers: { 'Content-Type': 'application/json' } },
+ ),
+ );
+ }
+ return Promise.resolve(new Response('{}', { status: 200 }));
+ }) as typeof fetch;
+});
+
+afterEach(() => {
+ cleanup();
+ vi.restoreAllMocks();
+});
+
+describe('DiffViewBoundary — conflict resolved while open', () => {
+ test('keeps waiting inside the CC1 catch-up window', async () => {
+ // lifecycle.status propagates over CRDT faster than the signal that
+ // refreshes the conflicts list. An absent entry here means "not yet".
+ vi.useFakeTimers();
+ conflictsState = { conflicts: [], loading: false, error: null };
+ render(<DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />);
+
+ await act(async () => {
+ vi.advanceTimersByTime(500);
+ });
+
+ expect(screen.queryByText('This conflict is resolved.')).toBeNull();
+ vi.useRealTimers();
+ });
+
+ test('reports resolution on a FRESH mount once the entry never arrives', async () => {
+ // The hard case: resolving writes the file, the watcher reloads the doc and
+ // this boundary REMOUNTS with no entry to find. A latch on "did we show a
+ // conflict before" is false here, so only a bounded wait catches it.
+ vi.useFakeTimers();
+ conflictsState = { conflicts: [], loading: false, error: null };
+ render(<DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />);
+
+ await act(async () => {
+ vi.advanceTimersByTime(2500);
+ });
+
+ expect(screen.getByText('This conflict is resolved.')).toBeTruthy();
+ expect(screen.queryByText(/Loading conflict/)).toBeNull();
+ vi.useRealTimers();
+ });
+
+ test('reports resolution when a conflict it was showing stops being tracked', async () => {
+ conflictsState = { conflicts: [ENTRY], loading: false, error: null };
+ const { rerender } = render(
+ <DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />,
+ );
+ await waitFor(() => {
+ expect(screen.queryByText(/Loading conflict/)).toBeNull();
+ });
+
+ conflictsState = { conflicts: [], loading: false, error: null };
+ rerender(<DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />);
+
+ await waitFor(
+ () => {
+ expect(screen.getByText('This conflict is resolved.')).toBeTruthy();
+ },
+ { timeout: 4000 },
+ );
+ });
+
+ test('re-fetches when the same file gets a NEW conflict', async () => {
+ // A resolved-then-re-detected file keeps its path. Keying the fetch on the
+ // path alone leaves the diff frozen on the previous conflict while the rest
+ // of the app moves on, so the sides must follow the conflict's identity.
+ conflictsState = { conflicts: [ENTRY], loading: false, error: null };
+ const { rerender } = render(
+ <DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />,
+ );
+ await waitFor(() => {
+ expect(contentFetches.length).toBe(1);
+ });
+
+ // Same file, new detection — what re-arming a conflict produces.
+ conflictsState = {
+ conflicts: [{ ...ENTRY, detectedAt: '2026-08-25T09:00:00.000Z' }],
+ loading: false,
+ error: null,
+ };
+ rerender(<DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />);
+
+ await waitFor(() => {
+ expect(contentFetches.length).toBe(2);
+ });
+ });
+
+ test('a failed conflicts fetch is not reported as a resolution', async () => {
+ // `useConflicts` returns an EMPTY list on a failed fetch. Dropping its
+ // `error` made "we could not ask" identical to "nothing is conflicted", so
+ // the grace timer matured and told the user the work was done — while the
+ // file still carried markers and the editor stayed swapped out. Worse, the
+ // panel returns before <ConflictView>, so a mounted view and its whole undo
+ // stack are discarded.
+ vi.useFakeTimers();
+ conflictsState = {
+ conflicts: [],
+ loading: false,
+ error: 'network' as unknown as null,
+ };
+ render(<DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />);
+
+ await act(async () => {
+ vi.advanceTimersByTime(CONFLICT_GRACE_OVERSHOOT_MS);
+ });
+
+ expect(screen.queryByText('This conflict is resolved.')).toBeNull();
+ expect(screen.getByText(/Couldn't check whether/)).toBeTruthy();
+ vi.useRealTimers();
+ });
+
+ test('Apply reaches the endpoint once, through the real boundary wiring', async () => {
+ // The latch lives in ConflictView but the promise it awaits is supplied
+ // HERE. A previous revision passed `(content) => void handleResolve(content)`,
+ // so the latch awaited `undefined` and released on the next microtask
+ // rather than after the commit. Testing that through ConflictView alone
+ // cannot see it — the wrapper is not in the path. This drives the boundary.
+ conflictsState = { conflicts: [ENTRY], loading: false, error: null };
+ render(<DiffViewBoundary docName="notes/roadmap" provider={makeProvider('# Roadmap\n')} />);
+
+ await waitFor(() => {
+ expect(screen.getAllByRole('button', { name: /^Accept current/ }).length).toBeGreaterThan(0);
+ });
+ screen.getAllByRole('button', { name: /^Accept current/ })[0].click();
+
+ const apply = await screen.findByRole('button', { name: 'Apply changes' });
+ apply.click();
+ await act(async () => {});
+ // Still in flight: the endpoint has not answered.
+ apply.click();
+ await act(async () => {});
+
+ expect(resolvePosts).toHaveLength(1);
+
+ releaseResolve?.();
+ await act(async () => {});
+ });
+});
diff --git a/packages/app/src/components/DiffViewBoundary.tsx b/packages/app/src/components/DiffViewBoundary.tsx
index cd84e8c1f..d42852c2a 100644
--- a/packages/app/src/components/DiffViewBoundary.tsx
+++ b/packages/app/src/components/DiffViewBoundary.tsx
@@ -16,9 +16,9 @@
* contains conflict markers — which happens on editor reopen because
* the file watcher seeds Y.Text with the disk's marker bytes.
* `theirs` always comes from `git show :3:`.
- * 3. Render `<DiffView conflictMode oldContent={theirs} newContent={ours}
- * layout="unified" onResolve />`. Resolution dispatches the merged
- * content via the DiffView's "Save resolution" button.
+ * 3. Render `<ConflictView ours theirs base onResolve />` for both-modified
+ * conflicts. ConflictView owns a Pierre UnresolvedFile instance and
+ * calls onResolve with the resolved content when all hunks are accepted.
* 4. Emit `editor-area-swap-to-diffview` / `editor-area-swap-from-diffview`
* structured log events on mount / unmount.
*/
@@ -30,7 +30,8 @@ import { Button } from '@/components/ui/button';
import { useConflictFooterHeightVar } from '@/hooks/use-conflict-footer-height';
import { useConflicts } from '@/hooks/use-conflicts';
import { filePathToDocName } from '@/lib/doc-hash';
-import { DiffView } from './DiffView';
+import { ConflictFilePreview } from './ConflictFilePreview';
+import { ConflictView } from './ConflictView';
import {
resolveConflictContent,
resolveConflictDelete,
@@ -38,6 +39,13 @@ import {
resolveConflictTheirs,
} from './resolve-conflict-dispatch';
+/**
+ * How long to keep deferring the conflict-content fetch while no conflict entry
+ * exists. Covers the CC1 `sync-status` catch-up window (~100ms observed) with
+ * room to spare; past it, the conflict is gone rather than late.
+ */
+const CONFLICT_ENTRY_GRACE_MS = 2_000;
+
interface DiffViewBoundaryProps {
docName: string;
provider: HocuspocusProvider;
@@ -141,11 +149,34 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
// re-fetch `/api/sync/conflicts`. Without deferring, an `.mdx` doc in a
// newly-detected conflict would fire a wrong-extension `.md` request
// and flash the error fallback before the conflicts list catches up.
- const { conflicts, loading: conflictsLoading } = useConflicts();
+ // `error` is destructured, not dropped: `useConflicts` returns an EMPTY list
+ // on a failed fetch, so discarding it makes "we could not ask" identical to
+ // "nothing is conflicted" — and the grace timer below then reports the
+ // conflict resolved, tearing down a mounted view and its undo stack.
+ const { conflicts, loading: conflictsLoading, error: conflictsError } = useConflicts();
const conflictEntry = conflicts.find((entry) => filePathToDocName(entry.file) === docName);
const filePath = conflictEntry?.file ?? `${docName}.md`;
const [sides, setSides] = useState<ConflictSides | null>(null);
const [fetchFailed, setFetchFailed] = useState(false);
+ // An absent conflict entry is ambiguous: it means "the CC1 signal has not
+ // caught up yet" for the ~100ms after this boundary swaps in, and it means
+ // "there is no longer a conflict" once one has been resolved. Waiting is
+ // right for the first and wrong for the second, and nothing in the entry
+ // itself distinguishes them — so bound the wait instead of guessing.
+ //
+ // This covers the resolve-while-open case AND the harder one: the resolve
+ // writes the file, the watcher reloads the doc, and this boundary REMOUNTS
+ // with no entry to find. A latch on "did we render a conflict before" misses
+ // that, because a remounted boundary never did.
+ const [waitedForEntry, setWaitedForEntry] = useState(false);
+ useEffect(() => {
+ if (conflictEntry !== undefined || conflictsLoading || conflictsError !== null) {
+ setWaitedForEntry(false);
+ return;
+ }
+ const timer = setTimeout(() => setWaitedForEntry(true), CONFLICT_ENTRY_GRACE_MS);
+ return () => clearTimeout(timer);
+ }, [conflictEntry, conflictsLoading, conflictsError]);
// Guards the DU/UD resolve buttons against double-fire / cross-strategy
// clicks while a dispatch is in flight — these run `git rm` + a commit,
// so a second click (or clicking the sibling strategy) mid-request races
@@ -180,9 +211,26 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
// wrong for `.mdx` docs. The deferral self-heals on the next CC1
// `sync-status` signal; if the entry never arrives the user sees
// the loading spinner and the documented recovery procedure applies.
+ // Identity of the CONFLICT, not just the file. A resolved-then-re-detected
+ // file keeps its path, so a path-only dependency leaves the fetched sides
+ // frozen on the previous conflict until something forces a remount — the
+ // document updates around a diff that no longer matches it.
+ const conflictSignature =
+ conflictEntry === undefined
+ ? null
+ : [
+ conflictEntry.detectedAt,
+ conflictEntry.baseSha ?? '',
+ conflictEntry.oursSha ?? '',
+ conflictEntry.theirsSha ?? '',
+ ].join('|');
+
const deferFetch = conflictsLoading || conflictEntry === undefined;
useEffect(() => {
- if (deferFetch) return;
+ // Reading the signature here is load-bearing, not decoration: a dependency
+ // that never appears in the body is stripped by the exhaustive-deps
+ // autofix, which silently restores the stale-sides bug.
+ if (deferFetch || conflictSignature === null) return;
let cancelled = false;
setSides(null);
setFetchFailed(false);
@@ -197,7 +245,7 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
return () => {
cancelled = true;
};
- }, [filePath, deferFetch]);
+ }, [filePath, deferFetch, conflictSignature]);
async function handleResolve(content: string) {
const result = await resolveConflictContent(filePath, content);
@@ -230,6 +278,41 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
);
}
+ // A conflict we were showing is no longer tracked, so it was resolved —
+ // here, or by an agent, or in another window. The doc's `lifecycle.status`
+ // is what swaps this boundary in, and it is cleared on a separate server
+ // path that does not fire for every resolve variant, so this boundary can
+ // outlive its conflict. Say so instead of deferring the fetch forever and
+ // showing a spinner that never resolves.
+ // An unreachable conflicts list is not an absent conflict. Say which one it
+ // is rather than asserting the work is done: the file still carries markers,
+ // the doc is still flagged, and the editor is still swapped out.
+ if (conflictsError !== null && conflictEntry === undefined) {
+ return (
+ <div className="flex h-full items-center justify-center p-6 text-sm text-muted-foreground">
+ <Trans>Couldn't check whether {filePath} is still conflicted — retrying.</Trans>
+ </div>
+ );
+ }
+
+ if (
+ waitedForEntry &&
+ !conflictsLoading &&
+ conflictsError === null &&
+ conflictEntry === undefined
+ ) {
+ return (
+ <div className="flex h-full flex-col items-center justify-center gap-1 p-6 text-sm text-muted-foreground">
+ <p>
+ <Trans>This conflict is resolved.</Trans>
+ </p>
+ <p className="text-xs">
+ <Trans>Reopen {filePath} to keep editing.</Trans>
+ </p>
+ </div>
+ );
+ }
+
if (sides === null) {
return (
<div className="flex h-full items-center justify-center p-6 text-sm text-muted-foreground">
@@ -254,7 +337,7 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
// the inner editor.
<div className="flex h-full flex-col bg-background">
<div className="min-h-0 flex-1">
- <DiffView oldContent="" newContent={sides.theirs} layout="unified" previewMode />
+ <ConflictFilePreview filename={filePath} content={sides.theirs} />
</div>
<div
ref={duUdFooterRef}
@@ -301,7 +384,7 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
// they'd lose if they accept the upstream deletion.
<div className="flex h-full flex-col bg-background">
<div className="min-h-0 flex-1">
- <DiffView oldContent="" newContent={sides.ours} layout="unified" previewMode />
+ <ConflictFilePreview filename={filePath} content={sides.ours} />
</div>
<div
ref={duUdFooterRef}
@@ -337,12 +420,15 @@ export function DiffViewBoundary({ docName }: DiffViewBoundaryProps) {
}
return (
- <DiffView
- oldContent={sides.theirs}
- newContent={sides.ours}
- layout="unified"
- conflictMode
- onResolve={(content) => void handleResolve(content)}
+ <ConflictView
+ fileName={filePath}
+ ours={sides.ours}
+ base={sides.base}
+ theirs={sides.theirs}
+ // Passed by reference, NOT wrapped in `void`: ConflictView's Apply latch
+ // awaits whatever this returns, so discarding the promise released the
+ // latch on the next microtask instead of after the commit.
+ onResolve={handleResolve}
/>
);
}
diff --git a/packages/app/src/components/EditorActivityPool.toolbar-inset.dom.test.tsx b/packages/app/src/components/EditorActivityPool.toolbar-inset.dom.test.tsx
new file mode 100644
index 000000000..beeeac3c0
--- /dev/null
+++ b/packages/app/src/components/EditorActivityPool.toolbar-inset.dom.test.tsx
@@ -0,0 +1,49 @@
+/**
+ * Pins the top inset to the toolbar that justifies it.
+ *
+ * The scroller reserves 3.5rem so document content does not start behind the
+ * absolute-positioned `EditorToolbar`. `EditorArea` returns null from that
+ * toolbar while a document is conflicted, so an unconditional reserve holds an
+ * empty band above a conflict view that already draws its own header.
+ *
+ * Substrate: jsdom.
+ */
+
+import { cleanup, render } from '@testing-library/react';
+import { afterEach, describe, expect, test } from 'vitest';
+import { ScrollPreservingContainer } from './EditorActivityPool';
+
+afterEach(cleanup);
+
+function scrollerOf(container: HTMLElement) {
+ const el = container.querySelector('[data-testid="editor-scroll-container"]');
+ if (!el) throw new Error('scroll container not found');
+ return el;
+}
+
+describe('ScrollPreservingContainer toolbar inset', () => {
+ test('reserves the toolbar band when the toolbar is mounted', () => {
+ const { container } = render(
+ <ScrollPreservingContainer isActive docName="doc-a" mode="wysiwyg">
+ <div>body</div>
+ </ScrollPreservingContainer>,
+ );
+ const cls = scrollerOf(container).className;
+ expect(cls).toContain('pt-14');
+ expect(cls).toContain('scroll-pt-14');
+ });
+
+ test('drops the reserve when the toolbar is absent', () => {
+ // What a conflicted document renders: EditorArea returns null from the
+ // toolbar, so there is no overlay for the band to sit under.
+ const { container } = render(
+ <ScrollPreservingContainer isActive docName="doc-b" mode="wysiwyg" hasToolbar={false}>
+ <div>body</div>
+ </ScrollPreservingContainer>,
+ );
+ const cls = scrollerOf(container).className;
+ expect(cls).toContain('pt-0');
+ expect(cls).not.toContain('pt-14');
+ expect(cls).not.toContain('scroll-pt-14');
+ });
+});
diff --git a/packages/app/src/components/EditorActivityPool.tsx b/packages/app/src/components/EditorActivityPool.tsx
index 04129a478..5d67bfc71 100644
--- a/packages/app/src/components/EditorActivityPool.tsx
+++ b/packages/app/src/components/EditorActivityPool.tsx
@@ -78,7 +78,6 @@ import { isNoteWindow } from '@/lib/note-window-mode';
import { mark, ProfilerBoundary } from '@/lib/perf';
import { readNumericOverride } from '@/lib/perf/env-override';
import { cn } from '@/lib/utils';
-import { DiffViewBoundary } from './DiffViewBoundary';
import { DocumentBoundary } from './DocumentBoundary';
import { DocumentErrorBoundary } from './DocumentErrorBoundary';
import { EditorSkeleton } from './EditorSkeleton';
@@ -98,6 +97,16 @@ import {
} from './scroll-restore';
import { Button } from './ui/button';
+// The conflict surface only mounts when a doc's `lifecycle.status` is
+// `conflict`, so `@pierre/diffs` — and the whole rendered-diff engine behind it
+// — has no business in the eager editor chunk. Same reasoning and same shape as
+// the version-diff panes in EditorArea: conditionally mounted, so code-split.
+// The boundary pulls ConflictView and ConflictFilePreview with it.
+const LazyDiffViewBoundary = lazy(async () => {
+ const mod = await import('./DiffViewBoundary');
+ return { default: mod.DiffViewBoundary };
+});
+
// Lazy-loaded: the skill/template identity panel (+ SkillProperties /
// TemplateProperties + their rename/move APIs) only mounts for managed-artifact
// docs, so it stays out of the eager editor bundle (same rationale as the
@@ -700,6 +709,7 @@ export function ScrollPreservingContainer({
mode,
initialScrollTop,
bodyAnchorRef,
+ hasToolbar = true,
children,
}: {
isActive: boolean;
@@ -733,6 +743,13 @@ export function ScrollPreservingContainer({
* existing behavior is unchanged whenever nothing above the body moved.
*/
bodyAnchorRef?: RefObject<HTMLElement | null>;
+ /**
+ * Whether `EditorToolbar` is actually overlaying this scroller. False leaves
+ * the top inset off: the toolbar returns null for a conflicted document, and
+ * an unconditional reserve would then hold 3.5rem of empty space above a
+ * conflict view that draws its own header.
+ */
+ hasToolbar?: boolean;
children: ReactNode;
}) {
const ref = useRef<HTMLDivElement>(null);
@@ -1152,7 +1169,10 @@ export function ScrollPreservingContainer({
// Toolbar exclusion zone = 3.5rem (EditorToolbar's rendered height). Seven
// load-bearing constants must move together if the toolbar height changes:
// - `pt-14` (here): initial-paint content reserve so doc content doesn't
- // start behind the absolute-positioned EditorToolbar overlay.
+ // start behind the absolute-positioned EditorToolbar overlay. Applied
+ // only when that overlay is actually mounted (`hasToolbar`) — EditorArea
+ // returns null from it for a conflicted doc, and the reserve would
+ // otherwise strand 3.5rem above a view drawing its own header.
// - `scroll-pt-14` (here): scroll-padding-top for native
// Element.scrollIntoView alignment — TiptapEditor outline-click +
// wiki-link anchor navigation, and editor/extensions/footnote-anchor-scroll.ts.
@@ -1182,7 +1202,7 @@ export function ScrollPreservingContainer({
// The toolbar itself: components/EditorToolbar.tsx.
className={cn(
'editor-doc-scroll subtle-scrollbar h-full overflow-y-auto',
- isNoteWindow() ? 'pt-0 scroll-pt-0' : 'pt-14 scroll-pt-14',
+ isNoteWindow() || !hasToolbar ? 'pt-0 scroll-pt-0' : 'pt-14 scroll-pt-14',
)}
style={{ overflowAnchor: 'auto' }}
>
@@ -1536,6 +1556,7 @@ function ActivityEntry({
mode={effectiveIsSourceMode ? 'source' : 'wysiwyg'}
initialScrollTop={warmSnapshot?.scrollTop}
bodyAnchorRef={bodyAnchorRef}
+ hasToolbar={!isConflict}
>
{recoveryView ? (
<ServerRestartRecoveryPanel view={recoveryView} />
@@ -1584,7 +1605,16 @@ function ActivityEntry({
#18(b) hybrid render tree preserved — we swap children,
not boundaries). Y.Doc identity is unchanged across
the swap, so Y.Text content + undo history survive. */
- <DiffViewBoundary docName={entry.docName} provider={entry.provider} />
+ /* Its own Suspense, matching the Excalidraw branch below:
+ the nearest boundary otherwise is the per-Activity one
+ wrapping DocumentBoundary itself, so the first render of
+ this lazy element suspends the whole subtree — the
+ fallback replaces the pane and DocumentBoundary's
+ syncPromise gate unmounts and remounts when the chunk
+ lands, on a transition that is already a jarring switch. */
+ <Suspense fallback={<EditorSkeleton />}>
+ <LazyDiffViewBoundary docName={entry.docName} provider={entry.provider} />
+ </Suspense>
) : isMermaid ? (
/* Standalone Mermaid doc: dedicated diagram (wysiwyg) + editable
source editor, both bound to this doc's Y.Text('source').
diff --git a/packages/app/src/components/SkillForkDialog.tsx b/packages/app/src/components/SkillForkDialog.tsx
index e94c33f39..eb838b5df 100644
--- a/packages/app/src/components/SkillForkDialog.tsx
+++ b/packages/app/src/components/SkillForkDialog.tsx
@@ -1,8 +1,8 @@
import { SKILL_NAME_REGEX, type SkillsListEntry } from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
+import { MultiFileDiff } from '@pierre/diffs/react';
import { useEffect, useId, useState } from 'react';
import { toast } from 'sonner';
-import { DiffView } from '@/components/DiffView';
import { Button } from '@/components/ui/button';
import {
Dialog,
@@ -15,6 +15,7 @@ import {
} from '@/components/ui/dialog';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
+import { okPierreTheme } from '@/lib/pierre-theme';
import { skillHostRootDir } from '@/lib/skill-scope';
import { fetchSkillPreview, resolveSkillFork } from '@/lib/skills-api';
@@ -131,7 +132,7 @@ export function SkillForkDialog({
{/* `w-full` so the dialog holds its max width even before/without the diff
— otherwise it collapses to the placeholder's width and the footer
buttons spread edge-to-edge. */}
- <DialogContent className="flex max-h-[85vh] w-full max-w-3xl flex-col">
+ <DialogContent className="flex max-h-[85vh] w-full flex-col sm:max-w-5xl">
<DialogHeader>
<DialogTitle>
<Trans>
@@ -147,7 +148,14 @@ export function SkillForkDialog({
</DialogHeader>
<DialogBody className="min-h-0 flex-1 overflow-auto">
{canonicalBody !== null && forkBody !== null ? (
- <DiffView oldContent={canonicalBody} newContent={forkBody} layout="unified" />
+ <MultiFileDiff
+ className="conflict-view"
+ oldFile={{ name: skill.name, contents: canonicalBody }}
+ newFile={{ name: skill.name, contents: forkBody }}
+ // Pierre's diff renderer defaults to `split`; prose skill bodies
+ // read better unified, and it matches the conflict surface.
+ options={{ overflow: 'wrap', diffStyle: 'unified', theme: okPierreTheme() }}
+ />
) : previewError ? (
<div className="flex min-h-56 items-center justify-center px-6 text-center text-muted-foreground text-sm">
<Trans>
diff --git a/packages/app/src/components/SkillOriginInline.tsx b/packages/app/src/components/SkillOriginInline.tsx
index 185964a7d..500c09abe 100644
--- a/packages/app/src/components/SkillOriginInline.tsx
+++ b/packages/app/src/components/SkillOriginInline.tsx
@@ -1,14 +1,20 @@
import type { SkillScope } from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
import { ArrowUpRight, RefreshCw, Undo2 } from 'lucide-react';
-import { useState } from 'react';
-import { SkillUpdateConflictDialog } from '@/components/SkillUpdateConflictDialog';
+import { lazy, Suspense, useState } from 'react';
import { Button } from '@/components/ui/button';
import { Spinner } from '@/components/ui/spinner';
import { Switch } from '@/components/ui/switch';
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
import { useSkillOrigin } from '@/hooks/use-skill-origin';
+// Pulls `@pierre/diffs/react` with it, and only ever renders when an update
+// actually conflicts — so it has no claim on the eager chunk.
+const LazySkillUpdateConflictDialog = lazy(async () => {
+ const mod = await import('@/components/SkillUpdateConflictDialog');
+ return { default: mod.SkillUpdateConflictDialog };
+});
+
/**
* Import provenance for the active skill tab, rendered inline on the LEFT of the
* editor toolbar (where a non-skill doc shows its breadcrumb). Reads as quiet
@@ -189,17 +195,19 @@ export function SkillOriginInline({ scope, name }: { scope: SkillScope; name: st
</Tooltip>
) : null}
{conflict ? (
- <SkillUpdateConflictDialog
- open
- onOpenChange={(o) => {
- if (!o) setConflict(null);
- }}
- skillName={name}
- localBody={conflict.localBody}
- upstreamBody={conflict.upstreamBody}
- applying={reimporting}
- onTakeUpstream={() => void onTakeUpstream()}
- />
+ <Suspense fallback={null}>
+ <LazySkillUpdateConflictDialog
+ open
+ onOpenChange={(o) => {
+ if (!o) setConflict(null);
+ }}
+ skillName={name}
+ localBody={conflict.localBody}
+ upstreamBody={conflict.upstreamBody}
+ applying={reimporting}
+ onTakeUpstream={() => void onTakeUpstream()}
+ />
+ </Suspense>
) : null}
</div>
);
diff --git a/packages/app/src/components/SkillUpdateConflictDialog.tsx b/packages/app/src/components/SkillUpdateConflictDialog.tsx
index 0c13f2839..9971724bf 100644
--- a/packages/app/src/components/SkillUpdateConflictDialog.tsx
+++ b/packages/app/src/components/SkillUpdateConflictDialog.tsx
@@ -1,5 +1,5 @@
import { Trans } from '@lingui/react/macro';
-import { DiffView } from '@/components/DiffView';
+import { MultiFileDiff } from '@pierre/diffs/react';
import { Button } from '@/components/ui/button';
import {
Dialog,
@@ -10,11 +10,12 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
+import { okPierreTheme } from '@/lib/pierre-theme';
/**
* Confirm-diff shown when Update would overwrite a locally-modified skill. Renders
- * the user's current SKILL.md body against the incoming upstream (read-only reuse
- * of `DiffView`), then lets them Take upstream (apply, discarding local edits —
+ * the user's current SKILL.md body against the incoming upstream (read-only
+ * `MultiFileDiff`), then lets them Take upstream (apply, discarding local edits —
* recoverable from version history) or Keep mine (cancel). Only opened when the
* skill is modified AND upstream changed; a clean skill updates without this gate.
*/
@@ -37,7 +38,11 @@ export function SkillUpdateConflictDialog({
}) {
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="flex max-h-[85vh] max-w-3xl flex-col">
+ {/* Side-by-side diff of two prose bodies: at the dialog base width the
+ columns are narrow enough that a single sentence wraps over four
+ lines and the two sides stop being comparable at a glance. The `sm:`
+ prefix is required to beat DialogContent's own `sm:max-w-sm`. */}
+ <DialogContent className="flex max-h-[85vh] flex-col sm:max-w-5xl">
<DialogHeader>
<DialogTitle>
<Trans>Update "{skillName}" over your edits?</Trans>
@@ -50,8 +55,17 @@ export function SkillUpdateConflictDialog({
</DialogDescription>
</DialogHeader>
<DialogBody className="min-h-0 flex-1 overflow-auto">
- {/* old = your current body, new = incoming upstream. */}
- <DiffView oldContent={localBody} newContent={upstreamBody} layout="unified" />
+ {/* old = your current body, new = incoming upstream.
+ `diffStyle` is explicit because Pierre's diff renderer defaults to
+ `split`, which would put two narrow columns of wrapped prose side
+ by side. Unified also matches the conflict surface, whose renderer
+ hardcodes unified and cannot be switched. */}
+ <MultiFileDiff
+ className="conflict-view"
+ oldFile={{ name: skillName, contents: localBody }}
+ newFile={{ name: skillName, contents: upstreamBody }}
+ options={{ overflow: 'wrap', diffStyle: 'unified', theme: okPierreTheme() }}
+ />
</DialogBody>
<DialogFooter>
<Button variant="outline" onClick={() => onOpenChange(false)} disabled={applying}>
diff --git a/packages/app/src/components/acp/AgentMarkdown.tsx b/packages/app/src/components/acp/AgentMarkdown.tsx
index 0e5791579..0673edf6a 100644
--- a/packages/app/src/components/acp/AgentMarkdown.tsx
+++ b/packages/app/src/components/acp/AgentMarkdown.tsx
@@ -143,8 +143,9 @@ export function AgentMarkdown({ text }: { text: string }): ReactNode {
controls={{ code: { copy: true, download: false }, table: false, mermaid: false }}
// Shiki-backed syntax highlighting via the in-house curated-grammar
// plugin (not `@streamdown/code`, whose full-bundle shiki blows the
- // all-chunks size budget). github-light/github-dark, follows the
- // app's `.dark` variant; grammars load lazily on first code block.
+ // all-chunks size budget). Paints from the shared `--syntax-*` tokens,
+ // so it tracks the selected color theme the way the editor does;
+ // grammars load lazily on first code block.
plugins={{ code: codeHighlighter }}
// Plain hardened anchors instead of Streamdown's confirm-modal flow:
// both shells already gate external opens (web: target=_blank +
diff --git a/packages/app/src/components/composer-touched-files.test.ts b/packages/app/src/components/composer-touched-files.test.ts
new file mode 100644
index 000000000..3a1748d0d
--- /dev/null
+++ b/packages/app/src/components/composer-touched-files.test.ts
@@ -0,0 +1,60 @@
+/**
+ * The context-chip rule, which has been wrong in both directions: a seeded
+ * conflict instruction made every visited doc attach itself, and suppressing
+ * that dropped even the file the instruction names.
+ */
+
+import { describe, expect, test } from 'vitest';
+import { nextTouchedFiles } from './composer-touched-files';
+
+const NONE: ReadonlySet<string> = new Set();
+
+describe('nextTouchedFiles — user is composing', () => {
+ test('accumulates each doc visited mid-draft', () => {
+ let files = nextTouchedFiles([], 'notes/roadmap.md', NONE, false);
+ files = nextTouchedFiles(files, 'notes/doc2.md', NONE, false);
+ expect(files).toEqual(['notes/roadmap.md', 'notes/doc2.md']);
+ });
+
+ test('never re-adds a dismissed path', () => {
+ const dismissed = new Set(['notes/roadmap.md']);
+ expect(nextTouchedFiles([], 'notes/roadmap.md', dismissed, false)).toEqual([]);
+ });
+
+ test('collapses an extension variant of the same stem', () => {
+ const files = nextTouchedFiles(['notes/roadmap.md'], 'notes/roadmap.mdx', NONE, false);
+ expect(files).toEqual(['notes/roadmap.mdx']);
+ });
+});
+
+describe('nextTouchedFiles — untouched seed', () => {
+ test('carries the active doc, so the named file is attached', () => {
+ expect(nextTouchedFiles([], 'notes/roadmap.md', NONE, true)).toEqual(['notes/roadmap.md']);
+ });
+
+ test('REPLACES on switch rather than accumulating', () => {
+ // Clicking through conflicted docs attached all of them: a seeded draft is
+ // non-empty, which the composer read as the user gathering context.
+ let files = nextTouchedFiles([], 'notes/roadmap.md', NONE, true);
+ files = nextTouchedFiles(files, 'notes/doc2.md', NONE, true);
+ files = nextTouchedFiles(files, 'notes/doc3.md', NONE, true);
+ expect(files).toEqual(['notes/doc3.md']);
+ });
+
+ test('still honours a dismissed path', () => {
+ const dismissed = new Set(['notes/roadmap.md']);
+ expect(nextTouchedFiles([], 'notes/roadmap.md', dismissed, true)).toEqual([]);
+ });
+
+ test('is referentially stable when already correct', () => {
+ // The effect runs on every render; a fresh array each time would loop.
+ const prev = ['notes/roadmap.md'];
+ expect(nextTouchedFiles(prev, 'notes/roadmap.md', NONE, true)).toBe(prev);
+ });
+
+ test('editing the seed resumes accumulation from what is showing', () => {
+ const seeded = nextTouchedFiles([], 'notes/roadmap.md', NONE, true);
+ const afterEdit = nextTouchedFiles(seeded, 'notes/doc2.md', NONE, false);
+ expect(afterEdit).toEqual(['notes/roadmap.md', 'notes/doc2.md']);
+ });
+});
diff --git a/packages/app/src/components/composer-touched-files.ts b/packages/app/src/components/composer-touched-files.ts
new file mode 100644
index 000000000..2cc309d1b
--- /dev/null
+++ b/packages/app/src/components/composer-touched-files.ts
@@ -0,0 +1,49 @@
+/**
+ * Which files the Ask AI composer carries as top-row context chips.
+ *
+ * Extracted from `BottomComposer` because the rule has been wrong in both
+ * directions: seeding the conflict instruction made every visited doc attach
+ * itself (the draft read as "the user is composing"), and suppressing that
+ * dropped even the file the instruction names. In the composer it is reachable
+ * only through the whole component's mock surface; here it is a function.
+ */
+
+const MARKDOWN_RELATIVE_PATH_EXTENSION = /\.(md|mdx)$/i;
+
+/** The path minus its markdown extension, or null when it has none. */
+function markdownRelativePathStem(path: string): string | null {
+ return MARKDOWN_RELATIVE_PATH_EXTENSION.test(path)
+ ? path.replace(MARKDOWN_RELATIVE_PATH_EXTENSION, '')
+ : null;
+}
+
+export function nextTouchedFiles(
+ prev: readonly string[],
+ activeFilePath: string,
+ dismissed: ReadonlySet<string>,
+ /** The draft is this composer's own untouched seed — nobody has typed. */
+ isSeedIntact: boolean,
+): readonly string[] {
+ // Sticky-dismissed paths are never re-added, seeded or not.
+ if (dismissed.has(activeFilePath)) return prev;
+
+ if (isSeedIntact) {
+ // The seed names exactly one file and the user composed nothing, so the set
+ // REPLACES. Accumulating would attach every conflicted doc they clicked
+ // through; returning `prev` unchanged would drop the one it is about.
+ if (prev.length === 1 && prev[0] === activeFilePath) return prev;
+ return [activeFilePath];
+ }
+
+ // Composing: accumulate on switch, minus any stale extension-variant of the
+ // same stem (a doc that changed .md <-> .mdx keeps one entry, not two).
+ const activeStem = markdownRelativePathStem(activeFilePath);
+ const next =
+ activeStem === null
+ ? prev
+ : prev.filter(
+ (path) => path === activeFilePath || markdownRelativePathStem(path) !== activeStem,
+ );
+ if (next.includes(activeFilePath)) return next.length === prev.length ? prev : next;
+ return [...next, activeFilePath];
+}
diff --git a/packages/app/src/components/conflict-history.test.ts b/packages/app/src/components/conflict-history.test.ts
new file mode 100644
index 000000000..9b402d3fc
--- /dev/null
+++ b/packages/app/src/components/conflict-history.test.ts
@@ -0,0 +1,122 @@
+// @vitest-environment node
+import { describe, expect, test } from 'vitest';
+import type { ConflictSnapshot } from './conflict-history';
+import { ConflictHistory } from './conflict-history';
+
+function snap(contents: string): ConflictSnapshot {
+ return { file: { name: 'f.md', contents } };
+}
+
+describe('ConflictHistory', () => {
+ // Re-homes the five behaviours from the deleted conflict-merge-history.dom.test.ts
+ // (originally covering the CodeMirror mergeAcceptHistory extension) in terms of
+ // the new host-owned snapshot stack.
+
+ test('undo on the initial entry returns null — no-op on empty history', () => {
+ const h = new ConflictHistory(snap('initial'));
+ expect(h.undo()).toBeNull();
+ expect(h.canUndo).toBe(false);
+ expect(h.current.file.contents).toBe('initial');
+ });
+
+ test('undo after a push restores the previous snapshot — accept becomes undoable', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('resolved'));
+
+ const prev = h.undo();
+ expect(prev?.file.contents).toBe('initial');
+ expect(h.canUndo).toBe(false);
+ });
+
+ test('undo after an incoming resolution still works', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('after-incoming'));
+
+ const prev = h.undo();
+ expect(prev?.file.contents).toBe('initial');
+ });
+
+ test('resolving every conflict then undoing brings back the last unresolved snapshot', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('partial')); // one conflict resolved, one remains
+ h.push(snap('all-done')); // all conflicts resolved
+
+ const prev = h.undo();
+ expect(prev?.file.contents).toBe('partial');
+ expect(h.canUndo).toBe(true); // can still undo to initial
+ expect(h.canRedo).toBe(true); // redo available: all-done
+ });
+
+ test('undo is most-recent-first when mixing resolution types', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('after-current')); // first resolution
+ h.push(snap('after-incoming')); // second resolution (most recent)
+
+ const first = h.undo();
+ expect(first?.file.contents).toBe('after-current'); // most recent undone first
+
+ const second = h.undo();
+ expect(second?.file.contents).toBe('initial');
+ expect(h.canUndo).toBe(false);
+ });
+
+ test('redo re-applies the undone resolution', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('resolved'));
+ h.undo();
+ expect(h.canRedo).toBe(true);
+
+ const redone = h.redo();
+ expect(redone?.file.contents).toBe('resolved');
+ expect(h.canRedo).toBe(false);
+ });
+
+ test('push after undo truncates the redo stack', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('first'));
+ h.undo();
+ h.push(snap('alternate'));
+
+ expect(h.canRedo).toBe(false);
+ expect(h.redo()).toBeNull();
+ });
+
+ test('restored state is byte-identical to the pushed snapshot', () => {
+ const h = new ConflictHistory(snap('initial'));
+ const bytes = 'content\x00\x01\nbyte-exact\r\n\tleading-tab \n';
+ h.push(snap(bytes));
+
+ h.undo();
+ h.redo();
+ expect(h.current.file.contents).toBe(bytes);
+ });
+
+ test('depth cap preserves the initial entry and the most-recent MAX_DEPTH entries', () => {
+ const h = new ConflictHistory(snap('initial'));
+ for (let i = 0; i < 55; i++) {
+ h.push(snap(`step-${i}`));
+ }
+ // Can still undo (initial is preserved)
+ expect(h.canUndo).toBe(true);
+ // The current entry is the last pushed
+ expect(h.current.file.contents).toBe('step-54');
+ });
+
+ test('reset backfills the initial entry so undo returns a snapshot with fileDiff', () => {
+ const h = new ConflictHistory(snap('initial'));
+ h.push(snap('resolved'));
+ // Simulate Pierre synchronously computing fileDiff after the first render.
+ const fullInitial: ConflictSnapshot = {
+ file: { name: 'f.md', contents: 'initial' },
+ // biome-ignore lint/suspicious/noExplicitAny: partial stub of Pierre's FileDiffMetadata for this test
+ fileDiff: { additionLines: ['resolved\n'], deletionLines: ['initial\n'] } as any,
+ };
+ h.reset(fullInitial);
+ // Undo should return the enriched initial snapshot with fileDiff.
+ const prev = h.undo();
+ expect(prev?.fileDiff).toBeDefined();
+ expect(prev?.file.contents).toBe('initial');
+ // After undoing to initial, further undo returns null (still at index 0).
+ expect(h.undo()).toBeNull();
+ });
+});
diff --git a/packages/app/src/components/conflict-history.ts b/packages/app/src/components/conflict-history.ts
new file mode 100644
index 000000000..5e7368f62
--- /dev/null
+++ b/packages/app/src/components/conflict-history.ts
@@ -0,0 +1,74 @@
+import type {
+ FileContents,
+ FileDiffMetadata,
+ MergeConflictMarkerRow,
+ UnresolvedFile,
+} from '@pierre/diffs';
+
+type ResolveReturn = NonNullable<ReturnType<UnresolvedFile['resolveConflict']>>;
+
+export interface ConflictSnapshot {
+ file: FileContents;
+ fileDiff?: FileDiffMetadata;
+ actions?: ResolveReturn['actions'];
+ markerRows?: MergeConflictMarkerRow[];
+}
+
+// Memory cost per entry ≈ 2.4× the file size (diff model line arrays + file
+// string). Cap of 50 entries × 2.4 × 100 KB file ≈ 12 MB worst-case.
+const MAX_DEPTH = 50;
+
+export class ConflictHistory {
+ private readonly stack: ConflictSnapshot[];
+ private idx: number;
+
+ constructor(initial: ConflictSnapshot) {
+ this.stack = [initial];
+ this.idx = 0;
+ }
+
+ get current(): ConflictSnapshot {
+ const entry = this.stack[this.idx];
+ if (!entry) throw new Error('ConflictHistory: stack is empty — invariant violated');
+ return entry;
+ }
+
+ get canUndo(): boolean {
+ return this.idx > 0;
+ }
+
+ get canRedo(): boolean {
+ return this.idx < this.stack.length - 1;
+ }
+
+ push(snapshot: ConflictSnapshot): void {
+ this.stack.splice(this.idx + 1);
+ this.stack.push(snapshot);
+ this.idx++;
+ // Preserve the initial entry; trim oldest resolved entries when over cap.
+ if (this.stack.length > MAX_DEPTH + 1) {
+ this.stack.splice(1, this.stack.length - MAX_DEPTH - 1);
+ this.idx = this.stack.length - 1;
+ }
+ }
+
+ // Backfills the initial stack entry (index 0) with the full computed snapshot
+ // once Pierre has synchronously populated its computedCache after the first render.
+ // Required so rerenderAndRestore() can pass fileDiff+actions to forceRender when
+ // the user undoes all the way back to the initial state.
+ reset(initial: ConflictSnapshot): void {
+ this.stack[0] = initial;
+ }
+
+ undo(): ConflictSnapshot | null {
+ if (!this.canUndo) return null;
+ this.idx--;
+ return this.stack[this.idx] ?? null;
+ }
+
+ redo(): ConflictSnapshot | null {
+ if (!this.canRedo) return null;
+ this.idx++;
+ return this.stack[this.idx] ?? null;
+ }
+}
diff --git a/packages/app/src/components/conflict-merge-history.dom.test.ts b/packages/app/src/components/conflict-merge-history.dom.test.ts
deleted file mode 100644
index 59895c17d..000000000
--- a/packages/app/src/components/conflict-merge-history.dom.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Behavioral tests for `mergeAcceptHistory`.
- *
- * Accepting a hunk in `@codemirror/merge` is an effect-only transaction, so
- * CodeMirror's history ignores it unless the effect opts in via
- * `invertedEffects`. These tests pin both halves: that accept becomes undoable,
- * and that a mixed reject-then-accept sequence undoes newest-first instead of
- * skipping back to the older reject.
- *
- * The first test is a control that mounts WITHOUT the extension — it documents
- * the underlying library behavior and fails loudly if a future upgrade makes
- * this extension redundant.
- */
-
-import { history, undo } from '@codemirror/commands';
-import {
- acceptChunk,
- getChunks,
- getOriginalDoc,
- rejectChunk,
- unifiedMergeView,
-} from '@codemirror/merge';
-import { EditorState, type Extension } from '@codemirror/state';
-import { EditorView } from '@codemirror/view';
-import { afterEach, describe, expect, test } from 'vitest';
-import { mergeAcceptHistory } from './conflict-merge-history';
-
-const ORIGINAL = 'alpha\nbravo\ncharlie\ndelta\n';
-const CURRENT = 'alpha\nBRAVO\ncharlie\nDELTA\n';
-
-const views: EditorView[] = [];
-
-function mount(extra: Extension[] = []): EditorView {
- const parent = document.createElement('div');
- document.body.appendChild(parent);
- const view = new EditorView({
- state: EditorState.create({
- doc: CURRENT,
- extensions: [
- history(),
- ...extra,
- unifiedMergeView({ original: ORIGINAL, mergeControls: false }),
- ],
- }),
- parent,
- });
- views.push(view);
- return view;
-}
-
-function chunkCount(view: EditorView): number {
- return getChunks(view.state)?.chunks.length ?? -1;
-}
-
-function firstChunkPos(view: EditorView): number {
- const chunks = getChunks(view.state)?.chunks ?? [];
- if (chunks.length === 0) throw new Error('expected at least one chunk');
- return chunks[0].fromB;
-}
-
-function lastChunkPos(view: EditorView): number {
- const chunks = getChunks(view.state)?.chunks ?? [];
- if (chunks.length === 0) throw new Error('expected at least one chunk');
- return chunks[chunks.length - 1].fromB;
-}
-
-afterEach(() => {
- while (views.length > 0) views.pop()?.destroy();
- document.body.innerHTML = '';
-});
-
-describe('mergeAcceptHistory', () => {
- test('control: without the extension, undo after accept is a no-op', () => {
- const view = mount();
- expect(chunkCount(view)).toBe(2);
-
- acceptChunk(view, firstChunkPos(view));
- expect(chunkCount(view)).toBe(1);
-
- undo(view);
-
- // The accept is invisible to history, so the hunk does not come back.
- expect(chunkCount(view)).toBe(1);
- });
-
- test('undo after accept restores the hunk to unresolved', () => {
- const view = mount([mergeAcceptHistory()]);
- expect(chunkCount(view)).toBe(2);
-
- acceptChunk(view, firstChunkPos(view));
- expect(chunkCount(view)).toBe(1);
-
- undo(view);
-
- expect(chunkCount(view)).toBe(2);
- expect(getOriginalDoc(view.state).toString()).toBe(ORIGINAL);
- });
-
- test('undo after reject still works', () => {
- const view = mount([mergeAcceptHistory()]);
-
- rejectChunk(view, firstChunkPos(view));
- expect(view.state.doc.toString()).toContain('bravo');
-
- undo(view);
-
- expect(view.state.doc.toString()).toContain('BRAVO');
- expect(chunkCount(view)).toBe(2);
- });
-
- test('accepting every hunk then undoing brings the last one back', () => {
- const view = mount([mergeAcceptHistory()]);
-
- acceptChunk(view, lastChunkPos(view));
- acceptChunk(view, firstChunkPos(view));
- expect(chunkCount(view)).toBe(0);
-
- undo(view);
-
- // Exactly one: the two accepts must be two undo steps, not collapsed into
- // one by history's group-adjacent-edits window.
- expect(chunkCount(view)).toBe(1);
- // And it must be the LAST accept that came back, not an arbitrary one:
- // the second accept (bravo) is undone while the first (delta) still holds.
- const original = getOriginalDoc(view.state).toString();
- expect(original).toContain('bravo');
- expect(original).toContain('DELTA');
- });
-
- test('mixed reject-then-accept undoes the accept first, not the older reject', () => {
- const view = mount([mergeAcceptHistory()]);
-
- rejectChunk(view, firstChunkPos(view));
- expect(view.state.doc.toString()).toContain('bravo');
-
- acceptChunk(view, lastChunkPos(view));
- expect(getOriginalDoc(view.state).toString()).toContain('DELTA');
-
- undo(view);
-
- // The accept is undone: the original side is restored...
- expect(getOriginalDoc(view.state).toString()).toBe(ORIGINAL);
- // ...and the older reject is still applied, i.e. undo did not skip past it.
- expect(view.state.doc.toString()).toContain('bravo');
- });
-});
diff --git a/packages/app/src/components/conflict-merge-history.ts b/packages/app/src/components/conflict-merge-history.ts
deleted file mode 100644
index 4003a92e2..000000000
--- a/packages/app/src/components/conflict-merge-history.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { invertedEffects } from '@codemirror/commands';
-import { getOriginalDoc, updateOriginalDoc } from '@codemirror/merge';
-import type { ChangeSet, Extension } from '@codemirror/state';
-
-/**
- * Makes `@codemirror/merge`'s "accept hunk" undoable.
- *
- * `acceptChunk` dispatches an EFFECT-ONLY transaction: it advances the merge
- * view's ORIGINAL side via `updateOriginalDoc` and never touches the editor
- * document. `rejectChunk` dispatches a real document change instead. CodeMirror's
- * history only records document changes unless an effect opts in through
- * `invertedEffects`, and the merge package registers none — so without this
- * extension Undo is a no-op after Accept, and a mixed reject-then-accept
- * sequence undoes the older reject out of order.
- *
- * The inverse restores the pre-transaction original document. Both payload
- * fields are load-bearing: the `originalDoc` field reads `doc`, while the chunk
- * field feeds `changes` to `Chunk.updateA` to recompute hunks incrementally, so
- * an inverse carrying a stale changeset would desync the hunk list from the text.
- */
-export function mergeAcceptHistory(): Extension {
- return invertedEffects.of((tr) => {
- // Compose rather than emit one inverse per effect: a single transaction
- // carrying several original-doc updates must undo as one step, and the
- // composed changeset is the only correct `changes` for that step.
- let forward: ChangeSet | null = null;
- for (const effect of tr.effects) {
- if (!effect.is(updateOriginalDoc)) continue;
- forward = forward === null ? effect.value.changes : forward.compose(effect.value.changes);
- }
- if (forward === null) return [];
-
- const before = getOriginalDoc(tr.startState);
- return [updateOriginalDoc.of({ doc: before, changes: forward.invert(before) })];
- });
-}
diff --git a/packages/app/src/components/conflict-view-regressions.dom.test.tsx b/packages/app/src/components/conflict-view-regressions.dom.test.tsx
new file mode 100644
index 000000000..1e398f2e7
--- /dev/null
+++ b/packages/app/src/components/conflict-view-regressions.dom.test.tsx
@@ -0,0 +1,407 @@
+// @vitest-environment jsdom
+/**
+ * Regressions found by a cold review of the Pierre conflict view.
+ *
+ * Each test here corresponds to a way the view could strand or shortchange a
+ * user that the happy-path suite did not reach: a conflict with nothing to
+ * accept, a file whose last line has no newline, a redo stack thrown away by a
+ * display toggle, and an Apply that commits more than once.
+ */
+
+import * as actualLinguiMacro from '@lingui/react/macro';
+import { act, cleanup, render, screen } from '@testing-library/react';
+import type { ReactNode } from 'react';
+import { afterEach, expect, test, vi } from 'vitest';
+import { renderLinguiTemplate } from '@/test-utils/lingui-mock';
+
+// `t`'s IDENTITY is the thing under test in the locale-change case: Lingui
+// swaps the context object on every activate(), so a stable mock would make
+// that test pass no matter what the effect's deps say.
+let currentT: typeof renderLinguiTemplate = renderLinguiTemplate;
+
+vi.doMock('@lingui/react/macro', () => ({
+ ...actualLinguiMacro,
+ Trans: ({ children }: { children?: ReactNode }) => <>{children}</>,
+ useLingui: () => ({ t: currentT }),
+}));
+
+const { ConflictView } = await import('./ConflictView');
+
+afterEach(() => {
+ currentT = renderLinguiTemplate;
+ cleanup();
+});
+
+async function settle() {
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+}
+
+async function mount(props: {
+ ours: string;
+ base: string;
+ theirs: string;
+ onResolve?: (content: string) => void | Promise<void>;
+}) {
+ const onResolve = props.onResolve ?? vi.fn();
+ render(
+ <ConflictView
+ fileName="notes/plan.md"
+ ours={props.ours}
+ base={props.base}
+ theirs={props.theirs}
+ onResolve={onResolve}
+ />,
+ );
+ await settle();
+ return onResolve;
+}
+
+test('a conflict the three-way merge resolves cleanly still offers Apply', async () => {
+ // The server records a conflict whenever its merge declines, and it declines
+ // on grounds the client's line-level re-merge does not reproduce — the two
+ // insertions below land in different places and merge without overlapping.
+ // With no divergent region there is no Accept control to press, so if Apply
+ // waits on one being pressed the file can never be resolved from the UI.
+ await mount({
+ base: 'alpha\nbeta\ngamma\n',
+ ours: 'alpha\nThe rollout plan is ready.\nbeta\ngamma\n',
+ theirs: 'alpha\nbeta\nThe rollout plan is ready.\ngamma\n',
+ });
+
+ expect(screen.queryByRole('button', { name: /^Accept current/ })).toBeNull();
+ expect(screen.getByRole('button', { name: 'Apply changes' })).toBeTruthy();
+});
+
+test('a file with no trailing newline does not gain one', async () => {
+ // Pierre rebuilds the file from its parsed rows and terminates the last one.
+ // Byte-exact round-tripping is the write-path contract (precedent #57).
+ const onResolve = vi.fn();
+ await mount({
+ base: 'intro\n\nBASE',
+ ours: 'intro\n\nOURS',
+ theirs: 'intro\n\nTHEIRS',
+ onResolve,
+ });
+
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await settle();
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await settle();
+
+ expect(onResolve).toHaveBeenCalledTimes(1);
+ expect(onResolve.mock.calls[0][0]).toBe('intro\n\nOURS');
+});
+
+test('Show original stays shut while a redo stack is standing', async () => {
+ // Toggling re-synthesises the marker text and renumbers every conflict, so
+ // it discards in-progress work. Undoing back to the start clears canUndo but
+ // leaves a full redo stack — which is work too.
+ await mount({
+ base: 'intro\n\nBASE\n',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS\n',
+ });
+
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await settle();
+ screen.getByRole('button', { name: 'Undo' }).click();
+ await settle();
+
+ const redo = screen.getByRole('button', { name: 'Redo' }) as HTMLButtonElement;
+ expect(redo.disabled).toBe(false);
+ const toggle = screen.getByRole('button', { name: 'Show original' }) as HTMLButtonElement;
+ expect(toggle.disabled).toBe(true);
+});
+
+test('Apply commits once however many times it is clicked', async () => {
+ // Server-side this runs `git add` + `git commit --no-edit`; the second and
+ // third calls find no tracked conflict and surface an error toast after a
+ // resolution that in fact succeeded.
+ const onResolve = vi.fn();
+ await mount({
+ base: 'intro\n\nBASE\n',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS\n',
+ onResolve,
+ });
+
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await settle();
+
+ const apply = screen.getByRole('button', { name: 'Apply changes' });
+ apply.click();
+ apply.click();
+ apply.click();
+ await settle();
+
+ expect(onResolve).toHaveBeenCalledTimes(1);
+});
+
+test('the Apply latch is held until the resolve settles, not until the next tick', async () => {
+ // The previous test passes with a synchronous onResolve whether or not the
+ // latch awaits anything. Server-side Apply runs `git add` + a commit, so the
+ // window that matters is the whole in-flight request: a latch released on the
+ // next microtask still lets a second click race the first.
+ let release!: () => void;
+ const inFlight = new Promise<void>((r) => {
+ release = r;
+ });
+ const onResolve = vi.fn(() => inFlight);
+
+ await mount({
+ base: 'intro\n\nBASE\n',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS\n',
+ onResolve,
+ });
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await settle();
+
+ const apply = screen.getByRole('button', { name: 'Apply changes' });
+ apply.click();
+ await settle();
+ // Still in flight — a click here is the double-commit the latch exists for.
+ apply.click();
+ await settle();
+ expect(onResolve).toHaveBeenCalledTimes(1);
+
+ release();
+ await settle();
+});
+
+test('a marker-lookalike line in the content withholds every control', async () => {
+ // Seven-or-more `=` is Pierre's separator pattern and also an ordinary line a
+ // user may have typed. Inside a conflict section the text then carries two
+ // lines that look identical, Pierre anchors the split on the wrong one, and
+ // resolving drops the user's own lines while reporting success. Refuse
+ // instead: the parse disagrees with the markers we wrote.
+ const onResolve = vi.fn();
+ await mount({
+ base: 'intro\n\ntail\n',
+ ours: 'intro\n\nOurs Section\n\nours body\n\ntail\n',
+ theirs: 'intro\n\nNew Section\n=======\n\ntheirs body\n\ntail\n',
+ onResolve,
+ });
+
+ expect(screen.queryByRole('button', { name: /^Accept current/ })).toBeNull();
+ expect(screen.queryByRole('button', { name: /^Accept incoming/ })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Apply changes' })).toBeNull();
+ expect(screen.getByText(/look like conflict markers/)).toBeTruthy();
+ expect(onResolve).not.toHaveBeenCalled();
+});
+
+test('an ordinary conflict is unaffected by the parse check', async () => {
+ // The check compares integers both sides should agree on, so it must never
+ // fire on a file whose markers parse correctly.
+ await mount({
+ base: 'intro\n\nBASE\n',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS\n',
+ });
+
+ expect(screen.queryByText(/look like conflict markers/)).toBeNull();
+ expect(screen.getByRole('button', { name: /^Accept current/ })).toBeTruthy();
+});
+
+test('resolving one conflict does not make the others look misparsed', async () => {
+ // The parse check compares against the indices we synthesised, which describe
+ // the ORIGINAL text. Every render after a resolution is of Pierre's own
+ // output, where the surviving conflicts have shifted — so the check has to
+ // stop after the first parse or a second conflict would be refused the moment
+ // the first one is accepted.
+ await mount({
+ base: 'intro\n\nBASE ONE\n\nmiddle\n\nBASE TWO\n\ntail\n',
+ ours: 'intro\n\nOURS ONE\n\nmiddle\n\nOURS TWO\n\ntail\n',
+ theirs: 'intro\n\nTHEIRS ONE\n\nmiddle\n\nTHEIRS TWO\n\ntail\n',
+ });
+
+ expect(screen.getAllByRole('button', { name: /^Accept current/ })).toHaveLength(2);
+
+ screen.getAllByRole('button', { name: /^Accept current/ })[0].click();
+ await settle();
+
+ expect(screen.queryByText(/look like conflict markers/)).toBeNull();
+ expect(screen.getAllByRole('button', { name: /^Accept current/ })).toHaveLength(1);
+});
+
+test('both explanatory strips announce themselves to screen readers', async () => {
+ // The boundary swaps this view in without a navigation, so a reader meeting
+ // the pane in document order finds an empty diff and no reason for it. These
+ // strips exist precisely because there is nothing to render.
+ await mount({
+ base: 'intro\n\ntail\n',
+ ours: 'intro\n\nOurs Section\n\nours body\n\ntail\n',
+ theirs: 'intro\n\nNew Section\n=======\n\ntheirs body\n\ntail\n',
+ });
+ expect(screen.getByRole('status')).toHaveProperty(
+ 'textContent',
+ expect.stringContaining('look like conflict markers') as unknown as string,
+ );
+
+ cleanup();
+
+ await mount({ base: 'intro\n', ours: '', theirs: 'intro\n\nTHEIRS\n' });
+ const banners = screen.getAllByRole('status');
+ expect(banners.length).toBeGreaterThan(0);
+ expect(banners.some((b) => /deleted on the current branch/.test(b.textContent ?? ''))).toBe(true);
+});
+
+test('each conflict has distinguishable control names', async () => {
+ // Browsing by button in a multi-conflict file, the visible labels repeat
+ // verbatim — so without a per-conflict name a screen-reader user gets
+ // "Accept current" twice with no way to tell which region each acts on.
+ await mount({
+ base: 'intro\n\nBASE ONE\n\nmiddle\n\nBASE TWO\n\ntail\n',
+ ours: 'intro\n\nOURS ONE\n\nmiddle\n\nOURS TWO\n\ntail\n',
+ theirs: 'intro\n\nTHEIRS ONE\n\nmiddle\n\nTHEIRS TWO\n\ntail\n',
+ });
+
+ expect(
+ screen.getByRole('button', { name: 'Accept current version for conflict 1' }),
+ ).toBeTruthy();
+ expect(
+ screen.getByRole('button', { name: 'Accept current version for conflict 2' }),
+ ).toBeTruthy();
+ expect(
+ screen.getByRole('button', { name: 'Accept incoming version for conflict 2' }),
+ ).toBeTruthy();
+ expect(screen.getByRole('button', { name: 'Accept both versions for conflict 1' })).toBeTruthy();
+});
+
+test('resolving, undoing and redoing are announced', async () => {
+ // Every action here mutates the diff imperatively and moves focus to the
+ // scroll container, so without a live region a screen-reader user gets no
+ // signal that the click landed — including when Apply changes appears.
+ await mount({
+ base: 'intro\n\nBASE ONE\n\nmiddle\n\nBASE TWO\n\ntail\n',
+ ours: 'intro\n\nOURS ONE\n\nmiddle\n\nOURS TWO\n\ntail\n',
+ theirs: 'intro\n\nTHEIRS ONE\n\nmiddle\n\nTHEIRS TWO\n\ntail\n',
+ });
+ const live = () => document.querySelector('[aria-live="polite"]')?.textContent ?? '';
+
+ // Pre-registered and empty: a region inserted with its text is not announced.
+ expect(live()).toBe('');
+
+ screen.getAllByRole('button', { name: /^Accept current/ })[0].click();
+ await settle();
+ expect(live()).toBe('Conflicts remaining: 1.');
+
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await settle();
+ expect(live()).toBe('All conflicts resolved. Apply changes to save.');
+
+ // Undo must not keep claiming the file is resolved.
+ screen.getByRole('button', { name: 'Undo' }).click();
+ await settle();
+ expect(live()).toBe('Conflicts remaining: 1.');
+});
+
+test('a refusal never renders alongside live controls', async () => {
+ // Pierre reports regions one at a time. Clearing `controls` on the region
+ // that disagrees still let every LATER region append to the emptied array,
+ // so a two-conflict file showed the banner beside a working Accept button.
+ // The lookalike sits in the FIRST conflict; the second parses cleanly.
+ await mount({
+ base: 'intro\n\nBASE ONE\n\nmiddle\n\nBASE TWO\n\ntail\n',
+ ours: 'intro\n\nOurs One\n\nours body\n\nmiddle\n\nOURS TWO\n\ntail\n',
+ theirs: 'intro\n\nNew Section\n=======\n\ntheirs body\n\nmiddle\n\nTHEIRS TWO\n\ntail\n',
+ });
+
+ expect(screen.getByText(/look like conflict markers/)).toBeTruthy();
+ expect(screen.queryByRole('button', { name: /^Accept current/ })).toBeNull();
+ expect(screen.queryByRole('button', { name: /^Accept incoming/ })).toBeNull();
+ expect(screen.queryByRole('button', { name: /^Accept both/ })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Apply changes' })).toBeNull();
+});
+
+test('sides disagreeing on the EOF newline yield exactly one, not two', async () => {
+ // The synthesis now keeps the EOF decision out of the conflict: each side is
+ // merged without its trailing empty line, and one is re-appended when any
+ // input had it. Previously the divergence reached EOF, the '' landed inside
+ // the conflict region, and Pierre's row terminator added a second — the file
+ // gained a newline no side had, in bytes written to disk and committed.
+ //
+ // The residual is a normalisation, not a drift: once EOF sits outside the
+ // conflict it is a property of the file rather than of the winning region,
+ // and a file some side terminated ends terminated. The both-sides-agree case
+ // still round-trips exactly, via `matchTrailingNewline`.
+ const onResolve = vi.fn();
+ await mount({
+ base: 'intro\n\nBASE',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS',
+ onResolve,
+ });
+
+ screen.getByRole('button', { name: /^Accept incoming/ }).click();
+ await settle();
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await settle();
+
+ expect(onResolve.mock.calls[0][0]).toBe('intro\n\nTHEIRS\n');
+});
+
+test('accepting the side that has a trailing newline keeps exactly one', async () => {
+ const onResolve = vi.fn();
+ await mount({
+ base: 'intro\n\nBASE',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS',
+ onResolve,
+ });
+
+ screen.getByRole('button', { name: /^Accept current/ }).click();
+ await settle();
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await settle();
+
+ expect(onResolve.mock.calls[0][0]).toBe('intro\n\nOURS\n');
+});
+
+test('a language change does not discard accepted resolutions', async () => {
+ // `t` from useLingui is bound to the Lingui context object, swapped on every
+ // `i18n.activate()` — a preference change, an external .ok/config.yml edit,
+ // another window. Held in the mount effect's dep array it rebuilt the whole
+ // instance: new history, cleanUp, every state reset. Accepting a conflict and
+ // then changing language silently threw the resolution away.
+ const onResolve = vi.fn();
+ const props = {
+ fileName: 'notes/plan.md',
+ base: 'intro\n\nBASE ONE\n\nmiddle\n\nBASE TWO\n\ntail\n',
+ ours: 'intro\n\nOURS ONE\n\nmiddle\n\nOURS TWO\n\ntail\n',
+ theirs: 'intro\n\nTHEIRS ONE\n\nmiddle\n\nTHEIRS TWO\n\ntail\n',
+ onResolve,
+ };
+ const view = render(<ConflictView {...props} />);
+ await settle();
+
+ screen.getAllByRole('button', { name: /^Accept current/ })[0].click();
+ await settle();
+ expect(screen.getAllByRole('button', { name: /^Accept current/ })).toHaveLength(1);
+
+ // A fresh `t` identity, which is exactly what i18n.activate() produces.
+ currentT = ((...args: Parameters<typeof renderLinguiTemplate>) =>
+ renderLinguiTemplate(...args)) as typeof renderLinguiTemplate;
+ view.rerender(<ConflictView {...props} />);
+ await settle();
+
+ // Still one remaining: the accepted region stayed accepted.
+ expect(screen.getAllByRole('button', { name: /^Accept current/ })).toHaveLength(1);
+});
+
+test('the diff region is a named, keyboard-reachable landmark', async () => {
+ // axe cannot see this: the suite's own scan notes that
+ // scrollable-region-focusable does not evaluate under jsdom, which reports
+ // no layout. Asserting the attributes directly is the repo's existing
+ // workaround for exactly that gap.
+ await mount({
+ base: 'intro\n\nBASE\n',
+ ours: 'intro\n\nOURS\n',
+ theirs: 'intro\n\nTHEIRS\n',
+ });
+ const region = screen.getByRole('region', { name: /Conflict diff for/ });
+ expect(region.getAttribute('tabindex')).toBe('0');
+ expect(region.tagName).toBe('SECTION');
+});
diff --git a/packages/app/src/components/multi-conflict-both.dom.test.tsx b/packages/app/src/components/multi-conflict-both.dom.test.tsx
new file mode 100644
index 000000000..5e475bfa0
--- /dev/null
+++ b/packages/app/src/components/multi-conflict-both.dom.test.tsx
@@ -0,0 +1,102 @@
+/**
+ * Multi-conflict resolution — the shape that used to write conflict markers to
+ * disk and lose content.
+ *
+ * Substrate: jsdom.
+ */
+
+import { act, render, screen } from '@testing-library/react';
+import { describe, expect, test, vi } from 'vitest';
+import { ConflictView } from './ConflictView';
+
+const side = (pilot: string, owner: string) =>
+ `# Launch checklist\n\n## Now\n\n${pilot}\n\n- Owner: ${owner}\n- Status: in review\n`;
+
+const OURS = side('We open the pilot once docs and a rollback plan are ready.', 'Marcus Webb');
+const BASE = side('We open the pilot once docs are ready.', 'Sam Ford');
+const THEIRS = side(
+ 'We open the pilot once docs, the guide, and coverage are ready.',
+ 'Priya Raman',
+);
+
+async function settle() {
+ await act(async () => {
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+ });
+}
+
+function renderView(onResolve = vi.fn()) {
+ render(
+ <ConflictView
+ fileName="notes/launch-checklist.md"
+ ours={OURS}
+ base={BASE}
+ theirs={THEIRS}
+ onResolve={onResolve}
+ />,
+ );
+ return onResolve;
+}
+
+const rows = () => screen.queryAllByRole('button', { name: /^Accept current/ }).length;
+
+async function clickAll(name: string) {
+ // aria-label carries a per-conflict suffix, so match the label prefix.
+ const byLabel = new RegExp(`^${name}`);
+ for (let i = 0; i < 6; i++) {
+ const btns = screen.queryAllByRole('button', { name: byLabel });
+ if (btns.length === 0) break;
+ btns[0].click();
+ await settle();
+ }
+}
+
+describe('multi-conflict resolution', () => {
+ test('accepting both on every conflict writes no markers and loses no content', async () => {
+ const onResolve = renderView();
+ await settle();
+ await clickAll('Accept both');
+
+ screen.getByRole('button', { name: 'Apply changes' }).click();
+ await settle();
+
+ const resolved = onResolve.mock.calls[0][0] as string;
+ // The server refuses markers outright, so leaking one is a failed
+ // resolution rather than a cosmetic slip.
+ expect(resolved).not.toMatch(/^(<{7} |={7}$|>{7} |\|{7} )/m);
+ // Both sides of BOTH conflicts survive.
+ expect(resolved).toContain('Marcus Webb');
+ expect(resolved).toContain('Priya Raman');
+ expect(resolved).toContain('a rollback plan are ready.');
+ expect(resolved).toContain('coverage are ready.');
+ });
+
+ test('undo and redo unwind every conflict, including from fully resolved', async () => {
+ // Resolving everything still clears the control list, which is the shape
+ // that caused the undo bug: a wipe assuming Pierre re-requests every host.
+ // Pinned across a full round trip, because one undo restoring one conflict
+ // looks identical to a broken restore that only ever yields one.
+ renderView();
+ await settle();
+ expect(rows()).toBe(2);
+
+ await clickAll('Accept current');
+ expect(rows()).toBe(0);
+
+ const undone: number[] = [];
+ for (let i = 0; i < 2; i++) {
+ screen.getByRole('button', { name: 'Undo' }).click();
+ await settle();
+ undone.push(rows());
+ }
+ expect(undone).toEqual([1, 2]);
+
+ const redone: number[] = [];
+ for (let i = 0; i < 2; i++) {
+ screen.getByRole('button', { name: 'Redo' }).click();
+ await settle();
+ redone.push(rows());
+ }
+ expect(redone).toEqual([1, 0]);
+ });
+});
diff --git a/packages/app/src/components/pierre-conflict.dom.test.ts b/packages/app/src/components/pierre-conflict.dom.test.ts
new file mode 100644
index 000000000..087717aa7
--- /dev/null
+++ b/packages/app/src/components/pierre-conflict.dom.test.ts
@@ -0,0 +1,105 @@
+/**
+ * Pre-implementation gate tests for the Pierre conflict-view migration (Q15).
+ *
+ * These tests prove two things that locked design decisions assumed but no
+ * prior spike measured against a diff3 fixture:
+ * 1. Pierre renders the full diff3 row set — including marker-base — under
+ * the repo's jsdom tier.
+ * 2. `instance.render({ ...snapshot, forceRender: true })` reuses the same
+ * `<diffs-container>` element and shadow root with no remount.
+ *
+ * If either test fails, record which locked decision is invalidated before
+ * proceeding. See SPEC §16 STOP_IF and evidence/undo-spike.md.
+ */
+
+import { UnresolvedFile } from '@pierre/diffs';
+import { afterEach, beforeEach, describe, expect, test } from 'vitest';
+import { DIFF3_FIXTURE, pierreShadow } from './pierre-conflict.test-helper';
+
+describe('Pierre diff3 pre-implementation gate', () => {
+ let host: HTMLDivElement;
+ let inst: UnresolvedFile | null = null;
+
+ beforeEach(() => {
+ host = document.createElement('div');
+ document.body.appendChild(host);
+ });
+
+ afterEach(() => {
+ inst?.cleanUp();
+ host.remove();
+ inst = null;
+ });
+
+ test('diff3 fixture renders the full ordered row set including marker-base', async () => {
+ inst = new UnresolvedFile({ onMergeConflictAction: () => {} });
+ inst.render({ file: { name: 'test.md', contents: DIFF3_FIXTURE }, containerWrapper: host });
+
+ // Pierre finishes its render across queued tasks; wait a macrotask so the
+ // chain drains before asserting row presence.
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+ const shadow = pierreShadow(host);
+ const rows = Array.from(shadow.querySelectorAll('[data-merge-conflict]'));
+ const types = rows.map((r) => r.getAttribute('data-merge-conflict'));
+
+ expect(types).toContain('marker-start');
+ expect(types).toContain('current');
+ expect(types).toContain('marker-base');
+ expect(types).toContain('marker-separator');
+ expect(types).toContain('incoming');
+ expect(types).toContain('marker-end');
+
+ // Pierre renders a split-preview row (current | incoming side-by-side) BEFORE
+ // the raw marker section. So 'current' and 'incoming' each appear twice:
+ // [current, incoming, marker-start, current, marker-base, marker-separator, incoming, marker-end]
+ // Use lastIndexOf for content types to anchor to the source/marker section.
+ const startIdx = types.indexOf('marker-start');
+ const currentIdx = types.lastIndexOf('current');
+ const baseIdx = types.indexOf('marker-base');
+ const sepIdx = types.indexOf('marker-separator');
+ const incomingIdx = types.lastIndexOf('incoming');
+ const endIdx = types.indexOf('marker-end');
+
+ expect(startIdx).toBeLessThan(currentIdx);
+ expect(currentIdx).toBeLessThan(baseIdx);
+ expect(baseIdx).toBeLessThan(sepIdx);
+ expect(sepIdx).toBeLessThan(incomingIdx);
+ expect(incomingIdx).toBeLessThan(endIdx);
+ });
+
+ test('render with forceRender reuses the same diffs-container element and shadow root (no remount)', async () => {
+ type ResolveReturn = NonNullable<ReturnType<UnresolvedFile['resolveConflict']>>;
+ let captured: ResolveReturn | null = null;
+
+ inst = new UnresolvedFile({
+ onMergeConflictAction: (payload) => {
+ captured =
+ inst?.resolveConflict(payload.conflict.conflictIndex, payload.resolution) ?? null;
+ },
+ });
+ inst.render({ file: { name: 'test.md', contents: DIFF3_FIXTURE }, containerWrapper: host });
+ await new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+ const diffsEl = host.querySelector('diffs-container');
+ const shadowBefore = diffsEl?.shadowRoot;
+ expect(diffsEl).not.toBeNull();
+ expect(shadowBefore).not.toBeNull();
+
+ // Click a default shadow-DOM action button — composedPath() delegation works in jsdom
+ const shadow = pierreShadow(host);
+ const actionBtn = shadow.querySelector('[data-merge-conflict-action="current"]');
+ expect(actionBtn).not.toBeNull();
+ actionBtn?.dispatchEvent(new MouseEvent('click', { bubbles: true, composed: true }));
+
+ expect(captured).not.toBeNull();
+ // Guard for TypeScript narrowing — expect above ensures non-null.
+ if (!captured) return;
+
+ // Apply the resolved state — must not remount the element
+ inst.render({ ...captured, forceRender: true });
+
+ expect(host.querySelector('diffs-container')).toBe(diffsEl);
+ expect(host.querySelector('diffs-container')?.shadowRoot).toBe(shadowBefore);
+ });
+});
diff --git a/packages/app/src/components/pierre-conflict.test-helper.ts b/packages/app/src/components/pierre-conflict.test-helper.ts
new file mode 100644
index 000000000..716e4cc2d
--- /dev/null
+++ b/packages/app/src/components/pierre-conflict.test-helper.ts
@@ -0,0 +1,51 @@
+/**
+ * Shared test infrastructure for Pierre conflict-view tests.
+ *
+ * A leftover `<diffs-container>` from a prior test in the same file silently
+ * hijacks `document.querySelector` and produces phantom failures — always call
+ * `inst.cleanUp()` and remove the host element in afterEach.
+ */
+
+/**
+ * A diff3-dialect conflict fixture containing a single conflict with a
+ * start marker, current section, base marker, separator, incoming section
+ * and end marker. Used to prove the diff3 base view renders (Q15).
+ *
+ * The fixture includes surrounding prose so context lines appear and the
+ * hunk is not at the very start of the file, which exercises the parser
+ * on a realistic input.
+ */
+export const DIFF3_FIXTURE = `# Conflict Test Document
+
+Some preamble text before the conflict region.
+
+<<<<<<< ours
+The knowledge base stores every note as plain markdown on the filesystem, so you own your files outright and they remain readable without any software.
+||||||| original
+The knowledge base stores files as plain text on the filesystem.
+=======
+The knowledge base stores every document as plain markdown, ensuring long-term durability and readability without proprietary software.
+>>>>>>> theirs
+
+Some trailing text after the conflict region.
+`;
+
+/**
+ * Returns the open shadow root of the first `<diffs-container>` that Pierre
+ * rendered into `container`. Pierre mounts via an autonomous custom element
+ * with an open shadow root; `container.shadowRoot` is not the right target —
+ * the host element is a child.
+ *
+ * Throws with a descriptive message rather than returning null so callers
+ * get a clear failure instead of a silent null-dereference.
+ */
+export function pierreShadow(container: HTMLElement): ShadowRoot {
+ const el = container.querySelector('diffs-container');
+ if (!el) {
+ throw new Error('pierreShadow: no <diffs-container> found in container');
+ }
+ if (!el.shadowRoot) {
+ throw new Error('pierreShadow: <diffs-container> has no open shadow root');
+ }
+ return el.shadowRoot;
+}
diff --git a/packages/app/src/components/skill-actions.tsx b/packages/app/src/components/skill-actions.tsx
index 3316bfb79..1fbb11c03 100644
--- a/packages/app/src/components/skill-actions.tsx
+++ b/packages/app/src/components/skill-actions.tsx
@@ -15,7 +15,7 @@ import {
PencilLine,
Trash2,
} from 'lucide-react';
-import { type ReactNode, useState } from 'react';
+import { lazy, type ReactNode, Suspense, useState } from 'react';
import { toast } from 'sonner';
import { OpenInAgentContextSubmenu } from '@/components/handoff/OpenInAgentContextSubmenu';
import { OpenInAgentEmptySpaceSubmenu } from '@/components/handoff/OpenInAgentEmptySpaceSubmenu';
@@ -37,7 +37,7 @@ import {
SkillFileRenameDialog,
type SkillFileRenameTarget,
} from '@/components/SkillFileRenameDialog';
-import { SkillForkDialog, type SkillForkTarget } from '@/components/SkillForkDialog';
+import type { SkillForkTarget } from '@/components/SkillForkDialog';
import {
SKILL_INSTALL_MENU_WIDTH,
SkillInstallMenuItems,
@@ -68,6 +68,15 @@ import {
} from '@/lib/skills-api';
import { useWorkspace } from '@/lib/use-workspace';
+// Pulls `@pierre/diffs/react` with it. Gated on `forkTarget` as well as made
+// lazy: the dialog was mounted unconditionally and returned null without a
+// target, which kept its chunk eager. Mounting per fork also drops the stale
+// `toName` that used to carry a rename typed for one skill into the next.
+const LazySkillForkDialog = lazy(async () => {
+ const mod = await import('@/components/SkillForkDialog');
+ return { default: mod.SkillForkDialog };
+});
+
/**
* The shared per-skill action surface, reused by every place that acts on a
* skill (the file-sidebar Skills section and the skill editor toolbar). One
@@ -405,12 +414,16 @@ export function useSkillActions(): SkillActions {
if (!open) setFileCreateTarget(null);
}}
/>
- <SkillForkDialog
- target={forkTarget}
- onOpenChange={(open) => {
- if (!open) setForkTarget(null);
- }}
- />
+ {forkTarget ? (
+ <Suspense fallback={null}>
+ <LazySkillForkDialog
+ target={forkTarget}
+ onOpenChange={(open) => {
+ if (!open) setForkTarget(null);
+ }}
+ />
+ </Suspense>
+ ) : null}
</>
);
diff --git a/packages/app/src/editor/ComposerMentionInput.dom.test.tsx b/packages/app/src/editor/ComposerMentionInput.dom.test.tsx
index 96c622a1d..8065a2586 100644
--- a/packages/app/src/editor/ComposerMentionInput.dom.test.tsx
+++ b/packages/app/src/editor/ComposerMentionInput.dom.test.tsx
@@ -200,11 +200,12 @@ describe('ComposerMentionInput (component)', () => {
test('setText replaces the field with plain text (read back via getContent)', () => {
const ref = createRef<ComposerMentionInputHandle>();
+ const onEmptyChange = vi.fn((_isEmpty: boolean) => {});
render(
<ComposerMentionInput
ref={ref}
ariaLabel="Describe"
- onEmptyChange={() => {}}
+ onEmptyChange={onEmptyChange}
onSubmit={() => {}}
/>,
);
@@ -214,6 +215,27 @@ describe('ComposerMentionInput (component)', () => {
mentions: [],
attachments: [],
});
+ // Same contract `appendText` holds below. The host gates send-enabled, its
+ // placeholder, and context-chip tracking on emptiness, so filling an empty
+ // field without announcing it leaves all three believing nothing was
+ // written — a dead send button over visible text.
+ expect(onEmptyChange).toHaveBeenLastCalledWith(false);
+ });
+
+ test('setText announces emptiness when it clears the field', () => {
+ const ref = createRef<ComposerMentionInputHandle>();
+ const onEmptyChange = vi.fn((_isEmpty: boolean) => {});
+ render(
+ <ComposerMentionInput
+ ref={ref}
+ ariaLabel="Describe"
+ onEmptyChange={onEmptyChange}
+ onSubmit={() => {}}
+ />,
+ );
+ ref.current?.setText('something');
+ ref.current?.setText('');
+ expect(onEmptyChange).toHaveBeenLastCalledWith(true);
});
test('appendText fills an empty field, mapping newlines to paragraphs', () => {
diff --git a/packages/app/src/editor/extensions/cm-theme.ts b/packages/app/src/editor/extensions/cm-theme.ts
index dcee1111a..a1c205013 100644
--- a/packages/app/src/editor/extensions/cm-theme.ts
+++ b/packages/app/src/editor/extensions/cm-theme.ts
@@ -24,7 +24,12 @@ import { tags } from '@lezer/highlight';
* source mode is the dominant surface; the general programming tags below it
* cover fenced code blocks, which CM parses with a nested language.
*/
-const okSyntaxHighlight = HighlightStyle.define([
+/**
+ * Exported so the Shiki-side twin (`lib/ok-syntax-theme.ts`) can be held to
+ * it: `ok-syntax-parity.test.ts` highlights the same source with both engines
+ * and fails when a construct lands in different `--syntax-*` slots.
+ */
+export const okSyntaxHighlight = HighlightStyle.define([
// --- markdown ---
{
tag: [tags.heading, tags.heading1, tags.heading2, tags.heading3],
diff --git a/packages/app/src/globals.css b/packages/app/src/globals.css
index 5fa666f1c..aa75deeb6 100644
--- a/packages/app/src/globals.css
+++ b/packages/app/src/globals.css
@@ -11,8 +11,8 @@
/* --- Activity Panel unified-diff styling (react-diff-view) ---
The library renders diff hunks with `.diff-code-insert`, `.diff-code-delete`,
`.diff-gutter-insert`, `.diff-gutter-delete` class roots. Scoping under
- `.activity-panel-diff` keeps the tokens from leaking into the main DiffView
- (which uses @codemirror/merge, a different DOM entirely). */
+ `.activity-panel-diff` keeps the tokens from leaking into the main conflict
+ surface (a different DOM entirely). */
.activity-panel-diff .diff {
width: 100%;
table-layout: fixed;
@@ -1126,17 +1126,27 @@
padding-bottom: var(--ask-composer-height, 0px);
}
-/* Conflict-mode DiffView scroller: same composer inset so the last hunks (and
+/* Conflict surface scroller: same composer inset so the last hunks (and
their inline Accept/Reject controls) can scroll clear of the floating
- composer. The content-side padding rule lives next to the
- `.source-editor .cm-content` restore rule AFTER the `.cm-editor .cm-content`
- padding reset (equal specificity — source order decides; see the comment
- there). The conflict footer itself needs no inset — the composer anchors
+ composer. The conflict footer itself needs no inset — the composer anchors
above it via `--conflict-footer-height` (see use-conflict-footer-height.ts). */
-.diff-view {
+.conflict-view {
scroll-padding-bottom: var(--ask-composer-height, 0px);
}
+/* `scroll-padding-bottom` above only moves the scroll ANCHOR; it adds no
+ scrollable space, so the last rows still sit under the floating composer with
+ no way to reach them. The room has to come from padding the CONTENT, which is
+ what the editor does via `.cm-content` / `.ProseMirror`. Pierre's equivalent
+ is the `<diffs-container>` host it renders into — the CodeMirror rule this
+ replaces (`.diff-view .cm-content`) went away with the merge view and had no
+ successor until now. The var is 0 when the composer is collapsed or hidden,
+ so the space is reclaimed on its own. */
+.conflict-view diffs-container {
+ display: block;
+ padding-bottom: var(--ask-composer-height, 0px);
+}
+
/* Ease the inset + composer entrance so collapsing/expanding glides instead of a
hard jump cut. The per-frame scroll re-clamp in BottomComposer keeps the bottom
pinned while the padding transition plays. `bottom` is included because the
@@ -1144,8 +1154,7 @@
the conflict footer's height when conflict mode mounts/unmounts. Reduced-motion
users get the instant change. */
@media (prefers-reduced-motion: no-preference) {
- .editor-doc-scroll :is(.ProseMirror, .cm-content),
- .diff-view .cm-content {
+ .editor-doc-scroll :is(.ProseMirror, .cm-content) {
transition: padding-bottom 240ms cubic-bezier(0.22, 1, 0.36, 1);
}
[data-testid="bottom-composer"] {
@@ -2619,15 +2628,14 @@ body[data-editor-tab-dragging] * {
padding: 0;
}
-/* Restore the floating Ask AI composer's bottom inset for full-page source mode
- and the conflict-mode diff view. The `padding: 0` reset above ties on
- specificity with the shared `.editor-doc-scroll :is(.ProseMirror, .cm-content)`
- inset rule and, being later, zeroes it — so those surfaces' last lines would
- sit under the composer while WYSIWYG clears. Scoped to `.source-editor` /
- `.diff-view` (not `.cm-editor`) so nested code-block CM inside the WYSIWYG
- body is never padded; declared after the reset so it wins the tie. */
-.source-editor .cm-content,
-.diff-view .cm-content {
+/* Restore the floating Ask AI composer's bottom inset for full-page source mode.
+ The `padding: 0` reset above ties on specificity with the shared
+ `.editor-doc-scroll :is(.ProseMirror, .cm-content)` inset rule and, being
+ later, zeroes it — so those surfaces' last lines would sit under the composer
+ while WYSIWYG clears. Scoped to `.source-editor` (not `.cm-editor`) so nested
+ code-block CM inside the WYSIWYG body is never padded; declared after the
+ reset so it wins the tie. */
+.source-editor .cm-content {
padding-bottom: var(--ask-composer-height, 0px);
}
@@ -3205,6 +3213,7 @@ button:active:not(:disabled) {
--lint-error-color: oklch(55% 0.15 25);
--diff-added: var(--color-green-800, #22863a);
--diff-removed: var(--color-red-700, #b31d28);
+ --diff-modified: var(--color-blue-700, #005cc5);
/*
Terminal ANSI slots. The docked terminal reads these live, so a base16
@@ -3299,6 +3308,7 @@ button:active:not(:disabled) {
--lint-error-color: oklch(72% 0.18 25);
--diff-added: var(--color-green-300, #7ee787);
--diff-removed: var(--color-red-300, #ffa198);
+ --diff-modified: var(--color-blue-300, #79c0ff);
--ansi-black: #000000;
--ansi-red: #cd3131;
@@ -6300,6 +6310,68 @@ html.electron-mode [data-slot="sidebar-inner"] {
background-color: var(--comment-reveal-fill);
}
+/* Pierre conflict view CHROME — maps Pierre's --diffs-* custom properties to
+ the app's existing design tokens. These properties inherit through the open
+ shadow root of <diffs-container>, so no unsafeCSS injection is needed for
+ colour theming. The underlying --diff-added / --diff-removed tokens already
+ respond to .dark, so this single rule block covers both themes.
+
+ Chrome only — the SYNTAX colours inside a hunk come from the Shiki theme
+ (lib/ok-syntax-theme.ts), not from anything here. Four of the properties
+ below (--diffs-fg, --diffs-bg, --diffs-addition-color,
+ --diffs-deletion-color) are also written by Pierre at :host from that
+ theme's colors, and :host wins over this rule — the two are kept resolving
+ to the same tokens deliberately, so neither can silently take over. */
+.conflict-view {
+ --diffs-bg: var(--background);
+ --diffs-fg: var(--foreground);
+ --diffs-bg-context: var(--background);
+ --diffs-bg-context-gutter: var(--muted);
+ --diffs-fg-number: var(--muted-foreground);
+ --diffs-bg-addition: color-mix(in oklab, var(--diff-added) 15%, transparent);
+ --diffs-addition-color: var(--diff-added);
+ --diffs-bg-deletion: color-mix(in oklab, var(--diff-removed) 15%, transparent);
+ --diffs-deletion-color: var(--diff-removed);
+ /* Fills the incoming half of a merge conflict, against --diffs-addition-color
+ on the current half. Pierre routes the incoming side through its
+ "modified" channel, so this is a conflict-region fill, not a small status
+ indicator — it is why the value belongs here beside the other chrome
+ rather than inside the Shiki theme. */
+ --diffs-modified-color: var(--diff-modified);
+
+ /* Conflict-region wash strength — the one knob. Pierre mixes the colours
+ below into the surface itself (88% background for body rows, 78% for the
+ marker rows), so this pre-lightening compounds with that: the accents are
+ dark ramp steps chosen for TEXT, and at full strength they read as heavy
+ blocks rather than a tint behind readable prose. Raise toward 100% for a
+ stronger wash, lower for a fainter one.
+
+ Applied through Pierre's own `--conflict-bg-*-override` hooks, which
+ substitute the colour before its mix. The mix ratios themselves are set on
+ elements inside the shadow root and cannot be reached from out here. */
+ --ok-conflict-tint: 60%;
+ --ok-conflict-current: color-mix(
+ in oklab,
+ var(--diff-added) var(--ok-conflict-tint),
+ var(--background)
+ );
+ --ok-conflict-incoming: color-mix(
+ in oklab,
+ var(--diff-modified) var(--ok-conflict-tint),
+ var(--background)
+ );
+ --conflict-bg-current-override: var(--ok-conflict-current);
+ --conflict-bg-current-header-override: var(--ok-conflict-current);
+ --conflict-bg-current-number-override: var(--ok-conflict-current);
+ --conflict-bg-incoming-override: var(--ok-conflict-incoming);
+ --conflict-bg-incoming-header-override: var(--ok-conflict-incoming);
+ --conflict-bg-incoming-number-override: var(--ok-conflict-incoming);
+
+ --diffs-fg-conflict-marker: var(--muted-foreground);
+ --diffs-marker-bg: var(--muted);
+ --diffs-bg-separator: var(--muted);
+}
+
/* Pointer marker drawn into the frame a bug-report screenshot is taken on.
*
* `capturePage()` omits the cursor, so without this a report about a hover
diff --git a/packages/app/src/hooks/use-conflict-composer-prefill.dom.test.tsx b/packages/app/src/hooks/use-conflict-composer-prefill.dom.test.tsx
new file mode 100644
index 000000000..48edf6122
--- /dev/null
+++ b/packages/app/src/hooks/use-conflict-composer-prefill.dom.test.tsx
@@ -0,0 +1,186 @@
+/**
+ * Pins the two guards on the conflict composer prefill.
+ *
+ * The seed writes into the user's typing surface, and its draft is global +
+ * localStorage-backed — so a seed that clobbers, or one that is never withdrawn,
+ * follows the user well past the conflict that justified it.
+ *
+ * Substrate: jsdom.
+ */
+
+import { act, renderHook } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+
+let conflictsState: { conflicts: { file: string; detectedAt: string }[] } = { conflicts: [] };
+vi.doMock('@/hooks/use-conflicts', () => ({ useConflicts: () => conflictsState }));
+
+const { useConflictComposerPrefill } = await import('./use-conflict-composer-prefill');
+
+const ENTRY = { file: 'notes/roadmap.md', detectedAt: '2026-08-25T00:00:00.000Z' };
+const DOC2 = { file: 'notes/doc2.md', detectedAt: '2026-08-25T00:00:00.000Z' };
+
+/**
+ * Stand-in for the composer input handle. `setText` and `clear` invoke the
+ * content-change callback synchronously because the real `ComposerMentionInput`
+ * does — `setContent` does not fire `onUpdate`, so the handle calls the host
+ * back by hand. A fake that only assigns hides every self-notification bug.
+ */
+function makeInput(initial = '') {
+ let text = initial;
+ let onChange: (() => void) | null = null;
+ return {
+ getContent: () => ({ instruction: text, mentions: [] as string[] }),
+ setText: (next: string) => {
+ text = next;
+ onChange?.();
+ },
+ clear: () => {
+ text = '';
+ onChange?.();
+ },
+ read: () => text,
+ /** Wire the host's content-change relay, as BottomComposer's prop does. */
+ wire: (cb: () => void) => {
+ onChange = cb;
+ },
+ };
+}
+
+beforeEach(() => {
+ conflictsState = { conflicts: [] };
+});
+afterEach(() => vi.clearAllMocks());
+
+describe('useConflictComposerPrefill', () => {
+ test('seeds the resolve instruction for a conflicted doc', () => {
+ conflictsState = { conflicts: [ENTRY] };
+ const input = makeInput();
+ renderHook(() => useConflictComposerPrefill('notes/roadmap', { current: input }));
+
+ // "all" is the payload's one constraint: every region, not just the first.
+ expect(input.read()).toBe('Resolve all the merge conflicts in notes/roadmap.md.');
+ });
+
+ test('leaves an unconflicted doc alone', () => {
+ const input = makeInput();
+ renderHook(() => useConflictComposerPrefill('notes/team', { current: input }));
+ expect(input.read()).toBe('');
+ });
+
+ test('never clobbers a draft the user is part-way through', () => {
+ // Reachable in normal use: conflicts arrive from a background sync, not only
+ // from a navigation the user initiated.
+ conflictsState = { conflicts: [ENTRY] };
+ const input = makeInput('what does this function do?');
+ renderHook(() => useConflictComposerPrefill('notes/roadmap', { current: input }));
+ expect(input.read()).toBe('what does this function do?');
+ });
+
+ test('re-seeds when switching to another conflicted doc', () => {
+ // Clicking between conflicted files left the instruction naming the file the
+ // user had just left, because a seeded draft reads as "occupied".
+ conflictsState = { conflicts: [ENTRY, DOC2] };
+ const input = makeInput();
+ const { rerender } = renderHook(
+ ({ doc }) => useConflictComposerPrefill(doc, { current: input }),
+ { initialProps: { doc: 'notes/roadmap' as string | null } },
+ );
+ expect(input.read()).toContain('notes/roadmap.md');
+
+ rerender({ doc: 'notes/doc2' });
+ expect(input.read()).toContain('notes/doc2.md');
+ expect(input.read()).not.toContain('notes/roadmap.md');
+ });
+
+ test('reports an untouched seed as not-composing, and an edited one as composing', () => {
+ // The composer attaches every doc visited "while still drafting". A seed
+ // nobody typed must not count, or clicking through conflicts silently
+ // attaches them all.
+ conflictsState = { conflicts: [ENTRY] };
+ const input = makeInput();
+ const { result, rerender } = renderHook(() =>
+ useConflictComposerPrefill('notes/roadmap', { current: input }),
+ );
+ expect(result.current.isSeedIntact).toBe(true);
+
+ input.setText(`${input.read()} Keep my Region 2.`);
+ act(() => result.current.onContentChanged());
+ rerender();
+ expect(result.current.isSeedIntact).toBe(false);
+ });
+
+ test('a re-seed does not retire itself as a user edit', () => {
+ // `setText` calls the host's change handler synchronously, so the seed's own
+ // write arrives looking exactly like typing.
+ conflictsState = { conflicts: [ENTRY, DOC2] };
+ const input = makeInput();
+ const { result, rerender } = renderHook(
+ ({ doc }) => useConflictComposerPrefill(doc, { current: input }),
+ { initialProps: { doc: 'notes/roadmap' as string | null } },
+ );
+ input.wire(() => result.current.onContentChanged());
+
+ rerender({ doc: 'notes/doc2' });
+ expect(result.current.isSeedIntact).toBe(true);
+ expect(input.read()).toContain('notes/doc2.md');
+ });
+
+ test('recognises a seed restored from a previous session', () => {
+ // The draft persists to localStorage, so a seed outlives the process that
+ // wrote it and returns at mount looking exactly like the user typed it.
+ // Reading it as a draft in progress is what made every clicked doc attach.
+ conflictsState = { conflicts: [ENTRY, DOC2] };
+ const restored = 'Resolve all the merge conflicts in notes/roadmap.md.';
+ const input = makeInput(restored);
+ const { result } = renderHook(() =>
+ useConflictComposerPrefill('notes/roadmap', { current: input }),
+ );
+ expect(result.current.isSeedIntact).toBe(true);
+ });
+
+ test('re-targets a restored seed for the doc actually open', () => {
+ conflictsState = { conflicts: [ENTRY, DOC2] };
+ // Restored while the user is now looking at doc2.
+ const input = makeInput('Resolve all the merge conflicts in notes/roadmap.md.');
+ renderHook(() => useConflictComposerPrefill('notes/doc2', { current: input }));
+ expect(input.read()).toBe('Resolve all the merge conflicts in notes/doc2.md.');
+ });
+
+ test('a restored draft the user actually wrote is left alone', () => {
+ conflictsState = { conflicts: [ENTRY] };
+ const input = makeInput('what changed in this file last week?');
+ const { result } = renderHook(() =>
+ useConflictComposerPrefill('notes/roadmap', { current: input }),
+ );
+ expect(result.current.isSeedIntact).toBe(false);
+ expect(input.read()).toBe('what changed in this file last week?');
+ });
+
+ test('withdraws its own seed once the conflict is gone', () => {
+ conflictsState = { conflicts: [ENTRY] };
+ const input = makeInput();
+ const { rerender } = renderHook(
+ ({ doc }) => useConflictComposerPrefill(doc, { current: input }),
+ { initialProps: { doc: 'notes/roadmap' as string | null } },
+ );
+ expect(input.read()).not.toBe('');
+
+ conflictsState = { conflicts: [] };
+ rerender({ doc: 'notes/roadmap' });
+ expect(input.read()).toBe('');
+ });
+
+ test('keeps an edited seed — it is the user’s text now', () => {
+ conflictsState = { conflicts: [ENTRY] };
+ const input = makeInput();
+ const { rerender } = renderHook(
+ ({ doc }) => useConflictComposerPrefill(doc, { current: input }),
+ { initialProps: { doc: 'notes/roadmap' as string | null } },
+ );
+ input.setText(`${input.read()}\n\nKeep my Region 2.`);
+
+ conflictsState = { conflicts: [] };
+ rerender({ doc: 'notes/roadmap' });
+ expect(input.read()).toContain('Keep my Region 2.');
+ });
+});
diff --git a/packages/app/src/hooks/use-conflict-composer-prefill.ts b/packages/app/src/hooks/use-conflict-composer-prefill.ts
new file mode 100644
index 000000000..7d61a9e90
--- /dev/null
+++ b/packages/app/src/hooks/use-conflict-composer-prefill.ts
@@ -0,0 +1,137 @@
+/**
+ * Seeds the Ask AI composer with the resolve-conflicts instruction while the
+ * open document is conflicted. This is the only entry point to that payload —
+ * the conflict toolbar carries no AI control.
+ *
+ * The load-bearing part is `isSeedIntact`, not the seeding. A seeded draft is
+ * byte-indistinguishable from a typed one, and the composer treats a non-empty
+ * draft as "the user is composing" — which drives touched-file accumulation, so
+ * an unadvertised seed makes every conflicted doc the user clicks attach itself
+ * as context they never asked for. Anything else keyed on emptiness has the
+ * same trap, hence a flag the composer can consult rather than a fix at one
+ * call site.
+ *
+ * The seed is withdrawn only while untouched. Once the user edits it the text
+ * is theirs: it stops tracking the open document, survives leaving the
+ * conflict, and counts as composing like any other draft.
+ *
+ * Recognition is by CONTENT, not by remembering what was written. The draft is
+ * persisted to localStorage, so a seed outlives the process that wrote it and
+ * comes back at mount looking exactly like something the user typed — an
+ * in-memory record of "what I seeded" is null precisely when it is needed, and
+ * the restored seed then reads as a draft in progress for the rest of the
+ * session.
+ */
+
+import { type RefObject, useEffect, useRef, useState } from 'react';
+import { useConflicts } from '@/hooks/use-conflicts';
+import { buildResolveDraft } from '@/lib/conflict-resolve-draft';
+import { filePathToDocName } from '@/lib/doc-hash';
+
+interface PrefillTarget {
+ getContent: () => { instruction: string; mentions: string[] };
+ setText: (text: string) => void;
+ clear: () => void;
+}
+
+interface PrefillState {
+ /** Whether the composer currently holds this hook's seed, unedited. False
+ * whenever the draft is empty, user-authored, or user-modified. */
+ isSeedIntact: boolean;
+ /** Call on every composer content change so an edit retires the seed. */
+ onContentChanged: () => void;
+}
+
+/**
+ * Whether a draft is one of this hook's own seeds, rather than user text.
+ *
+ * Matched by CONTENT against every currently-tracked conflict, because the
+ * draft persists to localStorage: a seed outlives the process that wrote it and
+ * returns at mount looking exactly like something the user typed, so an
+ * in-memory record is null precisely when it is needed. `lastSeed` covers the
+ * opposite gap — a seed whose file has just left the conflict list, which is
+ * when it must be withdrawn and when content matching can no longer see it.
+ *
+ * Module-level and argument-taking so it is not a hook dependency: as a closure
+ * it is re-created every render, and the exhaustive-deps autofix adds it to the
+ * effect's dependency array, which then re-runs forever.
+ */
+function isSeedText(text: string, conflictFilesKey: string, lastSeed: string | null): boolean {
+ if (text === '') return false;
+ if (text === lastSeed) return true;
+ return conflictFilesKey.split('\u0000').some((file) => buildResolveDraft(file) === text);
+}
+
+export function useConflictComposerPrefill(
+ docName: string | null,
+ inputRef: RefObject<PrefillTarget | null>,
+): PrefillState {
+ const { conflicts } = useConflicts();
+ const conflictFile =
+ docName === null
+ ? undefined
+ : conflicts.find((entry) => filePathToDocName(entry.file) === docName)?.file;
+
+ // Stable across renders that re-derive an equal conflict list.
+ const conflictFilesKey = conflicts
+ .map((entry) => entry.file)
+ .sort()
+ .join('\u0000');
+
+ const [isSeedIntact, setIsSeedIntact] = useState(false);
+ // Content recognition cannot identify a seed once its file leaves the
+ // conflict list, which is exactly when the seed must be withdrawn. This
+ // covers that window; it is deliberately not the primary signal, because it
+ // is empty on the mount that restores a persisted seed.
+ const lastSeedRef = useRef<string | null>(null);
+
+ useEffect(() => {
+ const input = inputRef.current;
+ if (input === null) return;
+ const current = input.getContent().instruction;
+ const holdsIntactSeed = isSeedText(current, conflictFilesKey, lastSeedRef.current);
+
+ if (conflictFile === undefined) {
+ // Left the conflict — navigated away, or the agent resolved it.
+ if (holdsIntactSeed) input.clear();
+ lastSeedRef.current = null;
+ setIsSeedIntact(false);
+ return;
+ }
+
+ // Seed into an empty composer, and re-seed when the standing draft is this
+ // hook's own untouched seed for a different file — a user clicking between
+ // conflicted docs should not be told to resolve the one they just left.
+ // Never over a draft the user wrote: a conflict can arrive from a background
+ // sync while they are mid-sentence on something unrelated.
+ if (current !== '' && !holdsIntactSeed) return;
+
+ const draft = buildResolveDraft(conflictFile);
+ if (current === draft) {
+ // Already correct — a seed restored from a previous session for the doc
+ // that is open. Still needs claiming, or it reads as a draft in progress.
+ lastSeedRef.current = current;
+ setIsSeedIntact(true);
+ return;
+ }
+
+ // `setText` calls the host's change relay synchronously, so this write
+ // arrives at `onContentChanged` looking like typing and momentarily retires
+ // the seed. The two lines below re-establish it in the same pass and React
+ // batches the flag, so no guard is needed — a test that removes one cannot
+ // fail, which is why there isn't one.
+ input.setText(draft);
+ lastSeedRef.current = draft;
+ setIsSeedIntact(true);
+ }, [conflictFile, conflictFilesKey, inputRef]);
+
+ return {
+ isSeedIntact,
+ onContentChanged: () => {
+ const current = inputRef.current?.getContent().instruction ?? '';
+ const stillSeed = isSeedText(current, conflictFilesKey, lastSeedRef.current);
+ if (!stillSeed) lastSeedRef.current = null;
+ setIsSeedIntact(stillSeed);
+ },
+ };
+}
diff --git a/packages/app/src/hooks/use-conflict-footer-height.ts b/packages/app/src/hooks/use-conflict-footer-height.ts
index 42d1ed457..15cb109b5 100644
--- a/packages/app/src/hooks/use-conflict-footer-height.ts
+++ b/packages/app/src/hooks/use-conflict-footer-height.ts
@@ -7,8 +7,8 @@ import { useEffect, useRef } from 'react';
* Cross-file contract with BottomComposer + globals.css: the floating Ask AI
* composer anchors its bottom to this var (the counterpart of the composer's
* own `--ask-composer-height`) so it stacks ABOVE the conflict controls —
- * the both-modified footer inside DiffView and the delete-vs-modify footers
- * inside DiffViewBoundary — instead of covering them.
+ * the both-modified footer inside ConflictView and the delete-vs-modify
+ * footers inside DiffViewBoundary — instead of covering them.
*
* Root-level var: at most one conflict footer has live EFFECTS at a time.
* Hidden Activity entries in EditorActivityPool keep their DOM, but React
@@ -54,7 +54,9 @@ export function useConflictFooterHeightVar(enabled: boolean) {
// the footer DOM node cannot change while `enabled` stays true (ref
// mutations don't re-run effects, so a swapped node would leave the
// observer on a detached element). Both call sites guarantee this —
- // DiffView's conflictMode is stable for the mount, and DiffViewBoundary's
+ // ConflictView passes a literal `true` and owns a footer node that stays
+ // mounted for the life of the component (it renders even while empty, so
+ // the composer has a height to anchor against), and DiffViewBoundary's
// setSides(null) reset forces enabled false→true across kind switches.
}, [enabled]);
diff --git a/packages/app/src/hooks/use-conflicts.ts b/packages/app/src/hooks/use-conflicts.ts
index a68d3bf8c..43e1418eb 100644
--- a/packages/app/src/hooks/use-conflicts.ts
+++ b/packages/app/src/hooks/use-conflicts.ts
@@ -83,7 +83,14 @@ export function useConflicts(): {
const requestId = ++latestRequestId.current;
void fetchConflicts().then(({ conflicts: list, error: err }) => {
if (requestId !== latestRequestId.current) return;
- setConflicts(list);
+ // A failed fetch returns an EMPTY list beside its error, so writing it
+ // through would destroy a known-good list on every transient blip — and
+ // this refreshes on every CC1 sync-status signal, which fires repeatedly
+ // during exactly the merge a user is resolving. Consumers that gate on
+ // "no entry for this doc" would then tear down a live conflict view, and
+ // its unapplied resolutions with it, the moment a poll missed. Keep the
+ // last good list and let `error` say the picture is stale.
+ if (err === undefined) setConflicts(list);
setError(err ?? null);
setLoading(false);
});
diff --git a/packages/app/src/lib/acp/code-highlighter-impl.test.ts b/packages/app/src/lib/acp/code-highlighter-impl.test.ts
index 355add4ef..8def688f3 100644
--- a/packages/app/src/lib/acp/code-highlighter-impl.test.ts
+++ b/packages/app/src/lib/acp/code-highlighter-impl.test.ts
@@ -39,7 +39,7 @@ describe('tokenize', () => {
expect(createHighlighterCore).not.toHaveBeenCalled();
expect(highlighter.codeToTokens).toHaveBeenCalledWith('{}', {
lang: 'json',
- themes: { light: 'github-light', dark: 'github-dark' },
+ theme: 'ok-syntax',
});
});
@@ -47,7 +47,7 @@ describe('tokenize', () => {
await tokenize('body {}', 'not-loaded');
expect(highlighter.codeToTokens).toHaveBeenCalledWith('body {}', {
lang: 'text',
- themes: { light: 'github-light', dark: 'github-dark' },
+ theme: 'ok-syntax',
});
});
});
diff --git a/packages/app/src/lib/acp/code-highlighter-impl.ts b/packages/app/src/lib/acp/code-highlighter-impl.ts
index 03fd8ccf5..a8685e63d 100644
--- a/packages/app/src/lib/acp/code-highlighter-impl.ts
+++ b/packages/app/src/lib/acp/code-highlighter-impl.ts
@@ -1,7 +1,7 @@
/**
* The heavy half of the code highlighter: shiki core, the JavaScript regex
- * engine (no oniguruma wasm), the curated grammars, and the github theme
- * pair. Loaded only via the dynamic import in `code-highlighter.ts` — a
+ * engine (no oniguruma wasm), the curated grammars, and the shared
+ * `--syntax-*` theme. Loaded only via the dynamic import in `code-highlighter.ts` — a
* static import from anywhere else would drag every grammar into the main
* bundle and re-break the size budget. Grammar list must stay in sync with
* `LANGUAGES` in `code-highlighter.ts`.
@@ -26,10 +26,9 @@ import langSql from '@shikijs/langs/sql';
import langToml from '@shikijs/langs/toml';
import langTsx from '@shikijs/langs/tsx';
import langYaml from '@shikijs/langs/yaml';
-import themeGithubDark from '@shikijs/themes/github-dark';
-import themeGithubLight from '@shikijs/themes/github-light';
import { createHighlighterCore, type HighlighterCore, type TokensResult } from 'shiki/core';
import { createJavaScriptRegexEngine } from 'shiki/engine/javascript';
+import { OK_SYNTAX_THEME_NAME, okSyntaxTheme } from '@/lib/ok-syntax-theme';
let highlighterPromise: Promise<HighlighterCore> | null = null;
@@ -38,7 +37,7 @@ function getHighlighter(): Promise<HighlighterCore> {
// forever — `??=` would otherwise pin the rejected promise and disable
// highlighting for the rest of the session.
highlighterPromise ??= createHighlighterCore({
- themes: [themeGithubLight, themeGithubDark],
+ themes: [okSyntaxTheme],
langs: [
langCss,
langDiff,
@@ -66,12 +65,16 @@ function getHighlighter(): Promise<HighlighterCore> {
return highlighterPromise;
}
-/** Dual-theme token stream in the same shape `@streamdown/code` produced. */
+/**
+ * Single-theme token stream. `okSyntaxTheme` resolves its colors to the
+ * `--syntax-*` custom properties, which already flip with the app's mode, so
+ * one theme covers light and dark — a light/dark pair would ask Shiki to
+ * resolve the mode a second time off a palette that no longer varies by it.
+ * Streamdown reads the resulting per-token `color` into its own
+ * `--sdm-c` and paints through it.
+ */
export async function tokenize(code: string, language: string): Promise<TokensResult> {
const highlighter = await getHighlighter();
const resolved = highlighter.getLoadedLanguages().includes(language) ? language : 'text';
- return highlighter.codeToTokens(code, {
- lang: resolved,
- themes: { light: 'github-light', dark: 'github-dark' },
- });
+ return highlighter.codeToTokens(code, { lang: resolved, theme: OK_SYNTAX_THEME_NAME });
}
diff --git a/packages/app/src/lib/acp/code-highlighter.test.ts b/packages/app/src/lib/acp/code-highlighter.test.ts
index 8dcd6064d..2700a2692 100644
--- a/packages/app/src/lib/acp/code-highlighter.test.ts
+++ b/packages/app/src/lib/acp/code-highlighter.test.ts
@@ -22,7 +22,7 @@ describe('codeHighlighter facade', () => {
test('canonicalizes fence aliases onto the loaded grammars', async () => {
const callback = vi.fn();
codeHighlighter.highlight(
- { code: 'const a = 1;', language: 'ts', themes: ['github-light', 'github-dark'] },
+ { code: 'const a = 1;', language: 'ts', themes: ['ok-syntax', 'ok-syntax'] },
callback,
);
await flush();
@@ -32,7 +32,7 @@ describe('codeHighlighter facade', () => {
test('an unknown language tokenizes as plain text', async () => {
codeHighlighter.highlight(
- { code: 'hello', language: 'brainfuck', themes: ['github-light', 'github-dark'] },
+ { code: 'hello', language: 'brainfuck', themes: ['ok-syntax', 'ok-syntax'] },
vi.fn(),
);
await flush();
@@ -44,7 +44,7 @@ describe('codeHighlighter facade', () => {
const options = {
code: 'print("hi")',
language: 'python',
- themes: ['github-light', 'github-dark'],
+ themes: ['ok-syntax', 'ok-syntax'],
} as Parameters<typeof codeHighlighter.highlight>[0];
expect(codeHighlighter.highlight(options, callback)).toBeNull();
await flush();
@@ -62,7 +62,7 @@ describe('codeHighlighter facade', () => {
const options = {
code: 'SELECT 1;',
language: 'sql',
- themes: ['github-light', 'github-dark'],
+ themes: ['ok-syntax', 'ok-syntax'],
} as Parameters<typeof codeHighlighter.highlight>[0];
expect(codeHighlighter.highlight(options, failed)).toBeNull();
await flush();
@@ -81,7 +81,7 @@ describe('codeHighlighter facade', () => {
const options = {
code: 'SELECT 2;',
language: 'sql',
- themes: ['github-light', 'github-dark'],
+ themes: ['ok-syntax', 'ok-syntax'],
} as Parameters<typeof codeHighlighter.highlight>[0];
expect(codeHighlighter.highlight(options, first)).toBeNull();
expect(codeHighlighter.highlight(options, second)).toBeNull();
@@ -95,7 +95,7 @@ describe('codeHighlighter facade', () => {
});
test('cache eviction drops the oldest entries, not the whole cache', async () => {
- const themes = ['github-light', 'github-dark'] as Parameters<
+ const themes = ['ok-syntax', 'ok-syntax'] as Parameters<
typeof codeHighlighter.highlight
>[0]['themes'];
const opts = (i: number) =>
diff --git a/packages/app/src/lib/acp/code-highlighter.ts b/packages/app/src/lib/acp/code-highlighter.ts
index b49747482..237d20207 100644
--- a/packages/app/src/lib/acp/code-highlighter.ts
+++ b/packages/app/src/lib/acp/code-highlighter.ts
@@ -20,6 +20,7 @@ import type {
HighlightOptions,
ThemeInput,
} from 'streamdown';
+import { okSyntaxTheme } from '@/lib/ok-syntax-theme';
/**
* Fence labels mapped to the grammar the lazy impl actually loads. Ids must
@@ -54,7 +55,14 @@ const CANONICAL = new Map<string, string>(
]),
);
-const THEMES: [ThemeInput, ThemeInput] = ['github-light', 'github-dark'];
+// Streamdown's plugin contract is a light/dark pair, but this highlighter is
+// single-theme: `okSyntaxTheme` paints from `--syntax-*`, which already flips
+// with the app's mode. Both slots name it so streamdown's memo key stays
+// stable — `highlight` below ignores `options.themes` and lets the impl pick.
+// The theme object rather than its name: streamdown's `ThemeInput` admits a
+// registration or a *bundled* theme id, and `ok-syntax` is neither bundled
+// nor registered in streamdown's own highlighter.
+const THEMES: [ThemeInput, ThemeInput] = [okSyntaxTheme, okSyntaxTheme];
// Streaming re-highlights the whole block on every appended chunk, so the
// cache sees one entry per growth step — bound it so a long session can't
@@ -73,8 +81,8 @@ export const codeHighlighter: CodeHighlighterPlugin = {
type: 'code-highlighter',
getSupportedLanguages: () => Array.from(CANONICAL.keys()) as BundledLanguage[],
supportsLanguage: (language) => CANONICAL.has(language),
- // The configured pair, not the caller's request: tokenize always renders
- // github-light/github-dark (the only themes the lazy impl loads).
+ // The configured theme, not the caller's request: tokenize always renders
+ // `ok-syntax` (the only theme the lazy impl loads).
getThemes: () => THEMES,
highlight(options: HighlightOptions, callback?: (result: TokensResult) => void) {
const language = CANONICAL.get(options.language) ?? 'text';
diff --git a/packages/app/src/lib/conflict-resolve-draft.ts b/packages/app/src/lib/conflict-resolve-draft.ts
new file mode 100644
index 000000000..2bab9ed1f
--- /dev/null
+++ b/packages/app/src/lib/conflict-resolve-draft.ts
@@ -0,0 +1,33 @@
+/**
+ * The instruction staged for an agent asked to resolve a file's merge conflicts,
+ * seeded into the Ask AI composer while a conflicted document is open.
+ *
+ * The guardrails below are the payload's whole value, not the opening sentence.
+ */
+
+/**
+ * Deliberately NOT translated, and deliberately not caught by the
+ * user-facing-string lint (whose four branches do not match a template-literal
+ * return).
+ *
+ * This is machine-directed input — a prompt handed to an agent — in the same
+ * category as the CLI command surface that CLAUDE.md exempts, not chrome. The
+ * tools it addresses describe themselves in English, and translating the
+ * instruction would send a localised request to them.
+ *
+ * There is also a concrete cost: `isSeedText` recognises an untouched seed by
+ * exact content match, and the draft persists to localStorage — so a localised
+ * seed stops being recognised the moment the user changes language, and reads
+ * as their own text forever. Revisiting this means storing a non-content marker
+ * alongside the draft first.
+ */
+export function buildResolveDraft(filePath: string): string {
+ // One line on purpose. The `conflicts` and `resolve_conflict` tool descriptions
+ // already name each other and explain every strategy, and "all" carries the
+ // only constraint that mattered — resolve every region, not the first one.
+ //
+ // This is a STAGED draft, not a sent prompt: the user reads it and adds
+ // whatever they want for a given conflict before sending. A starting point
+ // they extend beats a paragraph they have to delete.
+ return `Resolve all the merge conflicts in ${filePath}.`;
+}
diff --git a/packages/app/src/lib/ok-syntax-parity.test.ts b/packages/app/src/lib/ok-syntax-parity.test.ts
new file mode 100644
index 000000000..9ecba335d
--- /dev/null
+++ b/packages/app/src/lib/ok-syntax-parity.test.ts
@@ -0,0 +1,157 @@
+/**
+ * Holds the two syntax themes to each other.
+ *
+ * `editor/extensions/cm-theme.ts` (CodeMirror/Lezer) and `ok-syntax-theme.ts`
+ * (Shiki/TextMate) paint the same documents through different engines. Both
+ * resolve to `--syntax-*`, so they agree only as far as their slot assignments
+ * agree — and nothing but this test notices when one drifts. Source mode and a
+ * conflict view sit one toggle apart, so drift is visible to a user
+ * immediately.
+ *
+ * Both sides are reduced to the same shape: for each character of a sample,
+ * which `--syntax-*` slot did this engine choose. Then compared token by
+ * token.
+ */
+
+import { javascript } from '@codemirror/lang-javascript';
+import { highlightTree } from '@lezer/highlight';
+import langTsx from '@shikijs/langs/tsx';
+import { createHighlighterCore } from 'shiki/core';
+import { createJavaScriptRegexEngine } from 'shiki/engine/javascript';
+import { beforeAll, describe, expect, test } from 'vitest';
+import { okSyntaxHighlight } from '@/editor/extensions/cm-theme';
+import { OK_SYNTAX_THEME_NAME, okSyntaxTheme } from './ok-syntax-theme';
+
+/** `var(--syntax-keyword)` → `syntax-keyword`; anything else → null. */
+function slotOf(color: string | undefined): string | null {
+ const match = color?.match(/^var\(--([a-z0-9-]+)\)$/);
+ return match ? match[1] : null;
+}
+
+/**
+ * CodeMirror emits class names, not colors. `HighlightStyle` keeps the colors
+ * in its StyleModule, so recover the class → slot map from the generated CSS.
+ */
+function cmClassToSlot(): Map<string, string> {
+ const rules = okSyntaxHighlight.module?.getRules() ?? '';
+ const map = new Map<string, string>();
+ for (const rule of rules.matchAll(/\.(\S+?)\s*\{([^}]*)\}/g)) {
+ const slot = slotOf(rule[2].match(/color:\s*(var\([^)]*\))/)?.[1]);
+ if (slot) map.set(rule[1], slot);
+ }
+ return map;
+}
+
+/** Per-character slot assignment from CodeMirror, `null` where unstyled. */
+function cmSlots(source: string): Array<string | null> {
+ const classToSlot = cmClassToSlot();
+ const tree = javascript({ jsx: true, typescript: true }).language.parser.parse(source);
+ const out: Array<string | null> = new Array(source.length).fill(null);
+ highlightTree(tree, okSyntaxHighlight, (from, to, classes) => {
+ for (const cls of classes.split(' ')) {
+ const slot = classToSlot.get(cls);
+ if (!slot) continue;
+ for (let i = from; i < to; i += 1) out[i] = slot;
+ }
+ });
+ return out;
+}
+
+let highlighter: Awaited<ReturnType<typeof createHighlighterCore>>;
+
+beforeAll(async () => {
+ highlighter = await createHighlighterCore({
+ themes: [okSyntaxTheme],
+ langs: [langTsx],
+ engine: createJavaScriptRegexEngine({ forgiving: true }),
+ });
+});
+
+/** One row per non-whitespace Shiki token: its text and each engine's slot. */
+function compare(source: string): Array<{ text: string; shiki: string | null; cm: string | null }> {
+ const cm = cmSlots(source);
+ const { tokens } = highlighter.codeToTokens(source, {
+ lang: 'tsx',
+ theme: OK_SYNTAX_THEME_NAME,
+ });
+ const rows: Array<{ text: string; shiki: string | null; cm: string | null }> = [];
+ for (const line of tokens) {
+ for (const token of line) {
+ if (token.content.trim() === '') continue;
+ // A Shiki token can span characters CodeMirror split further; take the
+ // first styled character as this token's CodeMirror slot.
+ let cmSlot: string | null = null;
+ for (let i = token.offset; i < token.offset + token.content.length; i += 1) {
+ if (cm[i]) {
+ cmSlot = cm[i];
+ break;
+ }
+ }
+ rows.push({ text: token.content, shiki: slotOf(token.color), cm: cmSlot });
+ }
+ }
+ return rows;
+}
+
+/** Rows where both engines styled the token, but chose different slots. */
+function disagreements(source: string) {
+ return compare(source).filter((row) => row.shiki && row.cm && row.shiki !== row.cm);
+}
+
+describe('CodeMirror ↔ Shiki slot parity', () => {
+ test('keywords, strings, numbers and comments agree', () => {
+ const source = [
+ '// a comment',
+ 'const total = 42;',
+ 'let name = "Ada";',
+ 'if (total > 0) return null;',
+ '',
+ ].join('\n');
+ expect(disagreements(source)).toEqual([]);
+ });
+
+ test('functions, types and class names agree', () => {
+ const source = [
+ 'class Widget extends Thing {',
+ ' render(count) {',
+ ' return format(count);',
+ ' }',
+ '}',
+ '',
+ ].join('\n');
+ expect(disagreements(source)).toEqual([]);
+ });
+
+ test('both engines actually styled the sample', () => {
+ // Guards the comparison itself: if either side returned all-null the
+ // disagreement checks above would pass vacuously.
+ const rows = compare('const total = 42; // note\n');
+ expect(rows.filter((row) => row.shiki !== null).length).toBeGreaterThan(3);
+ expect(rows.filter((row) => row.cm !== null).length).toBeGreaterThan(3);
+ });
+
+ test('a broad sample diverges only where the two parsers genuinely disagree', () => {
+ const source = [
+ 'import { readFile } from "node:fs";',
+ 'export const LIMIT = 100;',
+ 'type Shape = { kind: string; size: number };',
+ 'const fn = (a, b) => a ?? b;',
+ 'const re = /ab+c/gi;',
+ 'const obj = { key: "value", nested: { flag: true, missing: null } };',
+ // biome-ignore lint/suspicious/noTemplateCurlyInString: fixture source that must contain a real template literal for both engines to tokenize
+ 'function greet(name = "world") { return `hi ${name}`; }',
+ 'class A { static x = 1; get y() { return 2; } }',
+ 'for (let i = 0; i < 10; i++) { obj.key = String(i); }',
+ 'try { greet(); } catch (err) { console.error(err); }',
+ '',
+ ].join('\n');
+
+ // The one construct no theme can reconcile. TextMate gives a bare call
+ // (`greet()`) and a member call (`console.error()`) identical scopes, so a
+ // rule that moves one moves both; Lezer separates them, calling the member
+ // a property. Matching here would mispaint every standalone call instead.
+ expect(disagreements(source)).toEqual([
+ { text: 'error', shiki: 'syntax-func', cm: 'syntax-attr' },
+ ]);
+ });
+});
diff --git a/packages/app/src/lib/ok-syntax-theme.test.ts b/packages/app/src/lib/ok-syntax-theme.test.ts
new file mode 100644
index 000000000..bd60c9fa7
--- /dev/null
+++ b/packages/app/src/lib/ok-syntax-theme.test.ts
@@ -0,0 +1,98 @@
+/**
+ * Runs the real Shiki against `okSyntaxTheme`. The theme's whole premise is
+ * that a `var(...)` string survives tokenization as a token color instead of
+ * being parsed as a color and rejected — assert it rather than trust it, since
+ * a Shiki upgrade that started validating color syntax would otherwise fail
+ * silently as unpainted code rather than as a thrown error.
+ */
+
+import langTsx from '@shikijs/langs/tsx';
+import { createHighlighterCore } from 'shiki/core';
+import { createJavaScriptRegexEngine } from 'shiki/engine/javascript';
+import { beforeAll, describe, expect, test } from 'vitest';
+import { OK_SYNTAX_THEME_NAME, okSyntaxTheme } from './ok-syntax-theme';
+
+let highlighter: Awaited<ReturnType<typeof createHighlighterCore>>;
+
+beforeAll(async () => {
+ highlighter = await createHighlighterCore({
+ themes: [okSyntaxTheme],
+ langs: [langTsx],
+ engine: createJavaScriptRegexEngine({ forgiving: true }),
+ });
+});
+
+/** Flattened tokens for one line of tsx, keyed by content. */
+function colorOf(code: string, content: string): string | undefined {
+ const { tokens } = highlighter.codeToTokens(code, {
+ lang: 'tsx',
+ theme: OK_SYNTAX_THEME_NAME,
+ });
+ return tokens.flat().find((token) => token.content.trim() === content)?.color;
+}
+
+describe('okSyntaxTheme', () => {
+ test('loads under its registered name', () => {
+ expect(highlighter.getLoadedThemes()).toContain(OK_SYNTAX_THEME_NAME);
+ });
+
+ test('paints tokens with the custom properties the CodeMirror theme uses', () => {
+ const code = 'const answer = 42; // note\n';
+ expect(colorOf(code, 'const')).toBe('var(--syntax-keyword)');
+ expect(colorOf(code, '42')).toBe('var(--syntax-number)');
+ expect(colorOf(code, '// note')).toBe('var(--syntax-comment)');
+ });
+
+ test('paints a string and its delimiters from the one string slot', () => {
+ // The grammar emits the quotes as tokens of their own, and CodeMirror
+ // paints them with the body — so they must not fall through to the
+ // `punctuation` rule. Sharing the slot makes Shiki merge all three into a
+ // single token, which is what this asserts: a `"hi"` token exists at all.
+ expect(colorOf('const s = "hi";\n', '"hi"')).toBe('var(--syntax-string)');
+ });
+
+ test('resolves the editor foreground to an app token, not a baked color', () => {
+ const { fg, bg } = highlighter.codeToTokens('x\n', {
+ lang: 'tsx',
+ theme: OK_SYNTAX_THEME_NAME,
+ });
+ expect(fg).toBe('var(--foreground)');
+ expect(bg).toBe('var(--background)');
+ });
+
+ test('declares no chrome colors — only the editor foreground and background', () => {
+ // The regression this guards. `gitDecoration.*` and `terminal.ansi*` look
+ // like harmless metadata, but Pierre expands them into
+ // `--diffs-addition-color` / `--diffs-modified-color` and writes them at
+ // `:host`, where they outrank the `--diffs-*` block in globals.css and
+ // silently take over the fill of both halves of every merge conflict.
+ // Conflict fills are chrome and belong in the stylesheet; a color added
+ // here would move them back out of reach.
+ expect(Object.keys(okSyntaxTheme.colors ?? {})).toEqual([
+ 'editor.foreground',
+ 'editor.background',
+ ]);
+ });
+
+ test('no token can pin a baked color', () => {
+ const code = [
+ 'import type { Thing } from "./thing";',
+ '// a comment',
+ 'export class Widget extends Thing {',
+ ' render(count = 42, flag = true) {',
+ ' return String(count) ?? /re/g;',
+ ' }',
+ '}',
+ '',
+ ].join('\n');
+ const { tokens } = highlighter.codeToTokens(code, {
+ lang: 'tsx',
+ theme: OK_SYNTAX_THEME_NAME,
+ });
+ const colors = tokens.flat().map((token) => token.color);
+ expect(colors.length).toBeGreaterThan(30);
+ for (const color of colors) {
+ expect(color).toMatch(/^var\(--[a-z0-9-]+\)$/);
+ }
+ });
+});
diff --git a/packages/app/src/lib/ok-syntax-theme.ts b/packages/app/src/lib/ok-syntax-theme.ts
new file mode 100644
index 000000000..6dbb2c67d
--- /dev/null
+++ b/packages/app/src/lib/ok-syntax-theme.ts
@@ -0,0 +1,240 @@
+/**
+ * The Shiki theme every Shiki-backed surface in the app shares — Pierre's diff
+ * and conflict views, and the agent-markdown code blocks.
+ *
+ * It is the Shiki-side twin of `editor/extensions/cm-theme.ts`: both resolve
+ * their token colors to the same `--syntax-*` custom properties, so a selected
+ * IDE color theme repaints a conflict hunk and the source editor beside it the
+ * same way. A bundled palette (Pierre's own `pierre-light`/`pierre-dark`
+ * default, or `github-*`) pins its colors at build time and no theme can reach
+ * them, which is what let those surfaces drift apart.
+ *
+ * Emitting `var(...)` from a theme's `foreground` is a first-class Shiki
+ * mechanism, not a trick — it is exactly what `createCssVariablesTheme`
+ * produces. That helper is not used here because it exposes only ten coarse
+ * token slots (numbers and constants share one; types, tags and attributes
+ * have none), which cannot express the thirteen slots `cm-theme.ts` paints.
+ * Authoring the scope map directly is what makes the two surfaces agree.
+ *
+ * Scope → slot follows base16's role vocabulary, the same reasoning as
+ * `cm-theme.ts`: the accent slots have fixed roles rather than fixed hues, so
+ * one mapping stays meaningful across arbitrary imported schemes.
+ *
+ * ONE theme, not a light/dark pair. The `--syntax-*` values already flip with
+ * the app's mode, so a pair would make Pierre resolve the mode a second time
+ * off its own detection and fight the app's. The choice also decides which
+ * `--diffs-*` properties Pierre writes at `:host`: the pair branch emits
+ * `--diffs-light-*`/`--diffs-dark-*`, which SHADOW the `--diffs-*` values
+ * `globals.css` sets and win silently. Under one theme those shadowing
+ * properties are never emitted, so the stylesheet's conflict chrome is what
+ * actually reaches the surface.
+ *
+ * Which is why this theme carries syntax colors and nothing else — see the
+ * `colors` block.
+ *
+ * Note that Shiki replaces every color it resolves with a sentinel hex while
+ * normalizing and maps it back at tokenize time, so the `var(...)` strings are
+ * observable in tokenizer OUTPUT, not on the loaded theme. Assert against
+ * tokens.
+ */
+
+import type { ThemeRegistration } from 'shiki/core';
+
+/** Registered name. Shiki and Pierre both key the theme by this string. */
+export const OK_SYNTAX_THEME_NAME = 'ok-syntax';
+
+export const okSyntaxTheme: ThemeRegistration & { name: string } = {
+ name: OK_SYNTAX_THEME_NAME,
+ // Cosmetic: every color below is a custom property that resolves per mode,
+ // so the declared type never selects a palette. Shiki requires the field.
+ type: 'dark',
+ // Syntax only. Deliberately no `gitDecoration.*`: Pierre expands those into
+ // `--diffs-addition-color` / `--diffs-modified-color`, which fill the whole
+ // current and incoming halves of a merge conflict. Those are chrome, they
+ // are set in `globals.css` beside the rest of the `--diffs-*` block, and
+ // leaving them unset here is what lets that block reach them.
+ colors: {
+ 'editor.foreground': 'var(--foreground)',
+ 'editor.background': 'var(--background)',
+ },
+ tokenColors: [
+ // --- comments + meta ---
+ {
+ scope: ['comment', 'punctuation.definition.comment', 'string.quoted.docstring'],
+ settings: { foreground: 'var(--syntax-comment)', fontStyle: 'italic' },
+ },
+ {
+ scope: ['meta.annotation', 'meta.preprocessor', 'entity.name.function.preprocessor'],
+ settings: { foreground: 'var(--syntax-meta)' },
+ },
+
+ // --- keywords ---
+ {
+ scope: ['keyword', 'storage', 'storage.type', 'storage.modifier', 'variable.language.this'],
+ settings: { foreground: 'var(--syntax-keyword)', fontStyle: 'bold' },
+ },
+
+ // --- names ---
+ {
+ scope: ['entity.name.tag', 'entity.name.tag.yaml'],
+ settings: { foreground: 'var(--syntax-tag)' },
+ },
+ {
+ scope: ['entity.name.type', 'entity.name.class', 'support.type', 'support.class'],
+ settings: { foreground: 'var(--syntax-type)' },
+ },
+ {
+ scope: [
+ 'entity.other.attribute-name',
+ 'meta.property-name',
+ 'support.type.property-name',
+ 'variable.other.property',
+ // Type members and class fields.
+ 'variable.object.property',
+ // Object-literal keys, which the grammar otherwise leaves unstyled —
+ // the widest single gap against source mode, since it shows up in
+ // every object and every JSON-ish block.
+ 'meta.object-literal.key',
+ ],
+ settings: { foreground: 'var(--syntax-attr)' },
+ },
+ {
+ scope: ['variable', 'variable.other', 'meta.definition.variable'],
+ settings: { foreground: 'var(--syntax-var)' },
+ },
+ {
+ scope: ['entity.name.function', 'meta.function-call', 'support.function'],
+ settings: { foreground: 'var(--syntax-func)' },
+ },
+ {
+ // A method DEFINITION, not a call. Lezer tags it `propertyName` — a
+ // method is a property of the class — so source mode paints it in the
+ // attr slot; the descendant selector is what separates it from the
+ // `entity.name.function` rule above, which still owns call sites.
+ scope: 'meta.definition.method entity.name.function',
+ settings: { foreground: 'var(--syntax-attr)' },
+ },
+ {
+ // Superclass position. Lezer reads `extends X` as the value expression
+ // it is in JavaScript and tags it `variableName`.
+ scope: 'entity.other.inherited-class',
+ settings: { foreground: 'var(--syntax-var)' },
+ },
+ {
+ // `const fn = () => {}` — the grammar calls the binding a function,
+ // Lezer calls it the variable it is.
+ scope: 'meta.definition.variable entity.name.function',
+ settings: { foreground: 'var(--syntax-var)' },
+ },
+ {
+ // `=>` is punctuation to Lezer, storage to the grammar.
+ scope: 'storage.type.function.arrow',
+ settings: { foreground: 'var(--syntax-operator)' },
+ },
+ {
+ // Lezer paints a regex literal as one flat token, so the grammar's
+ // finer breakdown (delimiters, quantifiers, flags) has to collapse back
+ // into the same slot or a regex reads as four colors in one surface and
+ // one in the other.
+ // Each selector's LAST element has to out-specify the rule it is
+ // overriding — `string.regexp punctuation` loses to the bare
+ // `punctuation.definition.string` above, which has more dot-parts.
+ scope: [
+ 'string.regexp punctuation.definition.string',
+ 'keyword.operator.quantifier.regexp',
+ 'string.regexp keyword.other',
+ ],
+ settings: { foreground: 'var(--syntax-atom)' },
+ },
+ {
+ scope: 'variable.parameter',
+ settings: { foreground: 'var(--syntax-var)' },
+ },
+
+ // --- literals ---
+ {
+ scope: [
+ 'string',
+ 'string.quoted',
+ 'string.template',
+ 'markup.inline.raw',
+ // CodeMirror paints a string's delimiters with its body; without this
+ // the grammar's `punctuation` rule below would claim the quotes.
+ 'punctuation.definition.string',
+ ],
+ settings: { foreground: 'var(--syntax-string)' },
+ },
+ {
+ scope: ['constant.numeric', 'constant.other.placeholder'],
+ settings: { foreground: 'var(--syntax-number)' },
+ },
+ {
+ scope: [
+ 'constant.language',
+ 'constant.character',
+ 'constant.character.escape',
+ 'string.regexp',
+ // No `variable.other.constant`: TextMate gives every `const` binding
+ // that scope, so claiming it here painted ordinary variables as
+ // literals — where Lezer, and therefore source mode, calls them
+ // variables. Left off, it falls through to `variable.other` below.
+ ],
+ settings: { foreground: 'var(--syntax-atom)' },
+ },
+
+ // --- punctuation ---
+ {
+ scope: ['keyword.operator', 'punctuation', 'meta.brace'],
+ settings: { foreground: 'var(--syntax-operator)' },
+ },
+
+ // --- markdown ---
+ // Kept in step with the markdown block of `cm-theme.ts`: source mode is
+ // the surface a reader most often has open next to one of these.
+ {
+ scope: ['markup.heading', 'entity.name.section'],
+ settings: { foreground: 'var(--syntax-func)', fontStyle: 'bold' },
+ },
+ { scope: 'markup.bold', settings: { foreground: 'var(--foreground)', fontStyle: 'bold' } },
+ { scope: 'markup.italic', settings: { foreground: 'var(--foreground)', fontStyle: 'italic' } },
+ { scope: 'markup.strikethrough', settings: { fontStyle: 'strikethrough' } },
+ {
+ scope: ['markup.underline.link', 'string.other.link'],
+ settings: { foreground: 'var(--link-color)', fontStyle: 'underline' },
+ },
+ {
+ scope: 'markup.quote',
+ settings: { foreground: 'var(--syntax-comment)', fontStyle: 'italic' },
+ },
+ {
+ scope: 'beginning.punctuation.definition.list',
+ settings: { foreground: 'var(--syntax-keyword)' },
+ },
+ // The `#`, backtick and emphasis markers themselves — recessive, so the
+ // content reads before its syntax does.
+ {
+ scope: [
+ 'punctuation.definition.heading',
+ 'punctuation.definition.bold',
+ 'punctuation.definition.italic',
+ 'punctuation.definition.raw',
+ ],
+ settings: { foreground: 'var(--muted-foreground)' },
+ },
+
+ // --- diff + invalid ---
+ {
+ scope: ['markup.inserted', 'punctuation.definition.inserted'],
+ settings: { foreground: 'var(--diff-added)' },
+ },
+ {
+ scope: ['markup.deleted', 'punctuation.definition.deleted'],
+ settings: { foreground: 'var(--diff-removed)' },
+ },
+ {
+ scope: ['markup.changed', 'punctuation.definition.changed'],
+ settings: { foreground: 'var(--syntax-number)' },
+ },
+ { scope: 'invalid', settings: { foreground: 'var(--destructive)' } },
+ ],
+};
diff --git a/packages/app/src/lib/pierre-theme.ts b/packages/app/src/lib/pierre-theme.ts
new file mode 100644
index 000000000..3d44f9f92
--- /dev/null
+++ b/packages/app/src/lib/pierre-theme.ts
@@ -0,0 +1,27 @@
+/**
+ * Registers `okSyntaxTheme` with Pierre and hands back the name to pass as a
+ * `theme` option.
+ *
+ * Every Pierre surface must call this. Left unset, Pierre falls back to
+ * `DEFAULT_THEMES` (`pierre-light`/`pierre-dark`), a bundled brand palette no
+ * app theme can reach — so the diff chrome would track the user's color theme
+ * while the code inside it stayed Pierre-branded.
+ *
+ * Registration is a one-shot side effect on a module-global Pierre registry,
+ * not per-instance state, hence the latch: Pierre logs an error and drops the
+ * second call for a name it already holds.
+ */
+
+import { registerCustomTheme } from '@pierre/diffs';
+import { OK_SYNTAX_THEME_NAME, okSyntaxTheme } from './ok-syntax-theme';
+
+let registered = false;
+
+/** Idempotent. Safe to call during render or from an effect. */
+export function okPierreTheme(): string {
+ if (!registered) {
+ registerCustomTheme(OK_SYNTAX_THEME_NAME, () => Promise.resolve(okSyntaxTheme));
+ registered = true;
+ }
+ return OK_SYNTAX_THEME_NAME;
+}
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index 6699adb58..4b37139df 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -250,6 +250,7 @@
"2XQ8Ww": ["فتح المعاينة عند تحرير الوكيل"],
"2YOwme": ["أُعيد التشغيل — يعمل الآن بالإصدار v", ["appRuntime"], "."],
"2YZwPB": ["لم تطابق استجابة الروابط الصادرة الشكل المتوقع."],
+ "2Yt22K": ["إخفاء الأصل"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["إخفاء اللوحة (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["أدخل رابطًا صالحًا (مثل https://api.openai.com/v1)."],
@@ -412,6 +413,7 @@
"4Sxexw": ["تراجع أو إعادة في المصدر"],
"4TzU0n": ["تهيئة"],
"4Vgtaz": ["تعذّر الوصول إلى اللوحة. قد تكون غير موجودة، أو قد يكون الخادم غير متصل."],
+ "4_-TKi": ["قبول كلتا النسختين للتعارض ", ["0"]],
"4buZWd": ["موروث من ", ["path"]],
"4c_a6S": ["لم يُضبط شيء بعد."],
"4d0VYJ": ["سننشئ معرّف سمة آمنًا من هذا الاسم."],
@@ -436,6 +438,7 @@
"4sUdTJ": ["معاينة بالسمة"],
"4uNLmk": ["يجري السحب"],
"4v2Yyz": ["حدّد كل صفوف شجرة الملفات الظاهرة عندما يكون التركيز في شريط الملفات الجانبي."],
+ "4vn1gP": ["تم حل جميع التعارضات. طبّق التغييرات للحفظ."],
"4xtLTl": ["أُخفي المجلد “", ["basename"], "”"],
"4zGlN_": ["الصق رابط صورة أو انقر «رفع»"],
"4z_1j2": ["معروض"],
@@ -747,20 +750,6 @@
"89TtiD": ["ملف جديد من القالب «", ["displayTitle"], "» (", ["fileName"], ") في جذر المشروع"],
"8AjnFz": ["«", ["0"], "» مستورد بالفعل (محتوى مطابق)."],
"8F1i42": ["الصفحة غير موجودة"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- {
- "zero": ["#", " مقطع غير محلول"],
- "one": ["مقطع واحد غير محلول"],
- "two": ["مقطعان غير محلولَين"],
- "few": ["#", " مقاطع غير محلولة"],
- "many": ["#", " مقطعًا غير محلول"],
- "other": ["#", " مقطع غير محلول"]
- }
- ]
- ],
"8Gzz2G": ["شجرة عمل لـ ", ["worktreeOf"]],
"8HvJlU": [
"توجد مهارة مختلفة بالاسم نفسه في ",
@@ -992,6 +981,7 @@
],
"Aif3E7": ["تفعيل البحث الدلالي"],
"AkA6DO": ["جزء من إضافة ", ["0"], " — للقراءة فقط؛ افتحه لتحرير نسخة"],
+ "Al8HPP": ["قبول النسخة الحالية للتعارض ", ["0"]],
"Am78jY": ["اسحب ", ["keyName"], " لإعادة الترتيب"],
"ApeA0n": ["تم التراجع عن ", ["dropCount"], " تعديل في ", ["docName"]],
"Aq-O0x": ["الحالة"],
@@ -1837,6 +1827,7 @@
["componentName"],
"> ليس مكوّنًا معروفًا. انسخ المصدر لاستخدامه في مكان آخر، أو احذف الكتلة."
],
+ "KhNkCq": ["قبول كليهما"],
"Khxcyu": ["الوصول إلى الطرفية غير مفعّل لهذا المشروع."],
"KjTmeO": ["حدّث OpenKnowledge لفتح هذه المشاركة."],
"KkEAud": ["أنشئ ملفًا من سياق المستند أو المجلد الحالي."],
@@ -1928,7 +1919,6 @@
"LaskKp": ["الإرسال إلى المحادثة (", ["0"], ")"],
"Lbl6KA": ["تعذّر التثبيت من ", ["0"], ": ", ["1"]],
"LbmLyU": ["لا يمكن تحرير إعداد هذه الأداة بأمان"],
- "Lcehxn": ["حفظ الحل"],
"LdABLa": ["تعذّر فتح ", ["target"], ". حاول فتحه يدويًا."],
"LdKIHS": ["صُغ مواصفات"],
"LeGeTf": ["OpenKnowledge على GitHub"],
@@ -1941,6 +1931,7 @@
],
"LhWYpm": ["تُتتبَّع مسارات OK الأخرى في المستودع البعيد:"],
"Li4U-T": ["اعرف المزيد عن ", ["title"]],
+ "LkQRL8": ["إظهار الأصل"],
"LlHqdU": ["تجري تهيئة المشروع"],
"LlJ8LD": [
"لم تتغيّر مشاركة الإعدادات: يجري تتبّع ",
@@ -2131,6 +2122,7 @@
"Ni4b7h": [
"إضافات المشروع هي معيار التأليف لمشروعك — شغّلها أو أوقفها هنا. تحصل كل إضافة مفعّلة على صفحتها الخاصة تحت «الإضافات» في الشريط الجانبي للإعدادات."
],
+ "NjnHNV": ["قبول النسخة الواردة للتعارض ", ["0"]],
"NjrIak": ["الملف: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["تحرير ", ["tag"]],
"NkXEFS": ["فشلت الاستعادة — لم يتغير المستند"],
@@ -2140,6 +2132,7 @@
"NnQapF": ["الفتح بالذكاء الاصطناعي ", ["targetDisplayName"]],
"NoY1k4": ["بنية استجابة الخادم غير صالحة"],
"NpC29w": ["أنشئ عنصر قائمة جديدًا من عنصر القائمة الحالي."],
+ "NpRLRj": ["تراجع عن عمليات الحل لتغيير هذا."],
"NrFwux": ["فشل حفظ قواعد المحتوى — ", ["0"]],
"Ns0z5o": [
"عند تثبيتك مهارة منشورة، أخبر دليل المهارات (skills.sh) ليكون عدد تثبيتاتها دقيقًا. يُرسل اسم المهارة ومستودعها المصدر وأدوات الوكلاء التي ذهبت إليها — ولا تُرسل محتويات الملفات أبدًا، ولا يُرسل شيء لمهارة من مصدر خاص أو محلي أو مكتوب يدويًا. مرة واحدة لكل مهارة على كل جهاز."
@@ -2192,6 +2185,7 @@
"OLBz-_": ["فشل عرض مخطط Mermaid."],
"OLIKgw": ["اسحب العنصر ", ["0"], " لإعادة الترتيب"],
"ONPvOb": ["يجري تحميل نشاط الوكيل"],
+ "ONUgxB": ["هذا التعارض لم يعد متاحًا."],
"ONWvwQ": ["رفع"],
"ONchxy": ["الإجمالي"],
"ONgEZF": ["يجري تحميل عناوين ", ["pageTarget"]],
@@ -2273,6 +2267,7 @@
"PVSwOe": ["إعادة توجيه — في انتظار توقّف التشغيل الحالي…"],
"PVUn_c": ["فتح مجلد"],
"PVggyD": ["مخططات frontmatter"],
+ "PWh9Ii": ["تطبيق التغييرات"],
"PWqtgd": ["جارٍ تحميل المحادثة"],
"PXaT32": ["أعاد الخادم استجابة وجهات المهارات غير مكتملة."],
"PYmp-0": ["استيراد كقالب"],
@@ -2354,6 +2349,7 @@
"QQbwzK": ["لا يوجد وكلاء متاحون."],
"QQghPu": ["التثبيت في Claude Desktop"],
"QR5SP1": ["أنشأ قالبًا"],
+ "QVk3SK": ["تم حذف هذا الملف على الفرع الوارد (تعارض تعديل/حذف)."],
"QWdKwH": ["نقل"],
"QYTOaN": ["يمكنك تغيير هذا لاحقًا من <0>الإعدادات ← المزامنة</0>."],
"QYfQdv": ["واجهة ", ["displayName"], " السطرية"],
@@ -2790,6 +2786,7 @@
],
"VIwCaD": ["مدخل"],
"VJaBca": ["اختر مجلد مهارة"],
+ "VL6VsE": ["قبول الحالي"],
"VM7H66": ["هذا الملف ثنائي ولا يمكن عرضه كنص."],
"VMlRqi": ["إخفاء التفاصيل"],
"VNNRfN": ["جعله المصدر"],
@@ -3061,7 +3058,7 @@
"تعذّرت إعادة تشغيل الخادم — عملية أخرى تملكه. أغلق نوافذ OpenKnowledge الأخرى لهذا المشروع، ثم أعد المحاولة."
],
"Xv_ijG": ["https://github.com/owner/repo أو owner/repo"],
- "XyOUTJ": ["إنهاء الدمج"],
+ "XzL7x7": ["أعد فتح ", ["filePath"], " لمواصلة التحرير."],
"Xzy0s0": ["إزالة ", ["fullLabel"], " من السياق"],
"Y-Urt2": ["معادلة رياضية بكتلة مستقلة تُعرض بواسطة KaTeX من نص مصدري بصيغة LaTeX."],
"Y1QMlM": ["ابدأ الإعداد"],
@@ -3103,6 +3100,7 @@
"YSFv5w": ["لا يوجد مستودع git — لا تنطبق مشاركة الإعدادات هنا."],
"YTLmTM": ["إزالة مجلد <0>.git</0> الأب"],
"YW7Q86": ["لم تُحمَّل إعدادات البحث بعد — أعد المحاولة بعد قليل"],
+ "YWK2zy": ["فروق التعارض في ", ["fileName"]],
"Y_GpJd": ["انتهت مهلة طلب تنزيل ", ["0"], "."],
"Y_ZQ6l": ["يجري تثبيت ", ["agentName"], "…"],
"Y_iImT": ["تعذّر حل الملف ", ["identity"], ". انتقل إلى المرجع."],
@@ -3289,6 +3287,7 @@
"اخترت مجلدك الرئيسي. سيفهرس OpenKnowledge كل ما في شجرة مجلدك الرئيسي — وهو كبير وقد يُظهر ملفات شخصية."
],
"_SDGzH": ["المتابعة في المتصفح"],
+ "_SkqfM": ["قبول الوارد"],
"_TDESN": ["خطأ في الشبكة - لا يزال ", ["kind"], " «", ["createdPath"], "» موجودًا على القرص"],
"_TF8ep": ["فشل عرض ملف PDF"],
"_W-elG": ["(مضمَّن)"],
@@ -3831,7 +3830,6 @@
}
]
],
- "g3UF2V": ["قبول"],
"g4WlQK": [
"إدارة أدوات الذكاء الاصطناعي للمشروع متاحة فقط في تطبيق OpenKnowledge لسطح المكتب."
],
@@ -3850,6 +3848,7 @@
],
"g9Nj4l": ["// ملاحظة"],
"gAhHu7": ["ينطبق الإصلاح التلقائي فقط على المشكلات التي لها إصلاح آلي معروف."],
+ "gBCeDq": ["لا يوجد سلف مشترك — أضاف كلا الفرعين هذا الملف (تعارض إضافة/إضافة)."],
"gBbxn_": ["يجري التحقق من حالة تسجيل الدخول"],
"gDkNHk": ["هل تريد بالتأكيد حذف ‏«", ["name"], "»؟"],
"gGVP4q": ["انقر <0>+</0> <1/> <2>إنشاء مهارة</2> <3/> <4>رفع مهارة</4>."],
@@ -3939,6 +3938,7 @@
"احتفظ بسجل مكتوب لكيفية بناء منتجك. موطن لاقتراح الأفكار وتدوين القرارات وكتابة المواصفات وتسجيل ما تعلمته بعد أي عطل."
],
"hCattk": ["استورد OpenKnowledge ", ["source"]],
+ "hCghAK": ["تم حل هذا التعارض."],
"hDEaQu": ["اربط OpenKnowledge بالأدوات الأخرى التي تستخدمها."],
"hDKtoF": ["قبل ", ["diffHrs"], " ساعة"],
"hDoLrm": ["إزالة ", ["projectName"], " من المشاريع الحديثة"],
@@ -4148,6 +4148,7 @@
"jSY41h": ["استغرق «", ["docName"], "» وقتًا طويلًا. تحقق من اتصالك."],
"jTLWxh": ["ضمّن صفحة خارجية في إطار مضمَّن (مستندات، عروض، Figma، CodeSandbox)."],
"jTUxaN": ["تفعيل تلقائي (سحب فقط)"],
+ "jTdrn1": ["تعذر التحقق مما إذا كان ", ["filePath"], " لا يزال متعارضًا — تجري إعادة المحاولة."],
"jWzDfC": ["جارٍ التحقق من أدوات الذكاء الاصطناعي المتوفّرة لديك"],
"jZ_E5M": ["فشل الجلب — راجع سجلات الخادم للتفاصيل."],
"j_Z6g7": ["الافتراضي المشترك"],
@@ -4342,7 +4343,6 @@
"مسار داخل المهارة — أي مجلد يصلح (مثل references/notes.md). تُنشأ المجلدات الواردة في المسار نيابةً عنك."
],
"lPkjpD": ["تم الدفع ", ["pushed"]],
- "lPzyrU": ["تم حل كل المقاطع"],
"lS83Sg": ["تعذّر الوصول إلى الحافظة."],
"lScd1O": ["تُفتح شرائح Slidev في تطبيق OpenKnowledge لسطح المكتب فقط."],
"lT6wjt": ["توسيع اللوحة"],
@@ -4436,6 +4436,7 @@
"نظّم مواصفاتي الحالية في فهرس مترابط مجمَّع حسب المجال، وأشِر إلى أي منها انحرف عن الكود الحالي."
],
"mPzgTS": ["فتح ", ["docName"]],
+ "mR3uQg": ["تم حذف هذا الملف على الفرع الحالي (تعارض حذف/تعديل)."],
"mToVM9": ["راسل ", ["agentName"]],
"mU3j1b": ["إزالة العنصر ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (تعارض)"],
@@ -4722,6 +4723,9 @@
" لأنه يحتوي على مجلد ‎.git"
],
"pZAs1T": ["فشل تحميل الروابط الصادرة"],
+ "pZaMLc": [
+ "يحتوي هذا الملف على أسطر تبدو كعلامات تعارض، لذا لا يمكن قراءة حدود التعارض بشكل موثوق. قم بحله يدويًا أو باستخدام اسأل الذكاء الاصطناعي."
+ ],
"paCw0z": ["كل ما تحت مجلدات ", ["0"], "/ داخل ", ["1"], "/"],
"pajIrl": ["تعذّر إيقاف الطرفية: ", ["0"]],
"pbwTg6": ["قبل ", ["seconds"], " ثانية"],
@@ -5384,6 +5388,7 @@
"wU8WyK": ["حقول العنصر"],
"wVa83H": ["تعذّر إنشاء التقرير"],
"wWtVYd": ["أدخل منفذًا بين 1 و65535."],
+ "wXFalZ": ["معاينة ", ["filename"]],
"wXO4Tg": ["قبل ", ["hrs"], " ساعة"],
"wXw19Y": ["أُزيل «", ["projectName"], "» من المشاريع الحديثة. لم يعد مجلده موجودًا."],
"wZPUJx": ["«", ["0"], "»"],
@@ -5505,6 +5510,7 @@
"y46m5r": ["تطبيق سطح المكتب لا يستجيب. حدّث وأعد المحاولة."],
"y5FUYi": ["قائمة الاقتراحات مفتوحة"],
"y5UgU8": ["تعطيل ", ["0"]],
+ "y6HGwM": ["التعارضات المتبقية: ", ["liveRemaining"], "."],
"y8B54M": ["تعذّر إرسال موجّهك — يرجى المحاولة مرة أخرى."],
"yCX4jp": [" تعذّرت استعادة تحديدك."],
"yDlK9k": ["احسم التعارض في ", ["files"], " قبل الحذف."],
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index c7369c9b0..d6dabe99c 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} موجود خارج هذا المشروع، في <0>{source}<
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, zero {حرف} one {حرف} two {حرفان} few {أحرف} many {حرفًا} other {حرف}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, zero {# مقطع غير محلول} one {مقطع واحد غير محلول} two {مقطعان غير محلولَين} few {# مقاطع غير محلولة} many {# مقطعًا غير محلول} other {# مقطع غير محلول}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (فارغ)"
@@ -1331,9 +1327,32 @@ msgstr "حول {appName}"
msgid "Above"
msgstr "أعلى"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "قبول"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "قبول كليهما"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "قبول كلتا النسختين للتعارض {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "قبول الحالي"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "قبول النسخة الحالية للتعارض {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "قبول الوارد"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "قبول النسخة الواردة للتعارض {0}"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "تمت مواءمة {editor} مع المصدر (نُسخت بايتات
msgid "All"
msgstr "الكل"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "تم حل جميع التعارضات. طبّق التغييرات للحفظ."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "كل الملفات"
@@ -1679,10 +1702,6 @@ msgstr "كل الملفات"
msgid "All files are hidden by view filters."
msgstr "كل الملفات مخفية بمرشحات العرض."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "تم حل كل المقاطع"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "كل الوسوم"
@@ -1842,6 +1861,10 @@ msgstr "يسري عند استئناف هذه المحادثة"
msgid "Apply and restart project server"
msgstr "تطبيق وإعادة تشغيل خادم المشروع"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "تطبيق التغييرات"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "تطبيق الرابط"
@@ -3128,6 +3151,10 @@ msgstr "تعارض"
msgid "Conflict"
msgstr "تعارض"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "فروق التعارض في {fileName}"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "الملفات المتعارضة"
@@ -3141,6 +3168,10 @@ msgstr "الملفات المتعارضة: {0}."
msgid "Conflicts"
msgstr "التعارضات"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "التعارضات المتبقية: {liveRemaining}."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "اتصال"
@@ -3632,6 +3663,10 @@ msgstr "تعذّرت إضافة ذلك التعليق."
msgid "Couldn't apply the change: {0}"
msgstr "تعذّر تطبيق التغيير: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "تعذر التحقق مما إذا كان {filePath} لا يزال متعارضًا — تجري إعادة المحاولة."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "تعذّر مسح المفتاح — يرجى المحاولة مرة أخرى."
@@ -5447,10 +5482,6 @@ msgstr "خروج"
msgid "exit {0}"
msgstr "خروج {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "إنهاء الدمج"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "إخفاء المجلد"
msgid "Hide HTML preview"
msgstr "إخفاء معاينة HTML"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "إخفاء الأصل"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "إخفاء الآخرين"
@@ -8559,6 +8594,10 @@ msgstr "لا توجد تعليقات في هذا المشروع بعد. علّق
msgid "No comments yet. Select text in the document to add one."
msgstr "لا توجد تعليقات بعد. حدد نصًا في المستند لإضافة واحد."
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "لا يوجد سلف مشترك — أضاف كلا الفرعين هذا الملف (تعارض إضافة/إضافة)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "لا تغييرات في المحتوى في هذه النسخة."
@@ -10151,6 +10190,10 @@ msgstr "اضغط على الشمس أو القمر بجوار «مخصص» أع
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "لا تستطيع متصفحات المعاينة النسخ تلقائيًا. استخدم Cmd/Ctrl+C على الرابط أعلاه، أو افتح OK في تطبيق سطح المكتب."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "معاينة {filename}"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "معاينة لقطة الشاشة"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "سلة المحذوفات"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "إعادة"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "يجري إعادة التثبيت"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "رفض"
@@ -10854,6 +10897,10 @@ msgstr "معروض"
msgid "Reopen"
msgstr "إعادة فتح"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "أعد فتح {filePath} لمواصلة التحرير."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "إعادة فتح محادثة سابقة"
@@ -11331,10 +11378,6 @@ msgstr "فشل الحفظ: {error}"
msgid "Save queued message"
msgstr "حفظ الرسالة المنتظرة"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "حفظ الحل"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "حفظ هذا التعليق (Enter)"
@@ -12095,6 +12138,10 @@ msgstr "إظهار الملفات أو إخفاؤها"
msgid "Show or hide Terminal"
msgstr "إظهار Terminal أو إخفاؤه"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "إظهار الأصل"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "شكرًا على التقرير!"
msgid "That branch is already open in another worktree."
msgstr "ذلك الفرع مفتوح بالفعل في شجرة عمل أخرى."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "هذا التعارض لم يعد متاحًا."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "لم تكتمل العملية. راجع سجلات الخادم ثم أعد المحاولة."
@@ -13570,6 +13621,10 @@ msgstr "يمكن ضبط هذا في الإعدادات > أدوات الذكاء
msgid "This comment is on the whole property"
msgstr "هذا التعليق على الخاصية بأكملها"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "تم حل هذا التعارض."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "هذا المستند"
@@ -13610,6 +13665,10 @@ msgstr "يحمل هذا الحقل كلمات مفتاحية إضافية في
msgid "This file can't be opened in the text editor."
msgstr "لا يمكن فتح هذا الملف في محرر النصوص."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "يحتوي هذا الملف على أسطر تبدو كعلامات تعارض، لذا لا يمكن قراءة حدود التعارض بشكل موثوق. قم بحله يدويًا أو باستخدام اسأل الذكاء الاصطناعي."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "تعذّر العثور على هذا الملف."
@@ -13622,6 +13681,14 @@ msgstr "هذا الملف ثنائي ولا يمكن عرضه كنص."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "هذا الملف أكبر من أن يُفتح في محرر النصوص المدمج (الحد 1 ميغابايت). استخدم «فتح ملف» أدناه لفتحه في تطبيق آخر."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "تم حذف هذا الملف على الفرع الحالي (تعارض حذف/تعديل)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "تم حذف هذا الملف على الفرع الوارد (تعارض تعديل/حذف)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "لا يحتوي هذا المجلد على مستودع git. هل تختار مجلدًا آخر؟"
@@ -14202,7 +14269,7 @@ msgstr "تم التراجع عن آخر تعديل في {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "تراجع عن تعديلاتك أنت أو أعدها، مع إبقا
msgid "Undo to this edit?"
msgstr "هل تتراجع إلى هذا التعديل؟"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "تراجع عن عمليات الحل لتغيير هذا."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "تراجع أو أعِد أو تنقّل بين تغييرات التحديد في لوحة «تحرير المصدر» أو في حقل خاصية على هيئة كود."
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index bfe2ef3dc..5155a463f 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -227,6 +227,7 @@
"2XQ8Ww": ["এজেন্ট সম্পাদনা করলে প্রাকদর্শন খুলুন"],
"2YOwme": ["পুনরায় চালু হয়েছে — এখন v", ["appRuntime"], " চলছে।"],
"2YZwPB": ["বহির্গামী লিংকের সাড়া প্রত্যাশিত আকারের সঙ্গে মেলেনি।"],
+ "2Yt22K": ["মূল সংস্করণ লুকান"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["প্যানেল লুকান (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["একটি বৈধ URL দিন (উদাহরণস্বরূপ https://api.openai.com/v1)।"],
@@ -360,6 +361,7 @@
"4Sxexw": ["সোর্সে পূর্বাবস্থা বা পুনরায়"],
"4TzU0n": ["চালু করুন"],
"4Vgtaz": ["বোর্ডে পৌঁছানো যায়নি। এটি হয়তো নেই, অথবা সার্ভার অফলাইন হতে পারে।"],
+ "4_-TKi": ["কনফ্লিক্ট ", ["0"], "-এর জন্য উভয় সংস্করণ গ্রহণ করুন"],
"4buZWd": [["path"], " থেকে উত্তরাধিকারসূত্রে পাওয়া"],
"4c_a6S": ["এখনও কিছুই নির্ধারিত হয়নি।"],
"4d0VYJ": ["এই নাম থেকে আমরা একটি নিরাপদ থিম আইডি তৈরি করব।"],
@@ -384,6 +386,7 @@
"4sUdTJ": ["থিমযুক্ত প্রাকদর্শন"],
"4uNLmk": ["টানা হচ্ছে"],
"4v2Yyz": ["ফোকাস Files সাইডবারে থাকলে দৃশ্যমান প্রতিটি ফাইল-ট্রি সারি নির্বাচন করুন।"],
+ "4vn1gP": ["সব কনফ্লিক্ট সমাধান হয়েছে। সংরক্ষণ করতে পরিবর্তন প্রয়োগ করুন।"],
"4xtLTl": ["লুকানো ফোল্ডার “", ["basename"], "”"],
"4zGlN_": ["ছবির URL পেস্ট করুন বা আপলোডে ক্লিক করুন"],
"4z_1j2": ["রেন্ডার করা"],
@@ -630,13 +633,6 @@
"89TtiD": ["প্রকল্পের রুটে টেমপ্লেট \"", ["displayTitle"], "\" (", ["fileName"], ") থেকে নতুন ফাইল"],
"8AjnFz": ["\"", ["0"], "\" আগেই আমদানি করা হয়েছিল (একই বিষয়বস্তু)।"],
"8F1i42": ["পাতা পাওয়া যায়নি"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- { "one": ["#", " অমীমাংসিত হাংক"], "other": ["#", " অমীমাংসিত হাংক"] }
- ]
- ],
"8Gzz2G": [["worktreeOf"], "-এর ওয়ার্কট্রি"],
"8HvJlU": [
"এর মতো নামের একটি ভিন্ন স্কিল ",
@@ -845,6 +841,7 @@
],
"Aif3E7": ["অর্থভিত্তিক অনুসন্ধান চালু করুন"],
"AkA6DO": [["0"], " প্লাগইনের অংশ — শুধু পড়ার জন্য; একটি অনুলিপি সম্পাদনা করতে এটি খুলুন"],
+ "Al8HPP": ["কনফ্লিক্ট ", ["0"], "-এর জন্য বর্তমান সংস্করণ গ্রহণ করুন"],
"Am78jY": ["ক্রম বদলাতে ", ["keyName"], " টেনে আনুন"],
"ApeA0n": [["docName"], "-এর ", ["dropCount"], "টি সম্পাদনা পূর্বাবস্থায় ফেরানো হয়েছে"],
"Aq-O0x": ["অবস্থা"],
@@ -1568,6 +1565,7 @@
["componentName"],
"> একটি পরিচিত কম্পোনেন্ট নয়। অন্যত্র ব্যবহার করতে সোর্স কপি করুন, নয়তো ব্লকটি মুছে দিন।"
],
+ "KhNkCq": ["দুটোই গ্রহণ করুন"],
"Khxcyu": ["এই প্রকল্পের জন্য টার্মিনালে প্রবেশ চালু নেই।"],
"KjTmeO": ["এই শেয়ার করা জিনিসটি খুলতে OpenKnowledge আপডেট করুন।"],
"KkEAud": ["বর্তমান নথি বা ফোল্ডারের প্রসঙ্গ থেকে একটি ফাইল তৈরি করুন।"],
@@ -1640,7 +1638,6 @@
"LaskKp": ["আলাপে পাঠান (", ["0"], ")"],
"Lbl6KA": [["0"], " থেকে ইনস্টল করা যায়নি: ", ["1"]],
"LbmLyU": ["এই টুলের কনফিগ নিরাপদে সম্পাদনা করা যাচ্ছে না"],
- "Lcehxn": ["মীমাংসা সংরক্ষণ করুন"],
"LdABLa": [["target"], " খোলা যায়নি। হাতে খুলে দেখুন।"],
"LdKIHS": ["একটি স্পেকের খসড়া করুন"],
"LeGeTf": ["GitHub-এ OpenKnowledge"],
@@ -1653,6 +1650,7 @@
],
"LhWYpm": ["অন্য OK পথগুলো আপস্ট্রিমে হিসাবভুক্ত:"],
"Li4U-T": [["title"], " সম্পর্কে আরও জানুন"],
+ "LkQRL8": ["মূল সংস্করণ দেখান"],
"LlHqdU": ["প্রকল্প চালু করা হচ্ছে"],
"LlJ8LD": [
"কনফিগ শেয়ারিং অপরিবর্তিত: আপস্ট্রিমে ",
@@ -1807,6 +1805,7 @@
"Ni4b7h": [
"প্রকল্প প্লাগইন হলো আপনার প্রকল্পের রচনা-মান — সেগুলো এখানে চালু বা বন্ধ করুন। চালু করা প্রতিটি প্লাগইন সেটিং সাইডবারে Plugins-এর নিচে নিজের পাতা পায়।"
],
+ "NjnHNV": ["কনফ্লিক্ট ", ["0"], "-এর জন্য আগত সংস্করণ গ্রহণ করুন"],
"NjrIak": ["ফাইল: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": [["tag"], " সম্পাদনা করুন"],
"NkXEFS": ["ফিরিয়ে আনা ব্যর্থ — নথি অপরিবর্তিত"],
@@ -1816,6 +1815,7 @@
"NnQapF": ["AI ", ["targetDisplayName"], " দিয়ে খুলুন"],
"NoY1k4": ["সার্ভারের প্রতিক্রিয়ার গঠন অবৈধ"],
"NpC29w": ["বর্তমান তালিকা আইটেম থেকে একটি নতুন তালিকা আইটেম তৈরি করুন।"],
+ "NpRLRj": ["এটি পরিবর্তন করতে আপনার সমাধানগুলি পূর্বাবস্থায় ফেরান।"],
"NrFwux": ["বিষয়বস্তুর নিয়ম সংরক্ষণ করতে ব্যর্থ — ", ["0"]],
"Ns0z5o": [
"আপনি কোনো প্রকাশিত স্কিল ইনস্টল করলে স্কিল ডিরেক্টরিকে (skills.sh) জানান যাতে তার ইনস্টল সংখ্যা সঠিক থাকে। এটি স্কিলের নাম, তার উৎস রিপোজিটরি, এবং সেটি কোন এজেন্ট টুলে গেছে তা পাঠায় — ফাইলের বিষয়বস্তু কখনও নয়, এবং কোনো ব্যক্তিগত, স্থানীয় বা হাতে লেখা উৎসের স্কিলের জন্য কখনও নয়। প্রতি মেশিনে প্রতি স্কিলের জন্য একবার।"
@@ -1870,6 +1870,7 @@
"OLBz-_": ["Mermaid চিত্র রেন্ডার করা যায়নি।"],
"OLIKgw": ["ক্রম বদলাতে আইটেম ", ["0"], " টেনে আনুন"],
"ONPvOb": ["এজেন্ট কার্যকলাপ লোড হচ্ছে"],
+ "ONUgxB": ["সেই কনফ্লিক্টটি আর উপলব্ধ নেই।"],
"ONWvwQ": ["আপলোড করুন"],
"ONchxy": ["মোট"],
"ONgEZF": [["pageTarget"], "-এর শিরোনাম লোড হচ্ছে"],
@@ -1953,6 +1954,7 @@
"PVSwOe": ["দিক পরিবর্তন করা হচ্ছে — বর্তমান কাজ থামার অপেক্ষায়…"],
"PVUn_c": ["ফোল্ডার খুলুন"],
"PVggyD": ["Frontmatter স্কিমা"],
+ "PWh9Ii": ["পরিবর্তন প্রয়োগ করুন"],
"PWqtgd": ["চ্যাট লোড হচ্ছে"],
"PXaT32": ["সার্ভার একটি অসম্পূর্ণ স্কিল-টার্গেট প্রতিক্রিয়া ফেরত দিয়েছে।"],
"PYmp-0": ["টেমপ্লেট হিসেবে আমদানি করুন"],
@@ -2033,6 +2035,7 @@
"QQbwzK": ["কোনো এজেন্ট নেই।"],
"QQghPu": ["Claude Desktop-এ ইনস্টল করুন"],
"QR5SP1": ["টেমপ্লেট তৈরি হয়েছে"],
+ "QVk3SK": ["এই ফাইলটি আগত ব্রাঞ্চে মুছে ফেলা হয়েছে (modify-delete দ্বন্দ্ব)।"],
"QWdKwH": ["সরান"],
"QYTOaN": ["আপনি এটি পরে <0>Settings → Sync</0>-এ বদলাতে পারেন।"],
"QYfQdv": [["displayName"], " CLI"],
@@ -2395,6 +2398,7 @@
],
"VIwCaD": ["এন্ট্রি"],
"VJaBca": ["একটি স্কিল ফোল্ডার বাছুন"],
+ "VL6VsE": ["বর্তমানটি গ্রহণ করুন"],
"VM7H66": ["এই ফাইলটি বাইনারি এবং লেখা হিসেবে দেখানো যায় না।"],
"VMlRqi": ["বিবরণ লুকান"],
"VNNRfN": ["উৎস বানান"],
@@ -2598,7 +2602,7 @@
"সার্ভার পুনরায় চালু করা যায়নি — অন্য একটি প্রক্রিয়া এর মালিক। এই প্রকল্পের অন্য OpenKnowledge জানালাগুলো বন্ধ করে আবার চেষ্টা করুন।"
],
"Xv_ijG": ["https://github.com/owner/repo বা owner/repo"],
- "XyOUTJ": ["মার্জ থেকে বেরিয়ে যান"],
+ "XzL7x7": ["সম্পাদনা চালিয়ে যেতে ", ["filePath"], " আবার খুলুন।"],
"Xzy0s0": [["fullLabel"], " প্রসঙ্গ থেকে সরান"],
"Y-Urt2": ["একটি LaTeX সোর্স স্ট্রিং থেকে KaTeX দিয়ে রেন্ডার করা ব্লক গাণিতিক সমীকরণ।"],
"Y1QMlM": ["সেট আপ করুন"],
@@ -2640,6 +2644,7 @@
"YSFv5w": ["কোনো git রিপোজিটরি নেই — কনফিগ ভাগাভাগি এখানে প্রযোজ্য নয়।"],
"YTLmTM": ["মূল <0>.git</0> ফোল্ডারটি সরান"],
"YW7Q86": ["অনুসন্ধানের সেটিং এখনও লোড হয়নি — একটু পরে আবার চেষ্টা করুন"],
+ "YWK2zy": [["fileName"], "-এর কনফ্লিক্ট ডিফ"],
"Y_GpJd": [["0"], "-এর ডাউনলোড অনুরোধের সময় শেষ হয়ে গেছে।"],
"Y_ZQ6l": [["agentName"], " ইনস্টল করা হচ্ছে…"],
"Y_iImT": ["সমাধান করা যায় না এমন ফাইল ", ["identity"], "। রেফারেন্সে যান।"],
@@ -2812,6 +2817,7 @@
"আপনি আপনার হোম ডিরেক্টরি বেছেছেন। OpenKnowledge আপনার পুরো হোম বৃক্ষের সবকিছু সূচিভুক্ত করবে — এটি বড় এবং এতে ব্যক্তিগত ফাইল সামনে আসতে পারে।"
],
"_SDGzH": ["ব্রাউজারে চালিয়ে যান"],
+ "_SkqfM": ["আগতটি গ্রহণ করুন"],
"_TDESN": ["নেটওয়ার্ক ত্রুটি - ", ["kind"], " \"", ["createdPath"], "\" এখনও ডিস্কে আছে"],
"_TF8ep": ["PDF রেন্ডার করতে ব্যর্থ"],
"_W-elG": ["(ইনলাইন)"],
@@ -3247,7 +3253,6 @@
}
]
],
- "g3UF2V": ["গ্রহণ করুন"],
"g4WlQK": ["প্রকল্পের AI টুল সামলানো কেবল OpenKnowledge ডেস্কটপ অ্যাপেই আছে।"],
"g4XBm0": ["ছোট বিভাগ শিরোনাম।"],
"g4e0hS": [["agentName"], "-কে জিজ্ঞেস করুন"],
@@ -3263,6 +3268,7 @@
],
"g9Nj4l": ["// নোট"],
"gAhHu7": ["স্বয়ংক্রিয় সংশোধন কেবল সেই সমস্যাগুলোর ক্ষেত্রেই প্রযোজ্য যাদের পরিচিত যান্ত্রিক সমাধান আছে।"],
+ "gBCeDq": ["কোনও সাধারণ পূর্বসূরি নেই — উভয় ব্রাঞ্চ এই ফাইলটি যোগ করেছে (add/add দ্বন্দ্ব)।"],
"gBbxn_": ["সাইন-ইন অবস্থা পরীক্ষা করা হচ্ছে"],
"gDkNHk": ["আপনি কি নিশ্চিত যে আপনি \"", ["name"], "\" মুছে ফেলতে চান?"],
"gGVP4q": ["<0>+</0> <1/> <2>স্কিল তৈরি করুন</2> <3/> <4>স্কিল আপলোড করুন</4>-এ ক্লিক করুন।"],
@@ -3339,6 +3345,7 @@
"আপনার পণ্য কীভাবে তৈরি হয় তার লিখিত হিসাব রাখুন। ধারণা প্রস্তাব করা, সিদ্ধান্ত নথিভুক্ত করা, স্পেক লেখা এবং কিছু ভেঙে যাওয়ার পর যা শিখলেন তা ধরে রাখার একটি ঘর।"
],
"hCattk": ["OpenKnowledge ", ["source"], " আমদানি করেছে"],
+ "hCghAK": ["এই দ্বন্দ্বটি সমাধান হয়েছে।"],
"hDEaQu": ["OpenKnowledge-কে আপনার ব্যবহৃত অন্য টুলের সঙ্গে যুক্ত করুন।"],
"hDKtoF": [["diffHrs"], " ঘণ্টা আগে"],
"hDoLrm": [["projectName"], " সাম্প্রতিক প্রকল্প থেকে সরান"],
@@ -3547,6 +3554,7 @@
"jSY41h": ["\"", ["docName"], "\" খুব বেশি সময় নিয়েছে। আপনার সংযোগ দেখুন।"],
"jTLWxh": ["একটি বাইরের পাতা ইনলাইন iframe-এ এমবেড করুন (নথি, ডেমো, Figma, CodeSandbox)।"],
"jTUxaN": ["স্বয়ংক্রিয় (শুধু টানুন) চালু করুন"],
+ "jTdrn1": [["filePath"], "-এ এখনও কনফ্লিক্ট আছে কি না যাচাই করা যায়নি — আবার চেষ্টা করা হচ্ছে।"],
"jWzDfC": ["আপনার কোন AI টুল আছে তা যাচাই করা হচ্ছে"],
"jZ_E5M": ["আনা ব্যর্থ — বিস্তারিত জানতে সার্ভার লগ দেখুন।"],
"j_Z6g7": ["ভাগ করা ডিফল্ট"],
@@ -3737,7 +3745,6 @@
"স্কিলের ভেতরের একটি পথ — যেকোনো ফোল্ডার চলে (যেমন references/notes.md)। পথের ফোল্ডারগুলো আপনার জন্য তৈরি করে দেওয়া হয়।"
],
"lPkjpD": [["pushed"], " পাঠানো হয়েছে"],
- "lPzyrU": ["সব হাংক মীমাংসিত"],
"lS83Sg": ["ক্লিপবোর্ডে পৌঁছানো যায়নি।"],
"lScd1O": ["Slidev ডেক শুধু OpenKnowledge ডেস্কটপ অ্যাপে খোলে।"],
"lT6wjt": ["বোর্ড মেলে ধরুন"],
@@ -3813,6 +3820,7 @@
"আমার বিদ্যমান স্পেকগুলো এলাকা অনুযায়ী গোষ্ঠীবদ্ধ একটি যুক্ত সূচিতে সাজান, এবং যেগুলো বর্তমান কোডের সঙ্গে মিল হারিয়েছে সেগুলো চিহ্নিত করুন।"
],
"mPzgTS": [["docName"], " খুলুন"],
+ "mR3uQg": ["এই ফাইলটি বর্তমান ব্রাঞ্চে মুছে ফেলা হয়েছে (delete-modify দ্বন্দ্ব)।"],
"mToVM9": [["agentName"], "-কে বার্তা পাঠান"],
"mU3j1b": ["আইটেম ", ["0"], " সরান"],
"mVFyH-": [["accessibleLabel"], " (দ্বন্দ্ব)"],
@@ -4063,6 +4071,9 @@
"-এর উপরের ফোল্ডারটি খোলা হয়েছে, কারণ সেখানে একটি .git ফোল্ডার আছে"
],
"pZAs1T": ["বহির্গামী লিংক লোড করতে ব্যর্থ"],
+ "pZaMLc": [
+ "এই ফাইলে এমন লাইন রয়েছে যা কনফ্লিক্ট মার্কারের মতো দেখায়, তাই কনফ্লিক্টের সীমা নির্ভরযোগ্যভাবে পড়া যাচ্ছে না। এটি নিজে সমাধান করুন বা AI-কে জিজ্ঞেস করুন ব্যবহার করুন।"
+ ],
"paCw0z": [["1"], "/-এর ভেতরের ", ["0"], "/ ফোল্ডারগুলোর নিচের সবকিছু"],
"pajIrl": ["টার্মিনাল বন্ধ করা যায়নি: ", ["0"]],
"pbwTg6": [["seconds"], " সেকেন্ড আগে"],
@@ -4596,6 +4607,7 @@
"wU8WyK": ["উপাদান ফিল্ড"],
"wVa83H": ["রিপোর্ট তৈরি করা যায়নি"],
"wWtVYd": ["১ থেকে ৬৫৫৩৫-এর মধ্যে একটি পোর্ট লিখুন।"],
+ "wXFalZ": [["filename"], "-এর প্রিভিউ"],
"wXO4Tg": [["hrs"], " ঘণ্টা আগে"],
"wXw19Y": ["\"", ["projectName"], "\"-কে সাম্প্রতিক প্রকল্প থেকে সরানো হয়েছে। এর ফোল্ডারটি আর নেই।"],
"wZPUJx": ["“", ["0"], "”"],
@@ -4707,6 +4719,7 @@
"y46m5r": ["ডেস্কটপ অ্যাপ সাড়া দিচ্ছে না। সতেজ করে আবার চেষ্টা করুন।"],
"y5FUYi": ["পরামর্শ মেনু খোলা"],
"y5UgU8": [["0"], " নিষ্ক্রিয় করুন"],
+ "y6HGwM": ["বাকি কনফ্লিক্ট: ", ["liveRemaining"], "টি।"],
"y8B54M": ["আপনার প্রম্পট পাঠানো যায়নি — অনুগ্রহ করে আবার চেষ্টা করুন।"],
"yCX4jp": [" আপনার নির্বাচন পুনরুদ্ধার করা যায়নি।"],
"yDlK9k": ["মোছার আগে ", ["files"], "-এর দ্বন্দ্ব মিটিয়ে নিন।"],
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index 8fcd07db4..42fdec870 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} এই প্রকল্পের বাইরে, <0>{sourc
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {অক্ষর} other {অক্ষর}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# অমীমাংসিত হাংক} other {# অমীমাংসিত হাংক}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (খালি)"
@@ -1327,9 +1323,32 @@ msgstr "{appName} সম্পর্কে"
msgid "Above"
msgstr "উপরে"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "গ্রহণ করুন"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "দুটোই গ্রহণ করুন"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "কনফ্লিক্ট {0}-এর জন্য উভয় সংস্করণ গ্রহণ করুন"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "বর্তমানটি গ্রহণ করুন"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "কনফ্লিক্ট {0}-এর জন্য বর্তমান সংস্করণ গ্রহণ করুন"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "আগতটি গ্রহণ করুন"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "কনফ্লিক্ট {0}-এর জন্য আগত সংস্করণ গ্রহণ করুন"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1667,6 +1686,10 @@ msgstr "{editor}-কে উৎসের সঙ্গে মেলানো হ
msgid "All"
msgstr "সব"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "সব কনফ্লিক্ট সমাধান হয়েছে। সংরক্ষণ করতে পরিবর্তন প্রয়োগ করুন।"
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "সব ফাইল"
@@ -1675,10 +1698,6 @@ msgstr "সব ফাইল"
msgid "All files are hidden by view filters."
msgstr "ভিউ ফিল্টার সব ফাইল লুকিয়ে রেখেছে।"
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "সব হাংক মীমাংসিত"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "সব ট্যাগ"
@@ -1838,6 +1857,10 @@ msgstr "আপনি এই কথোপকথন আবার শুরু ক
msgid "Apply and restart project server"
msgstr "প্রয়োগ করুন এবং প্রজেক্ট সার্ভার পুনরায় চালু করুন"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "পরিবর্তন প্রয়োগ করুন"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "লিংক প্রয়োগ করুন"
@@ -3124,6 +3147,10 @@ msgstr "দ্বন্দ্ব"
msgid "Conflict"
msgstr "দ্বন্দ্ব"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "{fileName}-এর কনফ্লিক্ট ডিফ"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "দ্বন্দ্বযুক্ত ফাইল"
@@ -3137,6 +3164,10 @@ msgstr "বিরোধপূর্ণ ফাইল: {0}।"
msgid "Conflicts"
msgstr "দ্বন্দ্ব"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "বাকি কনফ্লিক্ট: {liveRemaining}টি।"
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "যুক্ত করুন"
@@ -3628,6 +3659,10 @@ msgstr "ওই মন্তব্যটি যোগ করা যায়ন
msgid "Couldn't apply the change: {0}"
msgstr "পরিবর্তনটি প্রয়োগ করা যায়নি: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "{filePath}-এ এখনও কনফ্লিক্ট আছে কি না যাচাই করা যায়নি — আবার চেষ্টা করা হচ্ছে।"
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "কী মুছে ফেলা যায়নি — অনুগ্রহ করে আবার চেষ্টা করুন।"
@@ -5443,10 +5478,6 @@ msgstr "প্রস্থান করুন"
msgid "exit {0}"
msgstr "প্রস্থান {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "মার্জ থেকে বেরিয়ে যান"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6559,6 +6590,10 @@ msgstr "ফোল্ডার লুকান"
msgid "Hide HTML preview"
msgstr "HTML প্রাকদর্শন লুকান"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "মূল সংস্করণ লুকান"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "অন্যগুলি লুকান"
@@ -8555,6 +8590,10 @@ msgstr "এই প্রকল্পে এখনও কোনো মন্ত
msgid "No comments yet. Select text in the document to add one."
msgstr "এখনও কোনো মন্তব্য নেই। একটি যোগ করতে নথিতে লেখা নির্বাচন করুন।"
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "কোনও সাধারণ পূর্বসূরি নেই — উভয় ব্রাঞ্চ এই ফাইলটি যোগ করেছে (add/add দ্বন্দ্ব)।"
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "এই সংস্করণে বিষয়বস্তুর কোনো পরিবর্তন নেই।"
@@ -10147,6 +10186,10 @@ msgstr "এই থিম ব্যবহার করতে উপরের “
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "প্রাকদর্শন ব্রাউজার নিজে থেকে কপি করতে পারে না। উপরের URL-এ Cmd/Ctrl+C ব্যবহার করুন, নয়তো OK ডেস্কটপ অ্যাপে খুলুন।"
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "{filename}-এর প্রিভিউ"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "স্ক্রিনশটের প্রাকদর্শন"
@@ -10564,6 +10607,7 @@ msgid "Recycle Bin"
msgstr "রিসাইকেল বিন"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "পুনরায় করুন"
@@ -10600,7 +10644,6 @@ msgid "Reinstalling"
msgstr "আবার ইনস্টল করা হচ্ছে"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "প্রত্যাখ্যান করুন"
@@ -10850,6 +10893,10 @@ msgstr "রেন্ডার করা"
msgid "Reopen"
msgstr "আবার খুলুন"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "সম্পাদনা চালিয়ে যেতে {filePath} আবার খুলুন।"
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "আগের চ্যাট আবার খুলুন"
@@ -11327,10 +11374,6 @@ msgstr "সংরক্ষণ ব্যর্থ: {error}"
msgid "Save queued message"
msgstr "সারিতে থাকা বার্তা সংরক্ষণ করুন"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "মীমাংসা সংরক্ষণ করুন"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "এই মন্তব্যটি সংরক্ষণ করুন (Enter)"
@@ -12091,6 +12134,10 @@ msgstr "Files দেখান বা লুকান"
msgid "Show or hide Terminal"
msgstr "Terminal দেখান বা লুকান"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "মূল সংস্করণ দেখান"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13096,6 +13143,10 @@ msgstr "রিপোর্টের জন্য ধন্যবাদ!"
msgid "That branch is already open in another worktree."
msgstr "ওই ব্রাঞ্চটি আগে থেকেই অন্য একটি ওয়ার্কট্রিতে খোলা।"
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "সেই কনফ্লিক্টটি আর উপলব্ধ নেই।"
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "এটি সম্পন্ন হয়নি। সার্ভার লগ দেখে আবার চেষ্টা করুন।"
@@ -13566,6 +13617,10 @@ msgstr "এটি Settings > AI tools & CLI-তে কনফিগার কর
msgid "This comment is on the whole property"
msgstr "এই মন্তব্যটি পুরো প্রপার্টির উপর"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "এই দ্বন্দ্বটি সমাধান হয়েছে।"
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "এই নথি"
@@ -13606,6 +13661,10 @@ msgstr "এই ফিল্ডে অতিরিক্ত স্কিমা
msgid "This file can't be opened in the text editor."
msgstr "এই ফাইলটি টেক্সট সম্পাদকে খোলা যায় না।"
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "এই ফাইলে এমন লাইন রয়েছে যা কনফ্লিক্ট মার্কারের মতো দেখায়, তাই কনফ্লিক্টের সীমা নির্ভরযোগ্যভাবে পড়া যাচ্ছে না। এটি নিজে সমাধান করুন বা AI-কে জিজ্ঞেস করুন ব্যবহার করুন।"
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "এই ফাইলটি পাওয়া যায়নি।"
@@ -13618,6 +13677,14 @@ msgstr "এই ফাইলটি বাইনারি এবং লেখা
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "এই ফাইলটি অন্তর্নির্মিত টেক্সট সম্পাদকে খোলার জন্য অত্যন্ত বড় (১ MB সীমা)। অন্য অ্যাপে খুলতে নিচের Open file ব্যবহার করুন।"
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "এই ফাইলটি বর্তমান ব্রাঞ্চে মুছে ফেলা হয়েছে (delete-modify দ্বন্দ্ব)।"
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "এই ফাইলটি আগত ব্রাঞ্চে মুছে ফেলা হয়েছে (modify-delete দ্বন্দ্ব)।"
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "এই ফোল্ডারে কোনো git রিপোজিটরি নেই। অন্য ফোল্ডার বেছে নেবেন?"
@@ -14198,7 +14265,7 @@ msgstr "{docName}-এর শেষ সম্পাদনাটি পূর্
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14228,6 +14295,10 @@ msgstr "আপনার নিজের সম্পাদনা পূর্ব
msgid "Undo to this edit?"
msgstr "এই সম্পাদনা পর্যন্ত পূর্বাবস্থায় ফেরাবেন?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "এটি পরিবর্তন করতে আপনার সমাধানগুলি পূর্বাবস্থায় ফেরান।"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Edit source প্যানেলে বা কোড-ধাঁচের কোনো প্রপার্টি ফিল্ডে নির্বাচনের পরিবর্তন পূর্বাবস্থায় ফেরান, পুনরায় করুন, বা এক এক করে দেখুন।"
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index 36c216186..aec47cb98 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -231,6 +231,7 @@
"2XQ8Ww": ["Open preview when agent edits"],
"2YOwme": ["Restarted — now running v", ["appRuntime"], "."],
"2YZwPB": ["Forward-links response did not match expected shape."],
+ "2Yt22K": ["Hide original"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["Hide panel (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["Enter a valid URL (for example https://api.openai.com/v1)."],
@@ -365,6 +366,7 @@
"4Sxexw": ["Source undo or redo"],
"4TzU0n": ["Initialize"],
"4Vgtaz": ["The board could not be reached. It may not exist, or the server may be offline."],
+ "4_-TKi": ["Accept both versions for conflict ", ["0"]],
"4buZWd": ["Inherited from ", ["path"]],
"4c_a6S": ["Nothing set yet."],
"4d0VYJ": ["We’ll create a safe theme ID from this name."],
@@ -389,6 +391,7 @@
"4sUdTJ": ["themed preview"],
"4uNLmk": ["Pulling"],
"4v2Yyz": ["Select every visible file-tree row when focus is in the Files sidebar."],
+ "4vn1gP": ["All conflicts resolved. Apply changes to save."],
"4xtLTl": ["Hidden folder “", ["basename"], "”"],
"4zGlN_": ["Paste image URL or click upload"],
"4z_1j2": ["Rendered"],
@@ -647,13 +650,6 @@
],
"8AjnFz": ["\"", ["0"], "\" was already imported (identical content)."],
"8F1i42": ["Page not found"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- { "one": ["#", " unresolved hunk"], "other": ["#", " unresolved hunks"] }
- ]
- ],
"8Gzz2G": ["worktree of ", ["worktreeOf"]],
"8HvJlU": [
"A DIFFERENT skill named like this one lives at ",
@@ -863,6 +859,7 @@
],
"Aif3E7": ["Enable semantic search"],
"AkA6DO": ["Part of the ", ["0"], " plugin — read-only; open it to edit a copy"],
+ "Al8HPP": ["Accept current version for conflict ", ["0"]],
"Am78jY": ["Drag ", ["keyName"], " to reorder"],
"ApeA0n": ["Undid ", ["dropCount"], " edits on ", ["docName"]],
"Aq-O0x": ["status"],
@@ -1610,6 +1607,7 @@
["componentName"],
"> isn't a known component. Copy the source to use it elsewhere, or delete the block."
],
+ "KhNkCq": ["Accept both"],
"Khxcyu": ["Terminal access isn't enabled for this project."],
"KjTmeO": ["Update OpenKnowledge to open this share."],
"KkEAud": ["Create a file from the current document or folder context."],
@@ -1686,7 +1684,6 @@
"LaskKp": ["Send to chat (", ["0"], ")"],
"Lbl6KA": ["Couldn't install from ", ["0"], ": ", ["1"]],
"LbmLyU": ["Can't safely edit this tool's config"],
- "Lcehxn": ["Save resolution"],
"LdABLa": ["Could not open ", ["target"], ". Try opening it manually."],
"LdKIHS": ["Draft a spec"],
"LeGeTf": ["OpenKnowledge on GitHub"],
@@ -1699,6 +1696,7 @@
],
"LhWYpm": ["Other OK paths are tracked upstream:"],
"Li4U-T": ["Learn more about ", ["title"]],
+ "LkQRL8": ["Show original"],
"LlHqdU": ["Initializing project"],
"LlJ8LD": [
"Config sharing unchanged: ",
@@ -1860,6 +1858,7 @@
"Ni4b7h": [
"Project plugins are your project's authoring standard — turn them on or off here. Each enabled plugin gets its own page under Plugins in the settings sidebar."
],
+ "NjnHNV": ["Accept incoming version for conflict ", ["0"]],
"NjrIak": ["File: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["Edit ", ["tag"]],
"NkXEFS": ["Restore failed — document unchanged"],
@@ -1869,6 +1868,7 @@
"NnQapF": ["Open with AI ", ["targetDisplayName"]],
"NoY1k4": ["Invalid server response shape"],
"NpC29w": ["Create a new list item from the current list item."],
+ "NpRLRj": ["Undo your resolutions to change this."],
"NrFwux": ["Failed to save content rules — ", ["0"]],
"Ns0z5o": [
"When you install a published skill, tell the skill directory (skills.sh) so its install count is accurate. Sends the skill name, its source repository, and which agent tools it went to — never file contents, and never for a skill from a private, local, or hand-typed source. Once per skill per machine."
@@ -1923,6 +1923,7 @@
"OLBz-_": ["Mermaid diagram failed to render."],
"OLIKgw": ["Drag item ", ["0"], " to reorder"],
"ONPvOb": ["Loading agent activity"],
+ "ONUgxB": ["That conflict is no longer available."],
"ONWvwQ": ["Upload"],
"ONchxy": ["total"],
"ONgEZF": ["Loading headings for ", ["pageTarget"]],
@@ -2006,6 +2007,7 @@
"PVSwOe": ["Steering — waiting for the current run to stop…"],
"PVUn_c": ["Open folder"],
"PVggyD": ["Frontmatter schemas"],
+ "PWh9Ii": ["Apply changes"],
"PWqtgd": ["Loading the chat"],
"PXaT32": ["Server returned an incomplete skill-targets response."],
"PYmp-0": ["Import as template"],
@@ -2085,6 +2087,7 @@
"QQbwzK": ["No agents available."],
"QQghPu": ["Install in Claude Desktop"],
"QR5SP1": ["created template"],
+ "QVk3SK": ["This file was deleted on the incoming branch (modify-delete conflict)."],
"QWdKwH": ["Move"],
"QYTOaN": ["You can change this later in <0>Settings → Sync</0>."],
"QYfQdv": [["displayName"], " CLI"],
@@ -2450,6 +2453,7 @@
],
"VIwCaD": ["Entry"],
"VJaBca": ["Choose a skill folder"],
+ "VL6VsE": ["Accept current"],
"VM7H66": ["This file is binary and can't be shown as text."],
"VMlRqi": ["Hide details"],
"VNNRfN": ["make source"],
@@ -2657,7 +2661,7 @@
"Couldn't restart the server — another process owns it. Quit other OpenKnowledge windows for this project, then try again."
],
"Xv_ijG": ["https://github.com/owner/repo or owner/repo"],
- "XyOUTJ": ["Exit merge"],
+ "XzL7x7": ["Reopen ", ["filePath"], " to keep editing."],
"Xzy0s0": ["Remove ", ["fullLabel"], " from context"],
"Y-Urt2": ["Block math equation rendered with KaTeX from a LaTeX source string."],
"Y1QMlM": ["Get set up"],
@@ -2699,6 +2703,7 @@
"YSFv5w": ["No git repository — config sharing does not apply here."],
"YTLmTM": ["Remove the parent <0>.git</0> folder"],
"YW7Q86": ["Search settings not yet loaded — try again in a moment"],
+ "YWK2zy": ["Conflict diff for ", ["fileName"]],
"Y_GpJd": ["The ", ["0"], " download request timed out."],
"Y_ZQ6l": ["Installing ", ["agentName"], "…"],
"Y_iImT": ["Unresolvable file ", ["identity"], ". Go to reference."],
@@ -2872,6 +2877,7 @@
"You picked your home directory. OpenKnowledge will index everything in your home tree — large and may surface personal files."
],
"_SDGzH": ["Continue in browser"],
+ "_SkqfM": ["Accept incoming"],
"_TDESN": ["Network error - ", ["kind"], " \"", ["createdPath"], "\" still exists on disk"],
"_TF8ep": ["Failed to render PDF"],
"_W-elG": ["(inline)"],
@@ -3338,7 +3344,6 @@
}
]
],
- "g3UF2V": ["Accept"],
"g4WlQK": ["Project AI tool management is only available in the OpenKnowledge desktop app."],
"g4XBm0": ["Small section heading."],
"g4e0hS": ["Ask ", ["agentName"]],
@@ -3355,6 +3360,7 @@
],
"g9Nj4l": ["// note"],
"gAhHu7": ["Auto-fix applies only to problems with a known mechanical fix."],
+ "gBCeDq": ["No common ancestor — both branches added this file (add/add conflict)."],
"gBbxn_": ["Checking sign-in status"],
"gDkNHk": ["Are you sure you want to delete \"", ["name"], "\"?"],
"gGVP4q": ["Click <0>+</0> <1/> <2>Create skill</2> <3/> <4>Upload skill</4>."],
@@ -3443,6 +3449,7 @@
"Keep a written record of how your product gets built. A home for proposing ideas, recording decisions, writing specs, and capturing what you learned after something broke."
],
"hCattk": ["OpenKnowledge imported ", ["source"]],
+ "hCghAK": ["This conflict is resolved."],
"hDEaQu": ["Connect OpenKnowledge to other tools you use."],
"hDKtoF": [["diffHrs"], "h ago"],
"hDoLrm": ["Remove ", ["projectName"], " from recent projects"],
@@ -3651,6 +3658,7 @@
"jSY41h": ["\"", ["docName"], "\" took too long. Check your connection."],
"jTLWxh": ["Embed an external page in an inline iframe (docs, demos, Figma, CodeSandbox)."],
"jTUxaN": ["Enable Auto (Pull only)"],
+ "jTdrn1": ["Couldn't check whether ", ["filePath"], " is still conflicted — retrying."],
"jWzDfC": ["Checking which AI tools you have"],
"jZ_E5M": ["Fetch failed — check the server logs for details."],
"j_Z6g7": ["Shared default"],
@@ -3846,7 +3854,6 @@
"A path inside the skill — any folder works (e.g. references/notes.md). Folders in the path are created for you."
],
"lPkjpD": ["Pushed ", ["pushed"]],
- "lPzyrU": ["All hunks resolved"],
"lS83Sg": ["Couldn’t reach the clipboard."],
"lScd1O": ["Slidev decks open in the OpenKnowledge desktop app only."],
"lT6wjt": ["Expand board"],
@@ -3925,6 +3932,7 @@
"Organize my existing specs into a linked index grouped by area, and flag any that have drifted out of sync with the current code."
],
"mPzgTS": ["Open ", ["docName"]],
+ "mR3uQg": ["This file was deleted on the current branch (delete-modify conflict)."],
"mToVM9": ["Message ", ["agentName"]],
"mU3j1b": ["Remove item ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (conflict)"],
@@ -4187,6 +4195,9 @@
" because it contains a .git folder"
],
"pZAs1T": ["Failed to load outgoing links"],
+ "pZaMLc": [
+ "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+ ],
"paCw0z": ["everything under ", ["0"], "/ folders inside ", ["1"], "/"],
"pajIrl": ["Could not turn off the terminal: ", ["0"]],
"pbwTg6": [["seconds"], "s ago"],
@@ -4742,6 +4753,7 @@
"wU8WyK": ["Element fields"],
"wVa83H": ["Couldn't create the report"],
"wWtVYd": ["Enter a port between 1 and 65535."],
+ "wXFalZ": ["Preview of ", ["filename"]],
"wXO4Tg": [["hrs"], "h ago"],
"wXw19Y": [
"Removed \"",
@@ -4859,6 +4871,7 @@
"y46m5r": ["The desktop app isn't responding. Refresh and try again."],
"y5FUYi": ["Suggestion menu open"],
"y5UgU8": ["Disable ", ["0"]],
+ "y6HGwM": ["Conflicts remaining: ", ["liveRemaining"], "."],
"y8B54M": ["Couldn't send your prompt — please try again."],
"yCX4jp": [" Your selection could not be restored."],
"yDlK9k": ["Resolve the conflict on ", ["files"], " before deleting."],
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index 23713b131..6b3315b04 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} lives outside this project, at <0>{source}</0> — agents run
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {char} other {chars}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (empty)"
@@ -1331,9 +1327,32 @@ msgstr "About {appName}"
msgid "Above"
msgstr "Above"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "Accept"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "Accept both"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "Accept both versions for conflict {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "Accept current"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "Accept current version for conflict {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "Accept incoming"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "Accept incoming version for conflict {0}"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "Aligned {editor} to the source (its bytes are backed up)"
msgid "All"
msgstr "All"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "All conflicts resolved. Apply changes to save."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "All files"
@@ -1679,10 +1702,6 @@ msgstr "All files"
msgid "All files are hidden by view filters."
msgstr "All files are hidden by view filters."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "All hunks resolved"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "All tags"
@@ -1842,6 +1861,10 @@ msgstr "Applies when you pick this conversation back up"
msgid "Apply and restart project server"
msgstr "Apply and restart project server"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "Apply changes"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "Apply link"
@@ -3128,6 +3151,10 @@ msgstr "conflict"
msgid "Conflict"
msgstr "Conflict"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "Conflict diff for {fileName}"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "Conflicted files"
@@ -3141,6 +3168,10 @@ msgstr "Conflicting files: {0}."
msgid "Conflicts"
msgstr "Conflicts"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "Conflicts remaining: {liveRemaining}."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "Connect"
@@ -3632,6 +3663,10 @@ msgstr "Couldn't add that comment."
msgid "Couldn't apply the change: {0}"
msgstr "Couldn't apply the change: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "Couldn't check whether {filePath} is still conflicted — retrying."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "Couldn't clear the key — please try again."
@@ -5447,10 +5482,6 @@ msgstr "Exit"
msgid "exit {0}"
msgstr "exit {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "Exit merge"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "Hide folder"
msgid "Hide HTML preview"
msgstr "Hide HTML preview"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "Hide original"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "Hide Others"
@@ -8559,6 +8594,10 @@ msgstr "No comments in this project yet. Comment on a passage to start one."
msgid "No comments yet. Select text in the document to add one."
msgstr "No comments yet. Select text in the document to add one."
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "No common ancestor — both branches added this file (add/add conflict)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "No content changes at this version."
@@ -10151,6 +10190,10 @@ msgstr "Press the sun or moon on “Custom” above to use this theme."
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "Preview of {filename}"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "Preview of the screenshot"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "Recycle Bin"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "Redo"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "Reinstalling"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "Reject"
@@ -10854,6 +10897,10 @@ msgstr "Rendered"
msgid "Reopen"
msgstr "Reopen"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "Reopen {filePath} to keep editing."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "Reopen a past chat"
@@ -11331,10 +11378,6 @@ msgstr "Save failed: {error}"
msgid "Save queued message"
msgstr "Save queued message"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "Save resolution"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "Save this comment (Enter)"
@@ -12095,6 +12138,10 @@ msgstr "Show or hide Files"
msgid "Show or hide Terminal"
msgstr "Show or hide Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "Show original"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "Thanks for the report!"
msgid "That branch is already open in another worktree."
msgstr "That branch is already open in another worktree."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "That conflict is no longer available."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "That did not go through. Check the server logs and try again."
@@ -13570,6 +13621,10 @@ msgstr "This can be configured in Settings > AI tools & CLI"
msgid "This comment is on the whole property"
msgstr "This comment is on the whole property"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "This conflict is resolved."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "This doc"
@@ -13610,6 +13665,10 @@ msgstr "This field carries additional schema keywords the editor does not show
msgid "This file can't be opened in the text editor."
msgstr "This file can't be opened in the text editor."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "This file could not be found."
@@ -13622,6 +13681,14 @@ msgstr "This file is binary and can't be shown as text."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "This file was deleted on the current branch (delete-modify conflict)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "This file was deleted on the incoming branch (modify-delete conflict)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "This folder doesn't contain a git repository. Pick a different folder?"
@@ -14202,7 +14269,7 @@ msgstr "Undid the last edit on {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "Undo or redo your own edits, leaving edits from collaborators and agents
msgid "Undo to this edit?"
msgstr "Undo to this edit?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "Undo your resolutions to change this."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index 346ed20a8..6d41ab2a2 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -257,6 +257,7 @@
"2XQ8Ww": ["Abrir la vista previa cuando el agente edite"],
"2YOwme": ["Reiniciado: ahora se ejecuta la v", ["appRuntime"], "."],
"2YZwPB": ["La respuesta de enlaces salientes no tenía la forma esperada."],
+ "2Yt22K": ["Ocultar original"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["Ocultar el panel (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["Escribe una URL válida (por ejemplo https://api.openai.com/v1)."],
@@ -420,6 +421,7 @@
"4Vgtaz": [
"No se pudo acceder a la pizarra. Puede que no exista o que el servidor esté sin conexión."
],
+ "4_-TKi": ["Aceptar ambas versiones para el conflicto ", ["0"]],
"4buZWd": ["Heredado de ", ["path"]],
"4c_a6S": ["Todavía no hay nada definido."],
"4d0VYJ": ["Crearemos un ID de tema seguro a partir de este nombre."],
@@ -456,6 +458,7 @@
"4v2Yyz": [
"Selecciona todas las filas visibles del árbol de archivos cuando el foco está en la barra lateral Archivos."
],
+ "4vn1gP": ["Todos los conflictos resueltos. Aplica los cambios para guardar."],
"4xtLTl": ["Carpeta “", ["basename"], "” oculta"],
"4zGlN_": ["Pega la URL de la imagen o haz clic en subir"],
"4z_1j2": ["Renderizado"],
@@ -763,17 +766,6 @@
],
"8AjnFz": ["\"", ["0"], "\" ya se había importado (contenido idéntico)."],
"8F1i42": ["No se encontró la página"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- {
- "one": ["#", " fragmento sin resolver"],
- "many": ["#", " fragmentos sin resolver"],
- "other": ["#", " fragmentos sin resolver"]
- }
- ]
- ],
"8Gzz2G": ["worktree de ", ["worktreeOf"]],
"8HvJlU": [
"En ",
@@ -1014,6 +1006,7 @@
["0"],
": es de solo lectura; ábrelo para editar una copia"
],
+ "Al8HPP": ["Aceptar la versión actual para el conflicto ", ["0"]],
"Am78jY": ["Arrastra ", ["keyName"], " para reordenar"],
"ApeA0n": ["Se deshicieron ", ["dropCount"], " ediciones en ", ["docName"]],
"Aq-O0x": ["estado"],
@@ -1879,6 +1872,7 @@
["componentName"],
"> no es un componente conocido. Copia el código para usarlo en otro sitio o elimina el bloque."
],
+ "KhNkCq": ["Aceptar ambos"],
"Khxcyu": ["El acceso a la terminal no está activado en este proyecto."],
"KjTmeO": ["Actualiza OpenKnowledge para abrir este elemento compartido."],
"KkEAud": ["Crea un archivo a partir del documento o la carpeta actuales."],
@@ -1966,7 +1960,6 @@
"LaskKp": ["Enviar al chat (", ["0"], ")"],
"Lbl6KA": ["No se pudo instalar desde ", ["0"], ": ", ["1"]],
"LbmLyU": ["No se puede editar con seguridad la configuración de esta herramienta"],
- "Lcehxn": ["Guardar la resolución"],
"LdABLa": ["No se pudo abrir ", ["target"], ". Prueba a abrirlo manualmente."],
"LdKIHS": ["Redactar una especificación"],
"LeGeTf": ["OpenKnowledge en GitHub"],
@@ -1979,6 +1972,7 @@
],
"LhWYpm": ["Hay otras rutas OK seguidas en el remoto:"],
"Li4U-T": ["Más información sobre ", ["title"]],
+ "LkQRL8": ["Mostrar original"],
"LlHqdU": ["Inicializando el proyecto"],
"LlJ8LD": [
"El uso compartido de la configuración no cambió: ",
@@ -2162,6 +2156,7 @@
"Ni4b7h": [
"Los complementos de proyecto son el estándar de autoría de tu proyecto: actívalos o desactívalos aquí. Cada complemento activado tiene su propia página bajo Complementos en la barra lateral de ajustes."
],
+ "NjnHNV": ["Aceptar la versión entrante para el conflicto ", ["0"]],
"NjrIak": ["Archivo: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["Editar ", ["tag"]],
"NkXEFS": ["Falló la restauración: el documento no cambió"],
@@ -2171,6 +2166,7 @@
"NnQapF": ["Abrir con la IA ", ["targetDisplayName"]],
"NoY1k4": ["La estructura de la respuesta del servidor no es válida"],
"NpC29w": ["Crea un elemento de lista nuevo a partir del elemento actual."],
+ "NpRLRj": ["Deshaz tus resoluciones para cambiar esto."],
"NrFwux": ["No se pudieron guardar las reglas de contenido — ", ["0"]],
"Ns0z5o": [
"Cuando instalas una habilidad publicada, se avisa al directorio de habilidades (skills.sh) para que su recuento de instalaciones sea exacto. Se envía el nombre de la habilidad, su repositorio de origen y a qué herramientas de IA fue; nunca el contenido de los archivos, y nunca en el caso de una habilidad de un origen privado, local o escrito a mano. Una vez por habilidad y equipo."
@@ -2229,6 +2225,7 @@
"OLBz-_": ["No se pudo renderizar el diagrama de Mermaid."],
"OLIKgw": ["Arrastra el elemento ", ["0"], " para reordenar"],
"ONPvOb": ["Cargando la actividad del agente"],
+ "ONUgxB": ["Ese conflicto ya no está disponible."],
"ONWvwQ": ["Subir"],
"ONchxy": ["total"],
"ONgEZF": ["Cargando los encabezados de ", ["pageTarget"]],
@@ -2314,6 +2311,7 @@
"PVSwOe": ["Redirigiendo: esperando a que se detenga la ejecución actual…"],
"PVUn_c": ["Abrir carpeta"],
"PVggyD": ["Esquemas de frontmatter"],
+ "PWh9Ii": ["Aplicar cambios"],
"PWqtgd": ["Cargando el chat"],
"PXaT32": ["El servidor devolvió una respuesta de destinos de habilidades incompleta."],
"PYmp-0": ["Importar como plantilla"],
@@ -2406,6 +2404,7 @@
"QQbwzK": ["No hay agentes disponibles."],
"QQghPu": ["Instalar en Claude Desktop"],
"QR5SP1": ["plantilla creada"],
+ "QVk3SK": ["Este archivo se eliminó en la rama entrante (conflicto modify-delete)."],
"QWdKwH": ["Mover"],
"QYTOaN": ["Puedes cambiarlo más adelante en <0>Ajustes → Sincronización</0>."],
"QYfQdv": ["CLI de ", ["displayName"]],
@@ -2835,6 +2834,7 @@
],
"VIwCaD": ["Entrada"],
"VJaBca": ["Elige una carpeta de habilidad"],
+ "VL6VsE": ["Aceptar actual"],
"VM7H66": ["Este archivo es binario y no se puede mostrar como texto."],
"VMlRqi": ["Ocultar detalles"],
"VNNRfN": ["convertir en origen"],
@@ -3101,7 +3101,7 @@
"No se pudo reiniciar el servidor: otro proceso lo tiene. Cierra las demás ventanas de OpenKnowledge de este proyecto e inténtalo de nuevo."
],
"Xv_ijG": ["https://github.com/propietario/repo o propietario/repo"],
- "XyOUTJ": ["Salir de la fusión"],
+ "XzL7x7": ["Vuelve a abrir ", ["filePath"], " para seguir editando."],
"Xzy0s0": ["Quitar ", ["fullLabel"], " del contexto"],
"Y-Urt2": ["Ecuación matemática en bloque renderizada con KaTeX a partir de código LaTeX."],
"Y1QMlM": ["Ponte en marcha"],
@@ -3152,6 +3152,7 @@
"YSFv5w": ["No hay repositorio de git: compartir configuración no aplica aquí."],
"YTLmTM": ["Eliminar la carpeta <0>.git</0> superior"],
"YW7Q86": ["Los ajustes de búsqueda aún no se han cargado; inténtalo de nuevo en un momento"],
+ "YWK2zy": ["Diferencias del conflicto en ", ["fileName"]],
"Y_GpJd": ["Se agotó el tiempo de la solicitud de descarga de ", ["0"], "."],
"Y_ZQ6l": ["Instalando ", ["agentName"], "…"],
"Y_iImT": ["No se puede resolver el archivo ", ["identity"], ". Ir a la referencia."],
@@ -3336,6 +3337,7 @@
"Elegiste tu carpeta personal. OpenKnowledge indexará todo tu árbol personal: es grande y puede sacar a la luz archivos personales."
],
"_SDGzH": ["Continuar en el navegador"],
+ "_SkqfM": ["Aceptar entrante"],
"_TDESN": [
"Error de red - ",
["kind"],
@@ -3905,7 +3907,6 @@
}
]
],
- "g3UF2V": ["Aceptar"],
"g4WlQK": [
"La gestión de herramientas de IA del proyecto solo está disponible en la aplicación de escritorio de OpenKnowledge."
],
@@ -3926,6 +3927,7 @@
"gAhHu7": [
"El arreglo automático solo se aplica a los problemas con un arreglo mecánico conocido."
],
+ "gBCeDq": ["Sin ancestro común: ambas ramas añadieron este archivo (conflicto add/add)."],
"gBbxn_": ["Comprobando el estado de la sesión"],
"gDkNHk": ["¿Seguro que quieres eliminar «", ["name"], "»?"],
"gGVP4q": ["Haz clic en <0>+</0> <1/> <2>Crear habilidad</2> <3/> <4>Subir habilidad</4>."],
@@ -4018,6 +4020,7 @@
"Deja constancia escrita de cómo se construye tu producto. Un sitio para proponer ideas, registrar decisiones, escribir especificaciones y anotar lo aprendido cuando algo falla."
],
"hCattk": ["OpenKnowledge importó ", ["source"]],
+ "hCghAK": ["Este conflicto está resuelto."],
"hDEaQu": ["Conecta OpenKnowledge con las demás herramientas que usas."],
"hDKtoF": ["hace ", ["diffHrs"], " h"],
"hDoLrm": ["Quitar ", ["projectName"], " de los proyectos recientes"],
@@ -4246,6 +4249,7 @@
"Incrusta una página externa en un iframe en línea (documentación, demos, Figma, CodeSandbox)."
],
"jTUxaN": ["Activar Automático (solo Pull)"],
+ "jTdrn1": ["No se pudo comprobar si ", ["filePath"], " sigue en conflicto: reintentando."],
"jWzDfC": ["Comprobando qué herramientas de IA tienes"],
"jZ_E5M": ["Falló el fetch: consulta los registros del servidor para ver los detalles."],
"j_Z6g7": ["Valor compartido por defecto"],
@@ -4448,7 +4452,6 @@
"Una ruta dentro de la habilidad; cualquier carpeta sirve (p. ej. references/notes.md). Las carpetas de la ruta se crean automáticamente."
],
"lPkjpD": ["Enviado ", ["pushed"]],
- "lPzyrU": ["Todos los fragmentos resueltos"],
"lS83Sg": ["No se pudo acceder al portapapeles."],
"lScd1O": [
"Las presentaciones de Slidev solo se abren en la aplicación de escritorio de OpenKnowledge."
@@ -4544,6 +4547,7 @@
"Organiza mis especificaciones existentes en un índice enlazado y agrupado por área, y señala las que se hayan desincronizado del código actual."
],
"mPzgTS": ["Abrir ", ["docName"]],
+ "mR3uQg": ["Este archivo se eliminó en la rama actual (conflicto delete-modify)."],
"mToVM9": ["Escribir a ", ["agentName"]],
"mU3j1b": ["Quitar el elemento ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (conflicto)"],
@@ -4832,6 +4836,9 @@
" porque contiene una carpeta .git"
],
"pZAs1T": ["No se pudieron cargar los enlaces salientes"],
+ "pZaMLc": [
+ "Este archivo contiene líneas que parecen marcadores de conflicto, por lo que los límites del conflicto no se pueden leer de forma fiable. Resuélvelo a mano o con Preguntar a la IA."
+ ],
"paCw0z": ["todo lo que hay en las carpetas ", ["0"], "/ dentro de ", ["1"], "/"],
"pajIrl": ["No se pudo desactivar la terminal: ", ["0"]],
"pbwTg6": ["hace ", ["seconds"], " s"],
@@ -5474,6 +5481,7 @@
"wU8WyK": ["Campos del elemento"],
"wVa83H": ["No se pudo crear el informe"],
"wWtVYd": ["Introduce un puerto entre 1 y 65535."],
+ "wXFalZ": ["Vista previa de ", ["filename"]],
"wXO4Tg": ["hace ", ["hrs"], " h"],
"wXw19Y": [
"Se quitó \"",
@@ -5595,6 +5603,7 @@
"y46m5r": ["La aplicación de escritorio no responde. Actualiza e inténtalo de nuevo."],
"y5FUYi": ["Menú de sugerencias abierto"],
"y5UgU8": ["Desactivar ", ["0"]],
+ "y6HGwM": ["Conflictos restantes: ", ["liveRemaining"], "."],
"y8B54M": ["No se pudo enviar tu prompt; inténtalo de nuevo."],
"yCX4jp": [" No se pudo restaurar tu selección."],
"yDlK9k": ["Resuelve el conflicto en ", ["files"], " antes de eliminar."],
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 846a02d29..6b7636f06 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} está fuera de este proyecto, en <0>{source}</0>: los agentes
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {carácter} many {caracteres} other {caracteres}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# fragmento sin resolver} many {# fragmentos sin resolver} other {# fragmentos sin resolver}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (vacío)"
@@ -1331,9 +1327,32 @@ msgstr "Acerca de {appName}"
msgid "Above"
msgstr "Arriba"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "Aceptar"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "Aceptar ambos"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "Aceptar ambas versiones para el conflicto {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "Aceptar actual"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "Aceptar la versión actual para el conflicto {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "Aceptar entrante"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "Aceptar la versión entrante para el conflicto {0}"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "Se alineó {editor} con el código fuente (se hizo copia de seguridad de
msgid "All"
msgstr "Todo"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "Todos los conflictos resueltos. Aplica los cambios para guardar."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "Todos los archivos"
@@ -1679,10 +1702,6 @@ msgstr "Todos los archivos"
msgid "All files are hidden by view filters."
msgstr "Los filtros de vista ocultan todos los archivos."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "Todos los fragmentos resueltos"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "Todas las etiquetas"
@@ -1842,6 +1861,10 @@ msgstr "Se aplica cuando retomes esta conversación"
msgid "Apply and restart project server"
msgstr "Aplicar y reiniciar el servidor del proyecto"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "Aplicar cambios"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "Aplicar enlace"
@@ -3128,6 +3151,10 @@ msgstr "conflicto"
msgid "Conflict"
msgstr "Conflicto"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "Diferencias del conflicto en {fileName}"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "Archivos en conflicto"
@@ -3141,6 +3168,10 @@ msgstr "Archivos en conflicto: {0}."
msgid "Conflicts"
msgstr "Conflictos"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "Conflictos restantes: {liveRemaining}."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "Conectar"
@@ -3632,6 +3663,10 @@ msgstr "No se pudo añadir ese comentario."
msgid "Couldn't apply the change: {0}"
msgstr "No se pudo aplicar el cambio: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "No se pudo comprobar si {filePath} sigue en conflicto: reintentando."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "No se pudo borrar la clave; inténtalo de nuevo."
@@ -5447,10 +5482,6 @@ msgstr "Salir"
msgid "exit {0}"
msgstr "salida {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "Salir de la fusión"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "Ocultar la carpeta"
msgid "Hide HTML preview"
msgstr "Ocultar la vista previa del HTML"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "Ocultar original"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "Ocultar los demás"
@@ -8559,6 +8594,10 @@ msgstr "Todavía no hay comentarios en este proyecto. Comenta un fragmento para
msgid "No comments yet. Select text in the document to add one."
msgstr "Todavía no hay comentarios. Selecciona texto en el documento para añadir uno."
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "Sin ancestro común: ambas ramas añadieron este archivo (conflicto add/add)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "No hay cambios de contenido en esta versión."
@@ -10151,6 +10190,10 @@ msgstr "Pulsa el sol o la luna de “Custom” arriba para usar este tema."
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "Los navegadores de vista previa no pueden copiar automáticamente. Usa Cmd/Ctrl+C sobre la URL de arriba, o abre OK en la aplicación de escritorio."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "Vista previa de {filename}"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "Vista previa de la captura de pantalla"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "Papelera de reciclaje"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "Rehacer"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "Reinstalando"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "Rechazar"
@@ -10854,6 +10897,10 @@ msgstr "Renderizado"
msgid "Reopen"
msgstr "Reabrir"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "Vuelve a abrir {filePath} para seguir editando."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "Reabrir un chat anterior"
@@ -11331,10 +11378,6 @@ msgstr "Falló al guardar: {error}"
msgid "Save queued message"
msgstr "Guardar el mensaje en cola"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "Guardar la resolución"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "Guardar este comentario (Intro)"
@@ -12095,6 +12138,10 @@ msgstr "Mostrar u ocultar Archivos"
msgid "Show or hide Terminal"
msgstr "Mostrar u ocultar Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "Mostrar original"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "¡Gracias por el informe!"
msgid "That branch is already open in another worktree."
msgstr "Esa rama ya está abierta en otro worktree."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "Ese conflicto ya no está disponible."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "Eso no se completó. Revisa los registros del servidor e inténtalo de nuevo."
@@ -13570,6 +13621,10 @@ msgstr "Esto se puede configurar en Ajustes > Herramientas de IA y CLI"
msgid "This comment is on the whole property"
msgstr "Este comentario es sobre toda la propiedad"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "Este conflicto está resuelto."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "Este documento"
@@ -13610,6 +13665,10 @@ msgstr "Este campo lleva palabras clave de esquema adicionales que el editor no
msgid "This file can't be opened in the text editor."
msgstr "Este archivo no se puede abrir en el editor de texto."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "Este archivo contiene líneas que parecen marcadores de conflicto, por lo que los límites del conflicto no se pueden leer de forma fiable. Resuélvelo a mano o con Preguntar a la IA."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "No se encontró este archivo."
@@ -13622,6 +13681,14 @@ msgstr "Este archivo es binario y no se puede mostrar como texto."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "Este archivo es demasiado grande para abrirlo en el editor de texto integrado (límite de 1 MB). Usa Abrir archivo, abajo, para abrirlo en otra aplicación."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "Este archivo se eliminó en la rama actual (conflicto delete-modify)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "Este archivo se eliminó en la rama entrante (conflicto modify-delete)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "Esta carpeta no contiene un repositorio de git. ¿Eliges otra carpeta?"
@@ -14202,7 +14269,7 @@ msgstr "Se deshizo la última edición en {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "Deshaz o rehaz tus propias ediciones, dejando intactas las de colaborado
msgid "Undo to this edit?"
msgstr "¿Deshacer hasta esta edición?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "Deshaz tus resoluciones para cambiar esto."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Deshaz, rehaz o recorre los cambios de selección en el panel Editar código o en un campo de propiedad con forma de código."
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index 65f0de495..568fc3f51 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -269,6 +269,7 @@
"2XQ8Ww": ["Ouvrir l'aperçu quand l'agent modifie"],
"2YOwme": ["Redémarré — exécute maintenant la v", ["appRuntime"], "."],
"2YZwPB": ["La réponse des liens sortants ne correspond pas à la forme attendue."],
+ "2Yt22K": ["Masquer l’original"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["Masquer le panneau (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["Saisissez une URL valide (par exemple https://api.openai.com/v1)."],
@@ -434,6 +435,7 @@
"4Vgtaz": [
"Le tableau est injoignable. Il n'existe peut-être pas, ou le serveur est peut-être hors ligne."
],
+ "4_-TKi": ["Accepter les deux versions pour le conflit ", ["0"]],
"4buZWd": ["Hérité de ", ["path"]],
"4c_a6S": ["Rien de défini pour l'instant."],
"4d0VYJ": ["Nous créerons un ID de thème sûr à partir de ce nom."],
@@ -470,6 +472,7 @@
"4v2Yyz": [
"Sélectionne toutes les lignes visibles de l'arborescence lorsque le focus est dans la barre latérale Fichiers."
],
+ "4vn1gP": ["Tous les conflits sont résolus. Appliquez les modifications pour enregistrer."],
"4xtLTl": ["Dossier « ", ["basename"], " » masqué"],
"4zGlN_": ["Collez l'URL d'une image ou cliquez pour l'envoyer"],
"4z_1j2": ["Rendu"],
@@ -785,17 +788,6 @@
],
"8AjnFz": ["« ", ["0"], " » avait déjà été importé (contenu identique)."],
"8F1i42": ["Page introuvable"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- {
- "one": ["#", " bloc non résolu"],
- "many": ["#", " blocs non résolus"],
- "other": ["#", " blocs non résolus"]
- }
- ]
- ],
"8Gzz2G": ["worktree de ", ["worktreeOf"]],
"8HvJlU": [
"Une compétence DIFFÉRENTE portant un nom semblable se trouve dans ",
@@ -1036,6 +1028,7 @@
["0"],
" — lecture seule ; ouvrez-le pour en modifier une copie"
],
+ "Al8HPP": ["Accepter la version actuelle pour le conflit ", ["0"]],
"Am78jY": ["Faites glisser ", ["keyName"], " pour réorganiser"],
"ApeA0n": [["dropCount"], " modifications annulées sur ", ["docName"]],
"Aq-O0x": ["statut"],
@@ -1906,6 +1899,7 @@
["componentName"],
"> n'est pas un composant connu. Copiez la source pour l'utiliser ailleurs, ou supprimez le bloc."
],
+ "KhNkCq": ["Accepter les deux"],
"Khxcyu": ["L'accès au terminal n'est pas activé pour ce projet."],
"KjTmeO": ["Mettez OpenKnowledge à jour pour ouvrir ce partage."],
"KkEAud": ["Crée un fichier à partir du document ou du dossier courant."],
@@ -1995,7 +1989,6 @@
"LaskKp": ["Envoyer dans la discussion (", ["0"], ")"],
"Lbl6KA": ["Impossible d'installer depuis ", ["0"], " : ", ["1"]],
"LbmLyU": ["Impossible de modifier en toute sécurité la configuration de cet outil"],
- "Lcehxn": ["Enregistrer la résolution"],
"LdABLa": ["Impossible d'ouvrir ", ["target"], ". Essayez de l'ouvrir manuellement."],
"LdKIHS": ["Rédiger une spécification"],
"LeGeTf": ["OpenKnowledge sur GitHub"],
@@ -2008,6 +2001,7 @@
],
"LhWYpm": ["D'autres chemins OK sont suivis en amont :"],
"Li4U-T": ["En savoir plus sur ", ["title"]],
+ "LkQRL8": ["Afficher l’original"],
"LlHqdU": ["Initialisation du projet"],
"LlJ8LD": [
"Partage de la configuration inchangé : ",
@@ -2187,6 +2181,7 @@
"Ni4b7h": [
"Les plugins de projet constituent la norme de rédaction de votre projet — activez-les ou désactivez-les ici. Chaque plugin activé obtient sa propre page sous Plugins dans la barre latérale des paramètres."
],
+ "NjnHNV": ["Accepter la version entrante pour le conflit ", ["0"]],
"NjrIak": ["Fichier : <0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["Modifier ", ["tag"]],
"NkXEFS": ["Échec de la restauration — document inchangé"],
@@ -2196,6 +2191,7 @@
"NnQapF": ["Ouvrir avec l'IA ", ["targetDisplayName"]],
"NoY1k4": ["Structure de réponse du serveur invalide"],
"NpC29w": ["Crée un nouvel élément de liste à partir de l'élément courant."],
+ "NpRLRj": ["Annulez vos résolutions pour modifier ceci."],
"NrFwux": ["Échec de l'enregistrement des règles de contenu — ", ["0"]],
"Ns0z5o": [
"Quand vous installez une compétence publiée, en informer l'annuaire de compétences (skills.sh) pour que son nombre d'installations soit exact. Envoie le nom de la compétence, son dépôt source, et les outils d'agent vers lesquels elle est allée — jamais le contenu des fichiers, et jamais pour une compétence provenant d'une source privée, locale ou saisie à la main. Une fois par compétence et par machine."
@@ -2254,6 +2250,7 @@
"OLBz-_": ["Le rendu du diagramme Mermaid a échoué."],
"OLIKgw": ["Faites glisser l'élément ", ["0"], " pour réorganiser"],
"ONPvOb": ["Chargement de l'activité de l'agent"],
+ "ONUgxB": ["Ce conflit n'est plus disponible."],
"ONWvwQ": ["Envoyer"],
"ONchxy": ["total"],
"ONgEZF": ["Chargement des titres de ", ["pageTarget"]],
@@ -2341,6 +2338,7 @@
"PVSwOe": ["Réorientation : attente de l’arrêt de l’exécution en cours…"],
"PVUn_c": ["Ouvrir le dossier"],
"PVggyD": ["Schémas de frontmatter"],
+ "PWh9Ii": ["Appliquer les modifications"],
"PWqtgd": ["Chargement du chat"],
"PXaT32": ["Le serveur a renvoyé une réponse de cibles de compétences incomplète."],
"PYmp-0": ["Importer comme modèle"],
@@ -2429,6 +2427,7 @@
"QQbwzK": ["Aucun agent disponible."],
"QQghPu": ["Installer dans Claude Desktop"],
"QR5SP1": ["modèle créé"],
+ "QVk3SK": ["Ce fichier a été supprimé sur la branche entrante (conflit modify-delete)."],
"QWdKwH": ["Déplacer"],
"QYTOaN": ["Vous pourrez changer cela plus tard dans <0>Paramètres → Synchronisation</0>."],
"QYfQdv": ["CLI ", ["displayName"]],
@@ -2865,6 +2864,7 @@
],
"VIwCaD": ["Entrée"],
"VJaBca": ["Choisir un dossier de compétence"],
+ "VL6VsE": ["Accepter l’actuel"],
"VM7H66": ["Ce fichier est binaire et ne peut pas être affiché comme du texte."],
"VMlRqi": ["Masquer les détails"],
"VNNRfN": ["définir comme source"],
@@ -3126,7 +3126,7 @@
"Impossible de redémarrer le serveur — un autre processus le détient. Quittez les autres fenêtres OpenKnowledge de ce projet, puis réessayez."
],
"Xv_ijG": ["https://github.com/owner/repo ou owner/repo"],
- "XyOUTJ": ["Quitter la fusion"],
+ "XzL7x7": ["Rouvrez ", ["filePath"], " pour continuer à modifier."],
"Xzy0s0": ["Retirer ", ["fullLabel"], " du contexte"],
"Y-Urt2": ["Équation mathématique en bloc rendue avec KaTeX à partir d'une source LaTeX."],
"Y1QMlM": ["Configurer"],
@@ -3181,6 +3181,7 @@
"YW7Q86": [
"Les paramètres de recherche ne sont pas encore chargés — réessayez dans un instant"
],
+ "YWK2zy": ["Différences du conflit pour ", ["fileName"]],
"Y_GpJd": ["La demande de téléchargement de ", ["0"], " a expiré."],
"Y_ZQ6l": ["Installation de ", ["agentName"], "…"],
"Y_iImT": ["Fichier ", ["identity"], " impossible à résoudre. Accéder à la référence."],
@@ -3363,6 +3364,7 @@
"Vous avez choisi votre répertoire personnel. OpenKnowledge indexera tout ce qu'il contient — c'est volumineux et cela peut faire remonter des fichiers personnels."
],
"_SDGzH": ["Continuer dans le navigateur"],
+ "_SkqfM": ["Accepter l’entrant"],
"_TDESN": [
"Erreur réseau - ",
["kind"],
@@ -3931,7 +3933,6 @@
}
]
],
- "g3UF2V": ["Accepter"],
"g4WlQK": [
"La gestion des outils IA du projet n'est disponible que dans l'application de bureau OpenKnowledge."
],
@@ -3952,6 +3953,7 @@
"gAhHu7": [
"La correction automatique ne s'applique qu'aux problèmes ayant une correction mécanique connue."
],
+ "gBCeDq": ["Aucun ancêtre commun : les deux branches ont ajouté ce fichier (conflit add/add)."],
"gBbxn_": ["Vérification de l'état de connexion"],
"gDkNHk": ["Voulez-vous vraiment supprimer « ", ["name"], " » ?"],
"gGVP4q": [
@@ -4044,6 +4046,7 @@
"Gardez une trace écrite de la façon dont votre produit se construit. Un espace pour proposer des idées, consigner des décisions, rédiger des spécifications et noter ce que vous avez appris après un incident."
],
"hCattk": ["OpenKnowledge a importé ", ["source"]],
+ "hCghAK": ["Ce conflit est résolu."],
"hDEaQu": ["Connectez OpenKnowledge aux autres outils que vous utilisez."],
"hDKtoF": ["il y a ", ["diffHrs"], " h"],
"hDoLrm": ["Retirer ", ["projectName"], " des projets récents"],
@@ -4274,6 +4277,11 @@
"Intègre une page externe dans une iframe en ligne (docs, démos, Figma, CodeSandbox)."
],
"jTUxaN": ["Activer Auto (Tirer seulement)"],
+ "jTdrn1": [
+ "Impossible de vérifier si ",
+ ["filePath"],
+ " est toujours en conflit — nouvelle tentative."
+ ],
"jWzDfC": ["Vérification des outils IA dont vous disposez"],
"jZ_E5M": ["Échec de la récupération — consultez les journaux du serveur pour les détails."],
"j_Z6g7": ["Valeur par défaut partagée"],
@@ -4480,7 +4488,6 @@
"Un chemin à l'intérieur de la compétence — n'importe quel dossier convient (par ex. references/notes.md). Les dossiers du chemin sont créés pour vous."
],
"lPkjpD": ["Envoyé ", ["pushed"]],
- "lPzyrU": ["Tous les blocs sont résolus"],
"lS83Sg": ["Impossible d’accéder au presse-papiers."],
"lScd1O": [
"Les diaporamas Slidev s'ouvrent uniquement dans l'application de bureau OpenKnowledge."
@@ -4578,6 +4585,7 @@
"Organise mes spécifications existantes en un index lié, groupé par domaine, et signale celles qui ont divergé du code actuel."
],
"mPzgTS": ["Ouvrir ", ["docName"]],
+ "mR3uQg": ["Ce fichier a été supprimé sur la branche actuelle (conflit delete-modify)."],
"mToVM9": ["Envoyer un message à ", ["agentName"]],
"mU3j1b": ["Retirer l'élément ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (conflit)"],
@@ -4866,6 +4874,9 @@
" a été ouvert, car il contient un dossier .git"
],
"pZAs1T": ["Échec du chargement des liens sortants"],
+ "pZaMLc": [
+ "Ce fichier contient des lignes qui ressemblent à des marqueurs de conflit, si bien que les limites du conflit ne peuvent pas être lues de façon fiable. Résolvez-le à la main ou avec Demander à l'IA."
+ ],
"paCw0z": [
"tout ce qui se trouve sous les dossiers ",
["0"],
@@ -5533,6 +5544,7 @@
"wU8WyK": ["Champs d'élément"],
"wVa83H": ["Impossible de créer le rapport"],
"wWtVYd": ["Saisissez un port entre 1 et 65535."],
+ "wXFalZ": ["Aperçu de ", ["filename"]],
"wXO4Tg": ["il y a ", ["hrs"], " h"],
"wXw19Y": ["« ", ["projectName"], " » retiré des projets récents. Son dossier n'existe plus."],
"wZPUJx": ["« ", ["0"], " »"],
@@ -5654,6 +5666,7 @@
"y46m5r": ["L'application de bureau ne répond pas. Actualisez et réessayez."],
"y5FUYi": ["Menu de suggestions ouvert"],
"y5UgU8": ["Désactiver ", ["0"]],
+ "y6HGwM": ["Conflits restants : ", ["liveRemaining"], "."],
"y8B54M": ["Impossible d'envoyer votre invite — veuillez réessayer."],
"yCX4jp": [" Votre sélection n'a pas pu être restaurée."],
"yDlK9k": ["Résolvez le conflit sur ", ["files"], " avant de supprimer."],
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 8a1377424..7b9b63500 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} se trouve en dehors de ce projet, dans <0>{source}</0> : les
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {car.} many {car.} other {car.}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# bloc non résolu} many {# blocs non résolus} other {# blocs non résolus}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (vide)"
@@ -1331,9 +1327,32 @@ msgstr "À propos de {appName}"
msgid "Above"
msgstr "Au-dessus"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "Accepter"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "Accepter les deux"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "Accepter les deux versions pour le conflit {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "Accepter l’actuel"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "Accepter la version actuelle pour le conflit {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "Accepter l’entrant"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "Accepter la version entrante pour le conflit {0}"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "{editor} aligné sur la source (ses octets sont sauvegardés)"
msgid "All"
msgstr "Tout"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "Tous les conflits sont résolus. Appliquez les modifications pour enregistrer."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "Tous les fichiers"
@@ -1679,10 +1702,6 @@ msgstr "Tous les fichiers"
msgid "All files are hidden by view filters."
msgstr "Tous les fichiers sont masqués par les filtres d'affichage."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "Tous les blocs sont résolus"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "Toutes les étiquettes"
@@ -1842,6 +1861,10 @@ msgstr "S'applique lorsque vous reprendrez cette conversation"
msgid "Apply and restart project server"
msgstr "Appliquer et redémarrer le serveur du projet"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "Appliquer les modifications"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "Appliquer le lien"
@@ -3128,6 +3151,10 @@ msgstr "conflit"
msgid "Conflict"
msgstr "Conflit"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "Différences du conflit pour {fileName}"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "Fichiers en conflit"
@@ -3141,6 +3168,10 @@ msgstr "Fichiers en conflit : {0}."
msgid "Conflicts"
msgstr "Conflits"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "Conflits restants : {liveRemaining}."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "Connecter"
@@ -3632,6 +3663,10 @@ msgstr "Impossible d'ajouter ce commentaire."
msgid "Couldn't apply the change: {0}"
msgstr "Impossible d'appliquer la modification : {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "Impossible de vérifier si {filePath} est toujours en conflit — nouvelle tentative."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "Impossible d'effacer la clé — veuillez réessayer."
@@ -5447,10 +5482,6 @@ msgstr "Quitter"
msgid "exit {0}"
msgstr "quitter {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "Quitter la fusion"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "Masquer le dossier"
msgid "Hide HTML preview"
msgstr "Masquer l'aperçu HTML"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "Masquer l’original"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "Masquer les autres"
@@ -8559,6 +8594,10 @@ msgstr "Aucun commentaire dans ce projet pour l'instant. Commentez un passage po
msgid "No comments yet. Select text in the document to add one."
msgstr "Pas encore de commentaires. Sélectionnez du texte dans le document pour en ajouter un."
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "Aucun ancêtre commun : les deux branches ont ajouté ce fichier (conflit add/add)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "Aucune modification de contenu dans cette version."
@@ -10151,6 +10190,10 @@ msgstr "Appuyez sur le soleil ou la lune de « Custom » ci-dessus pour utiliser
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "Les navigateurs d'aperçu ne peuvent pas copier automatiquement. Faites Cmd/Ctrl+C sur l'URL ci-dessus, ou ouvrez OK dans l'application de bureau."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "Aperçu de {filename}"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "Aperçu de la capture d'écran"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "Corbeille"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "Rétablir"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "Réinstallation"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "Rejeter"
@@ -10854,6 +10897,10 @@ msgstr "Rendu"
msgid "Reopen"
msgstr "Rouvrir"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "Rouvrez {filePath} pour continuer à modifier."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "Rouvrir un chat précédent"
@@ -11331,10 +11378,6 @@ msgstr "Échec de l'enregistrement : {error}"
msgid "Save queued message"
msgstr "Enregistrer le message en file d'attente"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "Enregistrer la résolution"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "Enregistrer ce commentaire (Entrée)"
@@ -12095,6 +12138,10 @@ msgstr "Afficher ou masquer les fichiers"
msgid "Show or hide Terminal"
msgstr "Afficher ou masquer Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "Afficher l’original"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "Merci pour ce rapport !"
msgid "That branch is already open in another worktree."
msgstr "Cette branche est déjà ouverte dans un autre worktree."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "Ce conflit n'est plus disponible."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "Cela n'a pas abouti. Consultez les journaux du serveur et réessayez."
@@ -13570,6 +13621,10 @@ msgstr "Cela se configure dans Paramètres > Outils IA et CLI"
msgid "This comment is on the whole property"
msgstr "Ce commentaire porte sur toute la propriété"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "Ce conflit est résolu."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "Ce document"
@@ -13610,6 +13665,10 @@ msgstr "Ce champ porte des mots-clés de schéma supplémentaires que l'éditeur
msgid "This file can't be opened in the text editor."
msgstr "Ce fichier ne peut pas être ouvert dans l'éditeur de texte."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "Ce fichier contient des lignes qui ressemblent à des marqueurs de conflit, si bien que les limites du conflit ne peuvent pas être lues de façon fiable. Résolvez-le à la main ou avec Demander à l'IA."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "Ce fichier est introuvable."
@@ -13622,6 +13681,14 @@ msgstr "Ce fichier est binaire et ne peut pas être affiché comme du texte."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "Ce fichier est trop volumineux pour l'éditeur de texte intégré (limite de 1 Mo). Utilisez Ouvrir le fichier ci-dessous pour l'ouvrir dans une autre application."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "Ce fichier a été supprimé sur la branche actuelle (conflit delete-modify)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "Ce fichier a été supprimé sur la branche entrante (conflit modify-delete)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "Ce dossier ne contient pas de dépôt git. Choisir un autre dossier ?"
@@ -14202,7 +14269,7 @@ msgstr "Dernière modification annulée sur {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "Annule ou rétablit vos propres modifications, en laissant en place cell
msgid "Undo to this edit?"
msgstr "Annuler jusqu'à cette modification ?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "Annulez vos résolutions pour modifier ceci."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Annulez, rétablissez, ou parcourez les changements de sélection dans le volet Modifier la source ou dans un champ de propriété de type code."
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index e7194e9d0..4d8764cc7 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -229,6 +229,7 @@
"2XQ8Ww": ["एजेंट के संपादन करने पर पूर्वावलोकन खोलें"],
"2YOwme": ["पुनः आरंभ हुआ — अब v", ["appRuntime"], " चल रहा है।"],
"2YZwPB": ["आगे जाने वाले लिंक की प्रतिक्रिया अपेक्षित आकार से मेल नहीं खाई।"],
+ "2Yt22K": ["मूल छिपाएँ"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["पैनल छिपाएँ (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["एक मान्य URL डालें (उदाहरण के लिए https://api.openai.com/v1)।"],
@@ -360,6 +361,7 @@
"4Sxexw": ["स्रोत में पूर्ववत या फिर से करें"],
"4TzU0n": ["आरंभ करें"],
"4Vgtaz": ["बोर्ड तक नहीं पहुँचा जा सका। हो सकता है वह मौजूद न हो, या सर्वर ऑफ़लाइन हो।"],
+ "4_-TKi": ["कॉन्फ़्लिक्ट ", ["0"], " के लिए दोनों संस्करण स्वीकारें"],
"4buZWd": [["path"], " से विरासत में मिला"],
"4c_a6S": ["अभी कुछ भी सेट नहीं।"],
"4d0VYJ": ["हम इस नाम से एक सुरक्षित थीम ID बनाएँगे।"],
@@ -384,6 +386,7 @@
"4sUdTJ": ["थीम वाला पूर्वावलोकन"],
"4uNLmk": ["खींचा जा रहा है"],
"4v2Yyz": ["जब फ़ोकस Files साइडबार में हो तब हर दिखाई देने वाली फ़ाइल-ट्री पंक्ति चुनें।"],
+ "4vn1gP": ["सभी कॉन्फ़्लिक्ट हल हो गए। सहेजने के लिए परिवर्तन लागू करें।"],
"4xtLTl": ["छिपा हुआ फ़ोल्डर “", ["basename"], "”"],
"4zGlN_": ["छवि URL चिपकाएँ या अपलोड पर क्लिक करें"],
"4z_1j2": ["रेंडर किया गया"],
@@ -633,9 +636,6 @@
"89TtiD": ["प्रोजेक्ट रूट में टेम्पलेट \"", ["displayTitle"], "\" (", ["fileName"], ") से नई फ़ाइल"],
"8AjnFz": ["\"", ["0"], "\" पहले ही आयात किया जा चुका था (समान सामग्री)।"],
"8F1i42": ["पेज नहीं मिला"],
- "8FqTCr": [
- ["chunksRemaining", "plural", { "one": ["#", " अनसुलझा हंक"], "other": ["#", " अनसुलझे हंक"] }]
- ],
"8Gzz2G": [["worktreeOf"], " का वर्कट्री"],
"8HvJlU": [
"इस जैसे नाम वाली एक अलग स्किल ",
@@ -841,6 +841,7 @@
],
"Aif3E7": ["अर्थ-आधारित खोज सक्षम करें"],
"AkA6DO": [["0"], " प्लगइन का हिस्सा — केवल पढ़ने के लिए; प्रति संपादित करने के लिए इसे खोलें"],
+ "Al8HPP": ["कॉन्फ़्लिक्ट ", ["0"], " के लिए मौजूदा संस्करण स्वीकारें"],
"Am78jY": ["क्रम बदलने के लिए ", ["keyName"], " खींचें"],
"ApeA0n": [["docName"], " पर ", ["dropCount"], " संपादन पूर्ववत किए गए"],
"Aq-O0x": ["स्थिति"],
@@ -1566,6 +1567,7 @@
["componentName"],
"> एक ज्ञात कंपोनेंट नहीं है। इसे कहीं और उपयोग करने के लिए स्रोत कॉपी करें, या ब्लॉक हटा दें।"
],
+ "KhNkCq": ["दोनों स्वीकारें"],
"Khxcyu": ["इस प्रोजेक्ट के लिए टर्मिनल पहुँच सक्षम नहीं है।"],
"KjTmeO": ["इस साझा सामग्री को खोलने के लिए OpenKnowledge अपडेट करें।"],
"KkEAud": ["मौजूदा दस्तावेज़ या फ़ोल्डर संदर्भ से एक फ़ाइल बनाएँ।"],
@@ -1638,7 +1640,6 @@
"LaskKp": ["चैट में भेजें (", ["0"], ")"],
"Lbl6KA": [["0"], " से इंस्टॉल नहीं किया जा सका: ", ["1"]],
"LbmLyU": ["इस टूल के कॉन्फ़िग को सुरक्षित रूप से संपादित नहीं किया जा सकता"],
- "Lcehxn": ["समाधान सहेजें"],
"LdABLa": [["target"], " नहीं खोला जा सका। इसे हाथ से खोलने की कोशिश करें।"],
"LdKIHS": ["एक स्पेक का मसौदा बनाएँ"],
"LeGeTf": ["GitHub पर OpenKnowledge"],
@@ -1651,6 +1652,7 @@
],
"LhWYpm": ["अन्य OK पथ अपस्ट्रीम ट्रैक किए जाते हैं:"],
"Li4U-T": [["title"], " के बारे में और जानें"],
+ "LkQRL8": ["मूल दिखाएँ"],
"LlHqdU": ["प्रोजेक्ट आरंभ किया जा रहा है"],
"LlJ8LD": [
"कॉन्फ़िग साझाकरण अपरिवर्तित है: अपस्ट्रीम में ",
@@ -1806,6 +1808,7 @@
"Ni4b7h": [
"प्रोजेक्ट प्लगइन आपके प्रोजेक्ट का लेखन मानक हैं — उन्हें यहाँ चालू या बंद करें। हर सक्षम प्लगइन को सेटिंग साइडबार में Plugins के अंतर्गत अपना पेज मिलता है।"
],
+ "NjnHNV": ["कॉन्फ़्लिक्ट ", ["0"], " के लिए आने वाला संस्करण स्वीकारें"],
"NjrIak": ["फ़ाइल: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": [["tag"], " संपादित करें"],
"NkXEFS": ["बहाली विफल — दस्तावेज़ अपरिवर्तित"],
@@ -1815,6 +1818,7 @@
"NnQapF": ["AI ", ["targetDisplayName"], " से खोलें"],
"NoY1k4": ["सर्वर प्रतिक्रिया की संरचना अमान्य है"],
"NpC29w": ["मौजूदा सूची आइटम से एक नया सूची आइटम बनाएँ।"],
+ "NpRLRj": ["इसे बदलने के लिए अपने समाधान पूर्ववत करें।"],
"NrFwux": ["सामग्री नियम सहेजने में विफल — ", ["0"]],
"Ns0z5o": [
"जब आप कोई प्रकाशित स्किल इंस्टॉल करें, तो स्किल निर्देशिका (skills.sh) को बताएँ ताकि उसकी इंस्टॉल गिनती सही रहे। यह स्किल का नाम, उसकी स्रोत रिपॉज़िटरी, और वह किन एजेंट टूल में गई यह भेजता है — फ़ाइलों की सामग्री कभी नहीं, और किसी निजी, स्थानीय या हाथ से लिखे स्रोत की स्किल के लिए कभी नहीं। हर मशीन पर हर स्किल के लिए एक बार।"
@@ -1869,6 +1873,7 @@
"OLBz-_": ["Mermaid आरेख रेंडर नहीं हो सका।"],
"OLIKgw": ["क्रम बदलने के लिए आइटम ", ["0"], " खींचें"],
"ONPvOb": ["एजेंट गतिविधि लोड हो रही है"],
+ "ONUgxB": ["वह कॉन्फ़्लिक्ट अब उपलब्ध नहीं है।"],
"ONWvwQ": ["अपलोड करें"],
"ONchxy": ["कुल"],
"ONgEZF": [["pageTarget"], " के शीर्षक लोड हो रहे हैं"],
@@ -1950,6 +1955,7 @@
"PVSwOe": ["दिशा बदली जा रही है — मौजूदा प्रक्रिया के रुकने की प्रतीक्षा…"],
"PVUn_c": ["फ़ोल्डर खोलें"],
"PVggyD": ["Frontmatter स्कीमा"],
+ "PWh9Ii": ["परिवर्तन लागू करें"],
"PWqtgd": ["चैट लोड हो रही है"],
"PXaT32": ["सर्वर ने अधूरी स्किल-टारगेट प्रतिक्रिया लौटाई।"],
"PYmp-0": ["टेम्पलेट के रूप में आयात करें"],
@@ -2026,6 +2032,7 @@
"QQbwzK": ["कोई एजेंट उपलब्ध नहीं।"],
"QQghPu": ["Claude Desktop में इंस्टॉल करें"],
"QR5SP1": ["टेम्पलेट बनाया गया"],
+ "QVk3SK": ["यह फ़ाइल आने वाली ब्रांच पर हटा दी गई थी (modify-delete विरोध)।"],
"QWdKwH": ["हिलाएँ"],
"QYTOaN": ["आप इसे बाद में <0>Settings → Sync</0> में बदल सकते हैं।"],
"QYfQdv": [["displayName"], " CLI"],
@@ -2379,6 +2386,7 @@
],
"VIwCaD": ["प्रविष्टि"],
"VJaBca": ["कोई स्किल फ़ोल्डर चुनें"],
+ "VL6VsE": ["वर्तमान स्वीकारें"],
"VM7H66": ["यह फ़ाइल बाइनरी है और इसे पाठ के रूप में नहीं दिखाया जा सकता।"],
"VMlRqi": ["विवरण छिपाएँ"],
"VNNRfN": ["स्रोत बनाएँ"],
@@ -2584,7 +2592,7 @@
"सर्वर पुनः आरंभ नहीं किया जा सका — कोई दूसरी प्रक्रिया उस पर अधिकार रखती है। इस प्रोजेक्ट की बाकी OpenKnowledge विंडो बंद करें, फिर कोशिश करें।"
],
"Xv_ijG": ["https://github.com/owner/repo या owner/repo"],
- "XyOUTJ": ["मर्ज से बाहर निकलें"],
+ "XzL7x7": ["संपादन जारी रखने के लिए ", ["filePath"], " फिर से खोलें।"],
"Xzy0s0": [["fullLabel"], " को संदर्भ से हटाएँ"],
"Y-Urt2": ["एक LaTeX स्रोत स्ट्रिंग से KaTeX द्वारा रेंडर किया गया ब्लॉक गणित समीकरण।"],
"Y1QMlM": ["सेट अप करें"],
@@ -2626,6 +2634,7 @@
"YSFv5w": ["कोई git रिपॉज़िटरी नहीं — कॉन्फ़िग साझाकरण यहाँ लागू नहीं होता।"],
"YTLmTM": ["मूल <0>.git</0> फ़ोल्डर हटाएँ"],
"YW7Q86": ["खोज सेटिंग अभी लोड नहीं हुई — कुछ देर बाद फिर कोशिश करें"],
+ "YWK2zy": [["fileName"], " के लिए कॉन्फ़्लिक्ट डिफ़"],
"Y_GpJd": [["0"], " के डाउनलोड अनुरोध का समय समाप्त हो गया।"],
"Y_ZQ6l": [["agentName"], " इंस्टॉल किया जा रहा है…"],
"Y_iImT": ["हल न की जा सकने वाली फ़ाइल ", ["identity"], "। संदर्भ पर जाएँ।"],
@@ -2796,6 +2805,7 @@
"आपने अपनी होम निर्देशिका चुनी। OpenKnowledge आपके पूरे होम वृक्ष की हर चीज़ अनुक्रमित करेगा — यह बड़ा है और इससे निजी फ़ाइलें सामने आ सकती हैं।"
],
"_SDGzH": ["ब्राउज़र में जारी रखें"],
+ "_SkqfM": ["आने वाला स्वीकारें"],
"_TDESN": ["नेटवर्क त्रुटि - ", ["kind"], " \"", ["createdPath"], "\" अब भी डिस्क पर मौजूद है"],
"_TF8ep": ["PDF रेंडर करने में विफल"],
"_W-elG": ["(इनलाइन)"],
@@ -3237,7 +3247,6 @@
}
]
],
- "g3UF2V": ["स्वीकारें"],
"g4WlQK": ["प्रोजेक्ट के AI टूल सँभालना केवल OpenKnowledge डेस्कटॉप ऐप में उपलब्ध है।"],
"g4XBm0": ["छोटा अनुभाग शीर्षक।"],
"g4e0hS": [["agentName"], " से पूछें"],
@@ -3254,6 +3263,7 @@
],
"g9Nj4l": ["// नोट"],
"gAhHu7": ["स्वत: सुधार केवल उन्हीं समस्याओं पर लागू होता है जिनका कोई ज्ञात यांत्रिक समाधान है।"],
+ "gBCeDq": ["कोई साझा पूर्वज नहीं — दोनों ब्रांच ने यह फ़ाइल जोड़ी (add/add विरोध)।"],
"gBbxn_": ["साइन-इन स्थिति जाँची जा रही है"],
"gDkNHk": ["क्या आप वाकई \"", ["name"], "\" को हटाना चाहते हैं?"],
"gGVP4q": ["<0>+</0> <1/> <2>स्किल बनाएँ</2> <3/> <4>स्किल अपलोड करें</4> पर क्लिक करें।"],
@@ -3330,6 +3340,7 @@
"अपना उत्पाद कैसे बनता है इसका लिखित लेखा रखें। विचार प्रस्तावित करने, निर्णय दर्ज करने, स्पेक लिखने और किसी गड़बड़ी के बाद सीखी बातों को सहेजने का एक घर।"
],
"hCattk": ["OpenKnowledge ने ", ["source"], " आयात किया"],
+ "hCghAK": ["यह विरोध हल हो गया है।"],
"hDEaQu": ["OpenKnowledge को अपने उपयोग के अन्य टूल से जोड़ें।"],
"hDKtoF": [["diffHrs"], " घंटे पहले"],
"hDoLrm": [["projectName"], " को हाल के प्रोजेक्ट से हटाएँ"],
@@ -3540,6 +3551,7 @@
"jSY41h": ["\"", ["docName"], "\" में बहुत समय लगा। अपना कनेक्शन जाँचें।"],
"jTLWxh": ["एक बाहरी पेज को इनलाइन iframe में एम्बेड करें (दस्तावेज़, डेमो, Figma, CodeSandbox)।"],
"jTUxaN": ["स्वचालित (केवल खींचें) चालू करें"],
+ "jTdrn1": [["filePath"], " में अब भी कॉन्फ़्लिक्ट है या नहीं, जाँचा नहीं जा सका — पुनः प्रयास जारी।"],
"jWzDfC": ["जाँच रहे हैं कि आपके पास कौन-से AI टूल हैं"],
"jZ_E5M": ["फ़ेच विफल — विवरण के लिए सर्वर लॉग देखें।"],
"j_Z6g7": ["साझा डिफ़ॉल्ट"],
@@ -3730,7 +3742,6 @@
"स्किल के भीतर का एक पथ — कोई भी फ़ोल्डर चलेगा (जैसे references/notes.md)। पथ के फ़ोल्डर आपके लिए बना दिए जाते हैं।"
],
"lPkjpD": [["pushed"], " भेजा"],
- "lPzyrU": ["सभी हंक सुलझा दिए गए"],
"lS83Sg": ["क्लिपबोर्ड तक नहीं पहुँचा जा सका।"],
"lScd1O": ["Slidev डेक केवल OpenKnowledge डेस्कटॉप ऐप में खुलते हैं।"],
"lT6wjt": ["बोर्ड फैलाएँ"],
@@ -3803,6 +3814,7 @@
"मेरी मौजूदा स्पेक को क्षेत्र के अनुसार समूहित एक जुड़ी हुई अनुक्रमणिका में व्यवस्थित करें, और जो मौजूदा कोड से तालमेल खो चुकी हों उन्हें चिह्नित करें।"
],
"mPzgTS": [["docName"], " खोलें"],
+ "mR3uQg": ["यह फ़ाइल वर्तमान ब्रांच पर हटा दी गई थी (delete-modify विरोध)।"],
"mToVM9": [["agentName"], " को संदेश भेजें"],
"mU3j1b": ["आइटम ", ["0"], " हटाएँ"],
"mVFyH-": [["accessibleLabel"], " (टकराव)"],
@@ -4056,6 +4068,9 @@
" का मूल फ़ोल्डर खोला गया, क्योंकि उसमें .git फ़ोल्डर है"
],
"pZAs1T": ["बाहर जाने वाले लिंक लोड करने में विफल"],
+ "pZaMLc": [
+ "इस फ़ाइल में ऐसी पंक्तियाँ हैं जो कॉन्फ़्लिक्ट मार्कर जैसी दिखती हैं, इसलिए कॉन्फ़्लिक्ट की सीमाएँ भरोसे से नहीं पढ़ी जा सकतीं। इसे स्वयं हल करें या AI से पूछें का उपयोग करें।"
+ ],
"paCw0z": [["1"], "/ के भीतर मौजूद ", ["0"], "/ फ़ोल्डरों के अंतर्गत सब कुछ"],
"pajIrl": ["टर्मिनल बंद नहीं किया जा सका: ", ["0"]],
"pbwTg6": [["seconds"], " सेकंड पहले"],
@@ -4577,6 +4592,7 @@
"wU8WyK": ["तत्व फ़ील्ड"],
"wVa83H": ["रिपोर्ट नहीं बनाई जा सकी"],
"wWtVYd": ["1 और 65535 के बीच एक port दर्ज करें।"],
+ "wXFalZ": [["filename"], " का पूर्वावलोकन"],
"wXO4Tg": [["hrs"], " घंटे पहले"],
"wXw19Y": [
"\"",
@@ -4692,6 +4708,7 @@
"y46m5r": ["डेस्कटॉप ऐप प्रतिक्रिया नहीं दे रहा। ताज़ा करें और फिर कोशिश करें।"],
"y5FUYi": ["सुझाव मेन्यू खुला"],
"y5UgU8": [["0"], " अक्षम करें"],
+ "y6HGwM": ["शेष कॉन्फ़्लिक्ट: ", ["liveRemaining"], "।"],
"y8B54M": ["आपका प्रॉम्प्ट नहीं भेजा जा सका — कृपया फिर कोशिश करें।"],
"yCX4jp": [" आपका चयन बहाल नहीं किया जा सका।"],
"yDlK9k": ["हटाने से पहले ", ["files"], " का विरोध हल करें।"],
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 45f9f51d6..a77f917fb 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} इस प्रोजेक्ट के बाहर, <0>{s
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {अक्षर} other {अक्षर}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# अनसुलझा हंक} other {# अनसुलझे हंक}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (खाली)"
@@ -1327,9 +1323,32 @@ msgstr "{appName} के बारे में"
msgid "Above"
msgstr "ऊपर"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "स्वीकारें"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "दोनों स्वीकारें"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "कॉन्फ़्लिक्ट {0} के लिए दोनों संस्करण स्वीकारें"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "वर्तमान स्वीकारें"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "कॉन्फ़्लिक्ट {0} के लिए मौजूदा संस्करण स्वीकारें"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "आने वाला स्वीकारें"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "कॉन्फ़्लिक्ट {0} के लिए आने वाला संस्करण स्वीकारें"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1667,6 +1686,10 @@ msgstr "{editor} को स्रोत के अनुरूप किया
msgid "All"
msgstr "सभी"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "सभी कॉन्फ़्लिक्ट हल हो गए। सहेजने के लिए परिवर्तन लागू करें।"
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "सभी फ़ाइलें"
@@ -1675,10 +1698,6 @@ msgstr "सभी फ़ाइलें"
msgid "All files are hidden by view filters."
msgstr "सभी फ़ाइलें दृश्य फ़िल्टर द्वारा छिपी हैं।"
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "सभी हंक सुलझा दिए गए"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "सभी टैग"
@@ -1838,6 +1857,10 @@ msgstr "जब आप यह बातचीत फिर से शुरू
msgid "Apply and restart project server"
msgstr "लागू करें और प्रोजेक्ट सर्वर पुनः प्रारंभ करें"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "परिवर्तन लागू करें"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "लिंक लागू करें"
@@ -3124,6 +3147,10 @@ msgstr "टकराव"
msgid "Conflict"
msgstr "टकराव"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "{fileName} के लिए कॉन्फ़्लिक्ट डिफ़"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "विरोध वाली फ़ाइलें"
@@ -3137,6 +3164,10 @@ msgstr "विरोधी फ़ाइलें: {0}।"
msgid "Conflicts"
msgstr "विरोध"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "शेष कॉन्फ़्लिक्ट: {liveRemaining}।"
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "जोड़ें"
@@ -3628,6 +3659,10 @@ msgstr "वह टिप्पणी नहीं जोड़ी जा सक
msgid "Couldn't apply the change: {0}"
msgstr "बदलाव लागू नहीं किया जा सका: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "{filePath} में अब भी कॉन्फ़्लिक्ट है या नहीं, जाँचा नहीं जा सका — पुनः प्रयास जारी।"
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "कुंजी साफ़ नहीं की जा सकी — कृपया फिर कोशिश करें।"
@@ -5443,10 +5478,6 @@ msgstr "बाहर निकलें"
msgid "exit {0}"
msgstr "निकास {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "मर्ज से बाहर निकलें"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6559,6 +6590,10 @@ msgstr "फ़ोल्डर छिपाएँ"
msgid "Hide HTML preview"
msgstr "HTML पूर्वावलोकन छिपाएँ"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "मूल छिपाएँ"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "अन्य छिपाएँ"
@@ -8555,6 +8590,10 @@ msgstr "इस प्रोजेक्ट में अभी कोई टि
msgid "No comments yet. Select text in the document to add one."
msgstr "अभी कोई टिप्पणी नहीं। कोई जोड़ने के लिए दस्तावेज़ में पाठ चुनें।"
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "कोई साझा पूर्वज नहीं — दोनों ब्रांच ने यह फ़ाइल जोड़ी (add/add विरोध)।"
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "इस संस्करण में सामग्री का कोई बदलाव नहीं।"
@@ -10147,6 +10186,10 @@ msgstr "इस थीम का उपयोग करने के लिए
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "पूर्वावलोकन ब्राउज़र अपने आप कॉपी नहीं कर सकते। ऊपर दिए URL पर Cmd/Ctrl+C का उपयोग करें, या OK को डेस्कटॉप ऐप में खोलें।"
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "{filename} का पूर्वावलोकन"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "स्क्रीनशॉट का पूर्वावलोकन"
@@ -10564,6 +10607,7 @@ msgid "Recycle Bin"
msgstr "रीसायकल बिन"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "फिर से करें"
@@ -10600,7 +10644,6 @@ msgid "Reinstalling"
msgstr "फिर से इंस्टॉल किया जा रहा है"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "अस्वीकारें"
@@ -10850,6 +10893,10 @@ msgstr "रेंडर किया गया"
msgid "Reopen"
msgstr "फिर से खोलें"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "संपादन जारी रखने के लिए {filePath} फिर से खोलें।"
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "पिछली चैट फिर से खोलें"
@@ -11327,10 +11374,6 @@ msgstr "सहेजना विफल: {error}"
msgid "Save queued message"
msgstr "कतार में लगा संदेश सहेजें"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "समाधान सहेजें"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "यह टिप्पणी सहेजें (Enter)"
@@ -12091,6 +12134,10 @@ msgstr "Files दिखाएँ या छिपाएँ"
msgid "Show or hide Terminal"
msgstr "Terminal दिखाएँ या छिपाएँ"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "मूल दिखाएँ"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13096,6 +13143,10 @@ msgstr "रिपोर्ट के लिए धन्यवाद!"
msgid "That branch is already open in another worktree."
msgstr "वह ब्रांच पहले से किसी दूसरे वर्कट्री में खुली है।"
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "वह कॉन्फ़्लिक्ट अब उपलब्ध नहीं है।"
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "यह पूरा नहीं हुआ। सर्वर लॉग देखें और फिर से कोशिश करें।"
@@ -13566,6 +13617,10 @@ msgstr "इसे Settings > AI tools & CLI में कॉन्फ़िग
msgid "This comment is on the whole property"
msgstr "यह टिप्पणी पूरी प्रॉपर्टी पर है"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "यह विरोध हल हो गया है।"
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "यह दस्तावेज़"
@@ -13606,6 +13661,10 @@ msgstr "इस फ़ील्ड में अतिरिक्त स्क
msgid "This file can't be opened in the text editor."
msgstr "यह फ़ाइल पाठ संपादक में नहीं खोली जा सकती।"
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "इस फ़ाइल में ऐसी पंक्तियाँ हैं जो कॉन्फ़्लिक्ट मार्कर जैसी दिखती हैं, इसलिए कॉन्फ़्लिक्ट की सीमाएँ भरोसे से नहीं पढ़ी जा सकतीं। इसे स्वयं हल करें या AI से पूछें का उपयोग करें।"
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "यह फ़ाइल नहीं मिल सकी।"
@@ -13618,6 +13677,14 @@ msgstr "यह फ़ाइल बाइनरी है और इसे पा
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "यह फ़ाइल अंतर्निहित पाठ संपादक में खोलने के लिए बहुत बड़ी है (1 MB की सीमा)। इसे किसी दूसरे ऐप में खोलने के लिए नीचे Open file का उपयोग करें।"
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "यह फ़ाइल वर्तमान ब्रांच पर हटा दी गई थी (delete-modify विरोध)।"
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "यह फ़ाइल आने वाली ब्रांच पर हटा दी गई थी (modify-delete विरोध)।"
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "इस फ़ोल्डर में कोई git रिपॉजिटरी नहीं है। कोई दूसरा फ़ोल्डर चुनें?"
@@ -14198,7 +14265,7 @@ msgstr "{docName} पर आख़िरी संपादन पूर्व
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14228,6 +14295,10 @@ msgstr "अपने ही संपादन पूर्ववत या फ
msgid "Undo to this edit?"
msgstr "इस संपादन तक पूर्ववत करें?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "इसे बदलने के लिए अपने समाधान पूर्ववत करें।"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Edit source पैनल या कोड जैसी किसी प्रॉपर्टी फ़ील्ड में चयन के बदलाव पूर्ववत करें, फिर से करें, या एक-एक करके देखें।"
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index 76f03053d..04988dc49 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -233,6 +233,7 @@
"2XQ8Ww": ["Buka pratinjau saat agen menyunting"],
"2YOwme": ["Dimulai ulang — kini menjalankan v", ["appRuntime"], "."],
"2YZwPB": ["Respons tautan keluar tidak sesuai bentuk yang diharapkan."],
+ "2Yt22K": ["Sembunyikan versi asli"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["Sembunyikan panel (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["Masukkan URL yang valid (misalnya https://api.openai.com/v1)."],
@@ -366,6 +367,7 @@
"4Sxexw": ["Batalkan atau ulangi di sumber"],
"4TzU0n": ["Inisialisasi"],
"4Vgtaz": ["Papan tidak dapat dijangkau. Papan mungkin tidak ada, atau server sedang offline."],
+ "4_-TKi": ["Terima kedua versi untuk konflik ", ["0"]],
"4buZWd": ["Diwarisi dari ", ["path"]],
"4c_a6S": ["Belum ada yang disetel."],
"4d0VYJ": ["Kami akan membuat ID tema yang aman dari nama ini."],
@@ -396,6 +398,7 @@
"4v2Yyz": [
"Memilih semua baris pohon berkas yang terlihat ketika fokus ada di bilah sisi Berkas."
],
+ "4vn1gP": ["Semua konflik terselesaikan. Terapkan perubahan untuk menyimpan."],
"4xtLTl": ["Folder “", ["basename"], "” disembunyikan"],
"4zGlN_": ["Tempelkan URL gambar atau klik unggah"],
"4z_1j2": ["Dirender"],
@@ -659,7 +662,6 @@
],
"8AjnFz": ["\"", ["0"], "\" sudah diimpor sebelumnya (isinya sama)."],
"8F1i42": ["Halaman tidak ditemukan"],
- "8FqTCr": [["chunksRemaining", "plural", { "other": ["#", " bagian belum diselesaikan"] }]],
"8Gzz2G": ["worktree dari ", ["worktreeOf"]],
"8HvJlU": [
"Keterampilan BERBEDA dengan nama mirip ini ada di ",
@@ -864,6 +866,7 @@
],
"Aif3E7": ["Aktifkan pencarian semantik"],
"AkA6DO": ["Bagian dari plugin ", ["0"], " — hanya-baca; buka untuk menyunting salinannya"],
+ "Al8HPP": ["Terima versi saat ini untuk konflik ", ["0"]],
"Am78jY": ["Seret ", ["keyName"], " untuk menata ulang"],
"ApeA0n": [["dropCount"], " suntingan pada ", ["docName"], " dibatalkan"],
"Aq-O0x": ["status"],
@@ -1627,6 +1630,7 @@
["componentName"],
"> bukan komponen yang dikenal. Salin sumbernya untuk dipakai di tempat lain, atau hapus bloknya."
],
+ "KhNkCq": ["Terima keduanya"],
"Khxcyu": ["Akses terminal belum diaktifkan untuk proyek ini."],
"KjTmeO": ["Perbarui OpenKnowledge untuk membuka konten berbagi ini."],
"KkEAud": ["Membuat berkas dari konteks dokumen atau folder saat ini."],
@@ -1702,7 +1706,6 @@
"LaskKp": ["Kirim ke obrolan (", ["0"], ")"],
"Lbl6KA": ["Tidak bisa memasang dari ", ["0"], ": ", ["1"]],
"LbmLyU": ["Konfigurasi alat ini tidak bisa disunting dengan aman"],
- "Lcehxn": ["Simpan penyelesaian"],
"LdABLa": [["target"], " tidak dapat dibuka. Coba buka secara manual."],
"LdKIHS": ["Susun spesifikasi"],
"LeGeTf": ["OpenKnowledge di GitHub"],
@@ -1715,6 +1718,7 @@
],
"LhWYpm": ["Ada jalur OK lain yang dilacak di remote:"],
"Li4U-T": ["Pelajari lebih lanjut tentang ", ["title"]],
+ "LkQRL8": ["Tampilkan versi asli"],
"LlHqdU": ["Menginisialisasi proyek"],
"LlJ8LD": [
"Berbagi konfigurasi tidak berubah: ",
@@ -1868,6 +1872,7 @@
"Ni4b7h": [
"Plugin proyek adalah standar penulisan proyek Anda — nyalakan atau matikan di sini. Setiap plugin yang aktif mendapat halamannya sendiri di bawah Plugin pada bilah sisi pengaturan."
],
+ "NjnHNV": ["Terima versi masuk untuk konflik ", ["0"]],
"NjrIak": ["Berkas: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["Sunting ", ["tag"]],
"NkXEFS": ["Gagal memulihkan — dokumen tidak berubah"],
@@ -1877,6 +1882,7 @@
"NnQapF": ["Buka dengan AI ", ["targetDisplayName"]],
"NoY1k4": ["Bentuk respons server tidak valid"],
"NpC29w": ["Membuat item daftar baru dari item daftar saat ini."],
+ "NpRLRj": ["Batalkan resolusi Anda untuk mengubah ini."],
"NrFwux": ["Gagal menyimpan aturan konten — ", ["0"]],
"Ns0z5o": [
"Ketika Anda memasang keterampilan yang diterbitkan, direktori keterampilan (skills.sh) diberi tahu agar hitungan pemasangannya akurat. Yang dikirim adalah nama keterampilannya, repositori sumbernya, dan alat agen mana yang menerimanya — tidak pernah isi berkas, dan tidak pernah untuk keterampilan dari sumber pribadi, lokal, atau yang diketik manual. Sekali per keterampilan per komputer."
@@ -1933,6 +1939,7 @@
"OLBz-_": ["Diagram Mermaid gagal dirender."],
"OLIKgw": ["Seret item ", ["0"], " untuk menata ulang"],
"ONPvOb": ["Memuat aktivitas agen"],
+ "ONUgxB": ["Konflik itu sudah tidak tersedia."],
"ONWvwQ": ["Unggah"],
"ONchxy": ["total"],
"ONgEZF": ["Memuat judul untuk ", ["pageTarget"]],
@@ -2016,6 +2023,7 @@
"PVSwOe": ["Mengalihkan — menunggu proses saat ini berhenti…"],
"PVUn_c": ["Buka folder"],
"PVggyD": ["Skema frontmatter"],
+ "PWh9Ii": ["Terapkan perubahan"],
"PWqtgd": ["Memuat obrolan"],
"PXaT32": ["Server mengembalikan respons target skill yang tidak lengkap."],
"PYmp-0": ["Impor sebagai templat"],
@@ -2096,6 +2104,7 @@
"QQbwzK": ["Tidak ada agen yang tersedia."],
"QQghPu": ["Pasang di Claude Desktop"],
"QR5SP1": ["templat dibuat"],
+ "QVk3SK": ["Berkas ini dihapus di cabang masuk (konflik modify-delete)."],
"QWdKwH": ["Pindahkan"],
"QYTOaN": ["Anda bisa mengubah ini nanti di <0>Pengaturan → Sinkronisasi</0>."],
"QYfQdv": ["CLI ", ["displayName"]],
@@ -2456,6 +2465,7 @@
],
"VIwCaD": ["Entri"],
"VJaBca": ["Pilih folder keterampilan"],
+ "VL6VsE": ["Terima yang sekarang"],
"VM7H66": ["Berkas ini biner dan tidak bisa ditampilkan sebagai teks."],
"VMlRqi": ["Sembunyikan detail"],
"VNNRfN": ["jadikan sumber"],
@@ -2671,7 +2681,7 @@
"Server tidak bisa dimulai ulang — proses lain menguasainya. Tutup jendela OpenKnowledge lain untuk proyek ini, lalu coba lagi."
],
"Xv_ijG": ["https://github.com/pemilik/repo atau pemilik/repo"],
- "XyOUTJ": ["Keluar dari penggabungan"],
+ "XzL7x7": ["Buka kembali ", ["filePath"], " untuk melanjutkan penyuntingan."],
"Xzy0s0": ["Hapus ", ["fullLabel"], " dari konteks"],
"Y-Urt2": ["Persamaan matematika blok yang dirender dengan KaTeX dari sumber LaTeX."],
"Y1QMlM": ["Mulai siapkan"],
@@ -2713,6 +2723,7 @@
"YSFv5w": ["Tidak ada repositori git — berbagi konfigurasi tidak berlaku di sini."],
"YTLmTM": ["Hapus folder <0>.git</0> induknya"],
"YW7Q86": ["Pengaturan pencarian belum dimuat — coba lagi sebentar"],
+ "YWK2zy": ["Diff konflik untuk ", ["fileName"]],
"Y_GpJd": ["Permintaan unduhan ", ["0"], " kehabisan waktu."],
"Y_ZQ6l": ["Memasang ", ["agentName"], "…"],
"Y_iImT": ["File ", ["identity"], " tidak dapat ditentukan. Buka referensi."],
@@ -2881,6 +2892,7 @@
"Anda memilih direktori beranda Anda. OpenKnowledge akan mengindeks semua yang ada di pohon beranda Anda — besar dan bisa memunculkan berkas pribadi."
],
"_SDGzH": ["Lanjutkan di peramban"],
+ "_SkqfM": ["Terima yang masuk"],
"_TDESN": ["Galat jaringan - ", ["kind"], " \"", ["createdPath"], "\" masih ada di disk"],
"_TF8ep": ["Gagal merender PDF"],
"_W-elG": ["(sebaris)"],
@@ -3351,7 +3363,6 @@
{ "other": ["Yakin ingin menghapus ", "#", " berkas/folder berikut beserta isinya?"] }
]
],
- "g3UF2V": ["Terima"],
"g4WlQK": ["Pengelolaan alat AI proyek hanya tersedia di aplikasi desktop OpenKnowledge."],
"g4XBm0": ["Judul bagian kecil."],
"g4e0hS": ["Tanya ", ["agentName"]],
@@ -3370,6 +3381,9 @@
"gAhHu7": [
"Perbaikan otomatis hanya berlaku untuk masalah yang punya perbaikan mekanis yang diketahui."
],
+ "gBCeDq": [
+ "Tidak ada leluhur bersama — kedua cabang menambahkan berkas ini (konflik add/add)."
+ ],
"gBbxn_": ["Memeriksa status masuk"],
"gDkNHk": ["Yakin ingin menghapus \"", ["name"], "\"?"],
"gGVP4q": ["Klik <0>+</0> <1/> <2>Buat keterampilan</2> <3/> <4>Unggah keterampilan</4>."],
@@ -3460,6 +3474,7 @@
"Simpan catatan tertulis tentang bagaimana produk Anda dibangun. Rumah untuk mengusulkan ide, mencatat keputusan, menulis spesifikasi, dan merekam apa yang Anda pelajari setelah sesuatu rusak."
],
"hCattk": ["OpenKnowledge mengimpor ", ["source"]],
+ "hCghAK": ["Konflik ini sudah diselesaikan."],
"hDEaQu": ["Hubungkan OpenKnowledge dengan alat lain yang Anda pakai."],
"hDKtoF": [["diffHrs"], " j lalu"],
"hDoLrm": ["Hapus ", ["projectName"], " dari proyek terbaru"],
@@ -3683,6 +3698,7 @@
"Menyematkan halaman eksternal dalam iframe sebaris (dokumentasi, demo, Figma, CodeSandbox)."
],
"jTUxaN": ["Aktifkan Otomatis (hanya Pull)"],
+ "jTdrn1": ["Tidak dapat memeriksa apakah ", ["filePath"], " masih berkonflik — mencoba lagi."],
"jWzDfC": ["Memeriksa alat AI yang Anda miliki"],
"jZ_E5M": ["Fetch gagal — periksa log server untuk detailnya."],
"j_Z6g7": ["Bawaan bersama"],
@@ -3876,7 +3892,6 @@
"Sebuah jalur di dalam keterampilan — folder apa pun bisa (mis. references/notes.md). Folder pada jalur itu dibuatkan untuk Anda."
],
"lPkjpD": ["Dikirim ", ["pushed"]],
- "lPzyrU": ["Semua bagian sudah diselesaikan"],
"lS83Sg": ["Papan klip tidak dapat diakses."],
"lScd1O": ["Dek Slidev hanya terbuka di aplikasi desktop OpenKnowledge."],
"lT6wjt": ["Bentangkan papan"],
@@ -3954,6 +3969,7 @@
"Tata spesifikasi saya yang sudah ada menjadi indeks tertaut yang dikelompokkan per bidang, dan tandai mana saja yang sudah tidak selaras dengan kode saat ini."
],
"mPzgTS": ["Buka ", ["docName"]],
+ "mR3uQg": ["Berkas ini dihapus di cabang saat ini (konflik delete-modify)."],
"mToVM9": ["Kirim pesan ke ", ["agentName"]],
"mU3j1b": ["Hapus item ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (konflik)"],
@@ -4212,6 +4228,9 @@
" dibuka karena berisi folder .git"
],
"pZAs1T": ["Gagal memuat tautan keluar"],
+ "pZaMLc": [
+ "File ini berisi baris yang menyerupai penanda konflik, sehingga batas konflik tidak dapat dibaca dengan andal. Selesaikan secara manual atau dengan Tanya AI."
+ ],
"paCw0z": ["semua yang ada di folder ", ["0"], "/ di dalam ", ["1"], "/"],
"pajIrl": ["Terminal tidak dapat dimatikan: ", ["0"]],
"pbwTg6": [["seconds"], " dtk lalu"],
@@ -4750,6 +4769,7 @@
"wU8WyK": ["Bidang elemen"],
"wVa83H": ["Laporannya tidak bisa dibuat"],
"wWtVYd": ["Masukkan port antara 1 dan 65535."],
+ "wXFalZ": ["Pratinjau ", ["filename"]],
"wXO4Tg": [["hrs"], " j lalu"],
"wXw19Y": ["\"", ["projectName"], "\" dihapus dari proyek terbaru. Foldernya sudah tidak ada."],
"wZPUJx": ["“", ["0"], "”"],
@@ -4861,6 +4881,7 @@
"y46m5r": ["Aplikasi desktopnya tidak merespons. Segarkan lalu coba lagi."],
"y5FUYi": ["Menu saran terbuka"],
"y5UgU8": ["Nonaktifkan ", ["0"]],
+ "y6HGwM": ["Konflik tersisa: ", ["liveRemaining"], "."],
"y8B54M": ["Prompt Anda tidak bisa dikirim — silakan coba lagi."],
"yCX4jp": [" Pilihan Anda tidak dapat dipulihkan."],
"yDlK9k": ["Selesaikan konflik pada ", ["files"], " sebelum menghapus."],
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 6e9e3e63e..44221a95c 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} berada di luar proyek ini, di <0>{source}</0> — agen yang b
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, other {karakter}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, other {# bagian belum diselesaikan}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (kosong)"
@@ -1327,9 +1323,32 @@ msgstr "Tentang {appName}"
msgid "Above"
msgstr "Di atas"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "Terima"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "Terima keduanya"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "Terima kedua versi untuk konflik {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "Terima yang sekarang"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "Terima versi saat ini untuk konflik {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "Terima yang masuk"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "Terima versi masuk untuk konflik {0}"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1667,6 +1686,10 @@ msgstr "{editor} diselaraskan dengan sumbernya (bitanya sudah dicadangkan)"
msgid "All"
msgstr "Semua"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "Semua konflik terselesaikan. Terapkan perubahan untuk menyimpan."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "Semua berkas"
@@ -1675,10 +1698,6 @@ msgstr "Semua berkas"
msgid "All files are hidden by view filters."
msgstr "Semua berkas disembunyikan oleh filter tampilan."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "Semua bagian sudah diselesaikan"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "Semua tag"
@@ -1838,6 +1857,10 @@ msgstr "Berlaku saat Anda melanjutkan percakapan ini"
msgid "Apply and restart project server"
msgstr "Terapkan dan mulai ulang server proyek"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "Terapkan perubahan"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "Terapkan tautan"
@@ -3124,6 +3147,10 @@ msgstr "konflik"
msgid "Conflict"
msgstr "Konflik"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "Diff konflik untuk {fileName}"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "Berkas yang berkonflik"
@@ -3137,6 +3164,10 @@ msgstr "Berkas yang berkonflik: {0}."
msgid "Conflicts"
msgstr "Konflik"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "Konflik tersisa: {liveRemaining}."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "Hubungkan"
@@ -3628,6 +3659,10 @@ msgstr "Komentar itu tidak bisa ditambahkan."
msgid "Couldn't apply the change: {0}"
msgstr "Perubahannya tidak bisa diterapkan: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "Tidak dapat memeriksa apakah {filePath} masih berkonflik — mencoba lagi."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "Kuncinya tidak bisa dibersihkan — silakan coba lagi."
@@ -5443,10 +5478,6 @@ msgstr "Keluar"
msgid "exit {0}"
msgstr "keluar {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "Keluar dari penggabungan"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6559,6 +6590,10 @@ msgstr "Sembunyikan folder"
msgid "Hide HTML preview"
msgstr "Sembunyikan pratinjau HTML"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "Sembunyikan versi asli"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "Sembunyikan lainnya"
@@ -8555,6 +8590,10 @@ msgstr "Belum ada komentar di proyek ini. Komentari sebuah bagian untuk memulai.
msgid "No comments yet. Select text in the document to add one."
msgstr "Belum ada komentar. Pilih teks di dokumen untuk menambahkan satu."
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "Tidak ada leluhur bersama — kedua cabang menambahkan berkas ini (konflik add/add)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "Tidak ada perubahan isi pada versi ini."
@@ -10147,6 +10186,10 @@ msgstr "Tekan ikon matahari atau bulan pada “Custom” di atas untuk memakai t
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "Peramban pratinjau tidak bisa menyalin otomatis. Gunakan Cmd/Ctrl+C pada URL di atas, atau buka OK di aplikasi desktop."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "Pratinjau {filename}"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "Pratinjau tangkapan layar"
@@ -10564,6 +10607,7 @@ msgid "Recycle Bin"
msgstr "Recycle Bin"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "Ulangi"
@@ -10600,7 +10644,6 @@ msgid "Reinstalling"
msgstr "Memasang ulang"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "Tolak"
@@ -10850,6 +10893,10 @@ msgstr "Dirender"
msgid "Reopen"
msgstr "Buka lagi"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "Buka kembali {filePath} untuk melanjutkan penyuntingan."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "Buka kembali obrolan sebelumnya"
@@ -11327,10 +11374,6 @@ msgstr "Gagal menyimpan: {error}"
msgid "Save queued message"
msgstr "Simpan pesan dalam antrean"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "Simpan penyelesaian"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "Simpan komentar ini (Enter)"
@@ -12091,6 +12134,10 @@ msgstr "Tampilkan atau sembunyikan Berkas"
msgid "Show or hide Terminal"
msgstr "Tampilkan atau sembunyikan Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "Tampilkan versi asli"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13096,6 +13143,10 @@ msgstr "Terima kasih atas laporannya!"
msgid "That branch is already open in another worktree."
msgstr "Cabang itu sudah terbuka di worktree lain."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "Konflik itu sudah tidak tersedia."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "Itu tidak berhasil. Periksa log server lalu coba lagi."
@@ -13566,6 +13617,10 @@ msgstr "Ini bisa diatur di Pengaturan > Alat AI & CLI"
msgid "This comment is on the whole property"
msgstr "Komentar ini berlaku untuk seluruh properti"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "Konflik ini sudah diselesaikan."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "Dokumen ini"
@@ -13606,6 +13661,10 @@ msgstr "Bidang ini membawa kata kunci skema tambahan yang tidak ditampilkan peny
msgid "This file can't be opened in the text editor."
msgstr "Berkas ini tidak bisa dibuka di penyunting teks."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "File ini berisi baris yang menyerupai penanda konflik, sehingga batas konflik tidak dapat dibaca dengan andal. Selesaikan secara manual atau dengan Tanya AI."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "Berkas ini tidak ditemukan."
@@ -13618,6 +13677,14 @@ msgstr "Berkas ini biner dan tidak bisa ditampilkan sebagai teks."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "Berkas ini terlalu besar untuk dibuka di penyunting teks bawaan (batas 1 MB). Gunakan Buka berkas di bawah untuk membukanya di aplikasi lain."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "Berkas ini dihapus di cabang saat ini (konflik delete-modify)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "Berkas ini dihapus di cabang masuk (konflik modify-delete)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "Folder ini tidak berisi repositori git. Pilih folder lain?"
@@ -14198,7 +14265,7 @@ msgstr "Suntingan terakhir pada {docName} dibatalkan"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14228,6 +14295,10 @@ msgstr "Membatalkan atau mengulangi suntingan Anda sendiri, tanpa mengusik sunti
msgid "Undo to this edit?"
msgstr "Batalkan hingga suntingan ini?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "Batalkan resolusi Anda untuk mengubah ini."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Membatalkan, mengulangi, atau menelusuri perubahan pilihan di panel Sunting sumber atau bidang properti berbentuk kode."
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index cd956c370..765242180 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -224,6 +224,7 @@
"2XQ8Ww": ["에이전트가 편집할 때 미리보기를 엽니다."],
"2YOwme": ["다시 시작했습니다. 현재 v", ["appRuntime"], "을 실행 중입니다."],
"2YZwPB": ["포워드 링크 응답 형식이 예상과 일치하지 않습니다."],
+ "2Yt22K": ["원본 숨기기"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["패널 숨기기 (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["유효한 URL 입력, 예: https://api.openai.com/v1"],
@@ -353,6 +354,7 @@
"4Sxexw": ["소스 실행 취소 또는 다시 실행"],
"4TzU0n": ["초기화"],
"4Vgtaz": ["보드에 연결할 수 없습니다. 보드가 없거나 서버가 오프라인일 수 있습니다."],
+ "4_-TKi": ["충돌 ", ["0"], "에 두 버전 모두 적용"],
"4buZWd": [["path"], "에서 상속됨"],
"4c_a6S": ["아직 설정된 항목 없음."],
"4d0VYJ": ["이 이름으로 안전한 테마 ID를 만듭니다."],
@@ -379,6 +381,7 @@
"4sUdTJ": ["테마 적용 미리보기"],
"4uNLmk": ["풀하는 중"],
"4v2Yyz": ["파일 사이드바에 포커스가 있을 때 표시되는 모든 파일 트리 행을 선택합니다."],
+ "4vn1gP": ["모든 충돌이 해결되었습니다. 변경 사항을 적용하여 저장하세요."],
"4xtLTl": ["숨김 폴더 “", ["basename"], "”"],
"4zGlN_": ["이미지 URL을 붙여넣거나 업로드를 클릭하세요"],
"4z_1j2": ["렌더링됨"],
@@ -639,7 +642,6 @@
],
"8AjnFz": ["\"", ["0"], "\"은 이미 가져와져 있습니다(내용이 동일합니다)."],
"8F1i42": ["페이지를 찾을 수 없습니다"],
- "8FqTCr": [["chunksRemaining", "plural", { "other": ["해결되지 않은 변경 블록 ", "#", "개"] }]],
"8Gzz2G": [["worktreeOf"], "의 워크트리"],
"8HvJlU": [
"이 스킬과 같은 이름의 다른 스킬이 ",
@@ -839,6 +841,7 @@
],
"Aif3E7": ["의미 기반 검색 사용"],
"AkA6DO": [["0"], " 플러그인의 일부. 읽기 전용이며, 복사본을 편집하려면 엽니다"],
+ "Al8HPP": ["충돌 ", ["0"], "에 현재 버전 적용"],
"Am78jY": [["keyName"], "을 드래그하여 순서 변경"],
"ApeA0n": ["편집 ", ["dropCount"], "개를 ", ["docName"], "에서 실행 취소했습니다"],
"Aq-O0x": ["상태"],
@@ -1563,6 +1566,7 @@
["componentName"],
">는 알려진 컴포넌트가 아닙니다. 다른 곳에서 사용하려면 소스를 복사하거나 블록을 삭제하세요."
],
+ "KhNkCq": ["둘 다 적용"],
"Khxcyu": ["이 프로젝트의 터미널 접근 비활성화 상태."],
"KjTmeO": ["이 공유를 열려면 OpenKnowledge를 업데이트하세요."],
"KkEAud": ["현재 문서 또는 폴더를 기준으로 파일을 만듭니다."],
@@ -1634,7 +1638,6 @@
"LaskKp": ["채팅에 보내기 (", ["0"], ")"],
"Lbl6KA": [["0"], "에서 설치하지 못했습니다: ", ["1"]],
"LbmLyU": ["이 도구의 config를 안전하게 편집할 수 없습니다."],
- "Lcehxn": ["해결 결과 저장"],
"LdABLa": [["target"], " 열기에 실패했습니다. 직접 열어 보세요."],
"LdKIHS": ["사양 초안 작성"],
"LeGeTf": ["GitHub에서 OpenKnowledge 열기"],
@@ -1647,6 +1650,7 @@
],
"LhWYpm": ["다른 OK 경로는 upstream에서 추적됩니다:"],
"Li4U-T": [["title"], " 자세히 알아보기"],
+ "LkQRL8": ["원본 표시"],
"LlHqdU": ["프로젝트 초기화 중"],
"LlJ8LD": [
"구성 공유 변경 없음: ",
@@ -1799,6 +1803,7 @@
"Ni4b7h": [
"프로젝트 플러그인은 이 프로젝트의 작성 표준입니다. 여기에서 켜거나 끌 수 있습니다. 활성화된 각 플러그인은 설정 사이드바의 플러그인 아래에 전용 페이지가 생깁니다."
],
+ "NjnHNV": ["충돌 ", ["0"], "에 수신 버전 적용"],
"NjrIak": ["파일: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": [["tag"], " 편집"],
"NkXEFS": ["복원 실패, 문서는 변경되지 않음"],
@@ -1808,6 +1813,7 @@
"NnQapF": ["AI로 ", ["targetDisplayName"], " 열기"],
"NoY1k4": ["잘못된 서버 응답 형식"],
"NpC29w": ["현재 목록 항목에서 새 목록 항목을 만듭니다."],
+ "NpRLRj": ["이 설정을 바꾸려면 해결을 실행 취소하세요."],
"NrFwux": ["콘텐츠 규칙을 저장하지 못했습니다: ", ["0"]],
"Ns0z5o": [
"게시된 스킬을 설치하면 skills.sh에 알려 설치 횟수가 정확해집니다. 스킬 이름, 소스 저장소 및 사용된 에이전트 도구를 전송하지만 파일 내용은 전송하지 않으며, 비공개·로컬·직접 입력한 소스의 스킬에는 적용되지 않습니다. 컴퓨터당 스킬별로 한 번만 전송합니다."
@@ -1863,6 +1869,7 @@
"OLBz-_": ["Mermaid 다이어그램을 렌더링하지 못했습니다."],
"OLIKgw": ["항목 ", ["0"], "을 드래그하여 순서 변경"],
"ONPvOb": ["에이전트 활동 불러오는 중"],
+ "ONUgxB": ["해당 충돌은 더 이상 사용할 수 없습니다."],
"ONWvwQ": ["업로드"],
"ONchxy": ["합계"],
"ONgEZF": [["pageTarget"], "의 제목을 불러오는 중"],
@@ -1944,6 +1951,7 @@
"PVSwOe": ["조정 대기 중. 현재 실행 종료 대기…"],
"PVUn_c": ["폴더 열기"],
"PVggyD": ["Frontmatter 스키마"],
+ "PWh9Ii": ["변경 사항 적용"],
"PWqtgd": ["채팅 불러오는 중"],
"PXaT32": ["서버에서 불완전한 스킬 대상 응답을 반환했습니다."],
"PYmp-0": ["템플릿으로 가져오기"],
@@ -2015,6 +2023,7 @@
"QQbwzK": ["사용 가능한 에이전트 없음."],
"QQghPu": ["Claude Desktop에 설치"],
"QR5SP1": ["템플릿 생성됨"],
+ "QVk3SK": ["이 파일은 수신 브랜치에서 삭제되었습니다 (modify-delete 충돌)."],
"QWdKwH": ["이동"],
"QYTOaN": ["나중에 <0>설정 → 동기화</0>에서 변경할 수 있습니다."],
"QYfQdv": [["displayName"], " CLI"],
@@ -2368,6 +2377,7 @@
],
"VIwCaD": ["항목"],
"VJaBca": ["스킬 폴더 선택"],
+ "VL6VsE": ["현재 항목 적용"],
"VM7H66": ["이 파일은 바이너리라 텍스트로 표시할 수 없습니다."],
"VMlRqi": ["세부 정보 숨기기"],
"VNNRfN": ["소스로 지정"],
@@ -2569,7 +2579,7 @@
"서버를 다시 시작할 수 없습니다. 다른 프로세스가 사용 중입니다. 이 프로젝트의 다른 OpenKnowledge 창을 닫은 후 다시 시도하세요."
],
"Xv_ijG": ["https://github.com/owner/repo 또는 owner/repo"],
- "XyOUTJ": ["병합 종료"],
+ "XzL7x7": ["계속 편집하려면 ", ["filePath"], "을(를) 다시 여세요."],
"Xzy0s0": ["현재 내용에서 ", ["fullLabel"], " 제거"],
"Y-Urt2": ["LaTeX 소스 문자열에서 KaTeX로 렌더링되는 블록 수식입니다."],
"Y1QMlM": ["설정 시작"],
@@ -2611,6 +2621,7 @@
"YSFv5w": ["git 저장소 없음, 여기에는 config 공유가 적용되지 않습니다."],
"YTLmTM": ["상위 <0>.git</0> 폴더 제거"],
"YW7Q86": ["검색 설정을 아직 불러오지 못했습니다. 잠시 후 다시 시도합니다."],
+ "YWK2zy": [["fileName"], "의 충돌 차이"],
"Y_GpJd": [["0"], " 다운로드 요청 시간 초과."],
"Y_ZQ6l": [["agentName"], " 설치 중…"],
"Y_iImT": ["해결할 수 없는 파일 ", ["identity"], ". 참조로 이동합니다."],
@@ -2774,6 +2785,7 @@
"홈 디렉터리를 선택했습니다. OpenKnowledge가 홈 트리의 모든 항목을 색인합니다. 범위가 크고 개인 파일이 표시될 수 있습니다."
],
"_SDGzH": ["브라우저에서 계속"],
+ "_SkqfM": ["수신 항목 적용"],
"_TDESN": [
["kind"],
" “",
@@ -3224,7 +3236,6 @@
{ "other": ["다음 파일 또는 폴더 ", "#", "개와 그 내용을 삭제하시겠습니까?"] }
]
],
- "g3UF2V": ["수락"],
"g4WlQK": ["프로젝트 AI 도구 관리는 OpenKnowledge 데스크톱 앱에서만 사용할 수 있습니다."],
"g4XBm0": ["작은 섹션 제목입니다."],
"g4e0hS": [["agentName"], "에게 질문"],
@@ -3241,6 +3252,7 @@
],
"g9Nj4l": ["// 참고"],
"gAhHu7": ["자동 수정은 기계적으로 수정할 수 있는 문제가 알려진 경우에만 적용됩니다."],
+ "gBCeDq": ["공통 조상이 없습니다 — 두 브랜치가 이 파일을 각각 추가했습니다 (add/add 충돌)."],
"gBbxn_": ["로그인 상태 확인 중"],
"gDkNHk": ["정말로 \"", ["name"], "\"을(를) 삭제하시겠어요?"],
"gGVP4q": ["<0>+</0> <1/> <2>스킬 만들기</2> <3/> <4>스킬 업로드</4> 클릭하세요."],
@@ -3325,6 +3337,7 @@
"제품이 만들어지는 과정을 기록합니다. 아이디어 제안, 결정 기록, 사양 작성, 문제가 생긴 뒤 배운 점을 담는 공간입니다."
],
"hCattk": ["OpenKnowledge에서 ", ["source"], " 가져오기"],
+ "hCghAK": ["이 충돌은 해결되었습니다."],
"hDEaQu": ["OpenKnowledge를 사용하는 다른 도구에 연결합니다."],
"hDKtoF": [["diffHrs"], "시간 전"],
"hDoLrm": ["프로젝트 \"", ["projectName"], "\"을 최근 프로젝트에서 제거"],
@@ -3533,6 +3546,7 @@
"외부 페이지를 인라인 iframe에 삽입합니다. 문서, 데모, Figma, CodeSandbox를 지원합니다."
],
"jTUxaN": ["자동(풀만) 활성화"],
+ "jTdrn1": [["filePath"], "에 아직 충돌이 있는지 확인하지 못했습니다 — 다시 시도합니다."],
"jWzDfC": ["보유한 AI 도구를 확인하는 중"],
"jZ_E5M": ["가져오기 실패. 자세한 내용은 서버 로그를 확인하세요."],
"j_Z6g7": ["공유 기본값"],
@@ -3721,7 +3735,6 @@
"스킬 내부 경로입니다. 모든 폴더를 사용할 수 있습니다(예: references/notes.md). 경로의 폴더는 자동으로 생성됩니다."
],
"lPkjpD": [["pushed"], " 푸시"],
- "lPzyrU": ["모든 변경 블록 해결됨"],
"lS83Sg": ["클립보드에 접근하지 못했습니다."],
"lScd1O": ["Slidev 덱은 OpenKnowledge 데스크톱 앱에서만 열립니다."],
"lT6wjt": ["보드 펼치기"],
@@ -3794,6 +3807,7 @@
"기존 사양을 영역별로 그룹화한 연결된 색인으로 정리하고, 현재 코드와 동기화되지 않은 항목을 표시합니다."
],
"mPzgTS": [["docName"], " 열기"],
+ "mR3uQg": ["이 파일은 현재 브랜치에서 삭제되었습니다 (delete-modify 충돌)."],
"mToVM9": [["agentName"], " 메시지"],
"mU3j1b": ["항목 ", ["0"], " 제거"],
"mVFyH-": [["accessibleLabel"], " (충돌)"],
@@ -4037,6 +4051,9 @@
"의 상위 폴더를 열었습니다"
],
"pZAs1T": ["나가는 링크 불러오기 실패"],
+ "pZaMLc": [
+ "이 파일에는 충돌 마커처럼 보이는 줄이 있어 충돌 경계를 정확히 읽을 수 없습니다. 직접 해결하거나 AI에게 묻기를 사용하세요."
+ ],
"paCw0z": [["0"], "/ 폴더가 ", ["1"], "/ 안에 있는 모든 항목"],
"pajIrl": ["터미널을 끄지 못했습니다: ", ["0"]],
"pbwTg6": [["seconds"], "초 전"],
@@ -4543,6 +4560,7 @@
"wU8WyK": ["요소 필드"],
"wVa83H": ["보고서를 만들지 못했습니다"],
"wWtVYd": ["1에서 65535 사이의 포트를 입력하세요."],
+ "wXFalZ": [["filename"], " 미리 보기"],
"wXO4Tg": [["hrs"], "시간 전"],
"wXw19Y": [
"최근 프로젝트에서 \"",
@@ -4658,6 +4676,7 @@
"y46m5r": ["데스크톱 앱 응답 없음. 새로 고침 후 다시 시도하세요."],
"y5FUYi": ["제안 메뉴 열기"],
"y5UgU8": [["0"], " 비활성화"],
+ "y6HGwM": ["남은 충돌: ", ["liveRemaining"], "개."],
"y8B54M": ["프롬프트 전송 실패. 다시 시도하세요."],
"yCX4jp": [" 선택 영역을 복원할 수 없습니다."],
"yDlK9k": ["삭제하기 전에 ", ["files"], "의 충돌을 해결하세요."],
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 0a98ed445..6e03ab2ab 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName}은 이 프로젝트 외부의 <0>{source}</0>에 있습니다
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, other {#자}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, other {해결되지 않은 변경 블록 #개}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (비어 있음)"
@@ -1331,9 +1327,32 @@ msgstr "{appName} 정보"
msgid "Above"
msgstr "위"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "수락"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "둘 다 적용"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "충돌 {0}에 두 버전 모두 적용"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "현재 항목 적용"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "충돌 {0}에 현재 버전 적용"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "수신 항목 적용"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "충돌 {0}에 수신 버전 적용"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "{editor} 버전을 소스와 맞췄습니다(바이트를 백업했습
msgid "All"
msgstr "모두"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "모든 충돌이 해결되었습니다. 변경 사항을 적용하여 저장하세요."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "모든 파일"
@@ -1679,10 +1702,6 @@ msgstr "모든 파일"
msgid "All files are hidden by view filters."
msgstr "보기 필터로 모든 파일이 숨겨져 있습니다."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "모든 변경 블록 해결됨"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "모든 태그"
@@ -1842,6 +1861,10 @@ msgstr "이 대화를 다시 시작할 때 적용됩니다"
msgid "Apply and restart project server"
msgstr "적용하고 프로젝트 서버 재시작"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "변경 사항 적용"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "링크 적용"
@@ -3128,6 +3151,10 @@ msgstr "충돌"
msgid "Conflict"
msgstr "충돌"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "{fileName}의 충돌 차이"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "충돌한 파일"
@@ -3141,6 +3168,10 @@ msgstr "충돌하는 파일: {0}."
msgid "Conflicts"
msgstr "충돌"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "남은 충돌: {liveRemaining}개."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "연결"
@@ -3632,6 +3663,10 @@ msgstr "댓글 추가에 실패했습니다."
msgid "Couldn't apply the change: {0}"
msgstr "변경사항을 적용하지 못했습니다: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "{filePath}에 아직 충돌이 있는지 확인하지 못했습니다 — 다시 시도합니다."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "키를 지우지 못했습니다. 다시 시도합니다."
@@ -5447,10 +5482,6 @@ msgstr "종료"
msgid "exit {0}"
msgstr "exit {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "병합 종료"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "폴더 가리기"
msgid "Hide HTML preview"
msgstr "HTML 미리보기 숨기기"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "원본 숨기기"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "다른 앱 가리기"
@@ -8559,6 +8594,10 @@ msgstr "이 프로젝트에 아직 댓글이 없습니다. 구절에 댓글 남
msgid "No comments yet. Select text in the document to add one."
msgstr "아직 댓글 없음. 문서에서 텍스트 선택 후 댓글 추가"
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "공통 조상이 없습니다 — 두 브랜치가 이 파일을 각각 추가했습니다 (add/add 충돌)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "이 버전에서 내용 변경 없음."
@@ -10151,6 +10190,10 @@ msgstr "위의 사용자 지정에서 태양 또는 달을 눌러 이 테마를
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "미리보기 브라우저에서는 자동 복사가 지원되지 않습니다. 위 URL에서 Cmd/Ctrl+C를 사용하거나 데스크톱 앱에서 OK를 여세요."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "{filename} 미리 보기"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "스크린샷 미리보기"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "휴지통"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "다시 실행"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "재설치 중"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "거부"
@@ -10854,6 +10897,10 @@ msgstr "렌더링됨"
msgid "Reopen"
msgstr "다시 열기"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "계속 편집하려면 {filePath}을(를) 다시 여세요."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "이전 채팅 다시 열기"
@@ -11331,10 +11378,6 @@ msgstr "저장 실패: {error}"
msgid "Save queued message"
msgstr "대기 중인 메시지 저장"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "해결 결과 저장"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "이 댓글 저장 (Enter)"
@@ -12095,6 +12138,10 @@ msgstr "파일 표시 또는 숨기기"
msgid "Show or hide Terminal"
msgstr "터미널 표시 또는 숨기기"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "원본 표시"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "보고서 감사합니다!"
msgid "That branch is already open in another worktree."
msgstr "해당 브랜치는 다른 워크트리에서 이미 열려 있습니다."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "해당 충돌은 더 이상 사용할 수 없습니다."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "처리되지 않았습니다. 서버 로그를 확인한 뒤 다시 시도하세요."
@@ -13570,6 +13621,10 @@ msgstr "Settings > AI tools & CLI에서 설정 가능"
msgid "This comment is on the whole property"
msgstr "이 댓글, 속성 전체에 적용됨"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "이 충돌은 해결되었습니다."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "이 문서"
@@ -13610,6 +13665,10 @@ msgstr "이 필드에는 편집기에 표시되지 않는 추가 스키마 키
msgid "This file can't be opened in the text editor."
msgstr "이 파일은 텍스트 편집기에서 열 수 없습니다."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "이 파일에는 충돌 마커처럼 보이는 줄이 있어 충돌 경계를 정확히 읽을 수 없습니다. 직접 해결하거나 AI에게 묻기를 사용하세요."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "이 파일을 찾을 수 없습니다."
@@ -13622,6 +13681,14 @@ msgstr "이 파일은 바이너리라 텍스트로 표시할 수 없습니다."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "이 파일은 기본 제공 텍스트 편집기에서 열기에는 너무 큽니다(1MB 제한). 아래의 파일 열기를 사용해 다른 앱에서 여세요."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "이 파일은 현재 브랜치에서 삭제되었습니다 (delete-modify 충돌)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "이 파일은 수신 브랜치에서 삭제되었습니다 (modify-delete 충돌)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "이 폴더에 git 저장소가 없습니다. 다른 폴더를 선택하시겠습니까?"
@@ -14202,7 +14269,7 @@ msgstr "{docName}에서 마지막 편집을 실행 취소했습니다."
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "협업자와 에이전트의 편집은 유지하면서 직접 편집한
msgid "Undo to this edit?"
msgstr "이 편집으로 되돌리시겠습니까?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "이 설정을 바꾸려면 해결을 실행 취소하세요."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "소스 편집 창 또는 코드 형태의 속성 필드에서 선택 영역 변경을 실행 취소, 다시 실행하거나 단계별로 이동합니다."
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index 8ce8357c8..f969ace1b 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -231,6 +231,7 @@
"2XQ8Ww": ["Ōƥēń ƥŕēvĩēŵ ŵĥēń àĝēńţ ēďĩţś"],
"2YOwme": ["Ŕēśţàŕţēď — ńōŵ ŕũńńĩńĝ v", ["appRuntime"], "."],
"2YZwPB": ["Ƒōŕŵàŕď-ĺĩńķś ŕēśƥōńśē ďĩď ńōţ ḿàţćĥ ēxƥēćţēď śĥàƥē."],
+ "2Yt22K": ["Ĥĩďē ōŕĩĝĩńàĺ"],
"2hYmUH": ["ḿŷ@ēḿàĩĺ.ćōḿ"],
"2hpdRq": ["Ĥĩďē ƥàńēĺ (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["Ēńţēŕ à vàĺĩď ŨŔĹ (ƒōŕ ēxàḿƥĺē ĥţţƥś://àƥĩ.ōƥēńàĩ.ćōḿ/v1)."],
@@ -365,6 +366,7 @@
"4Sxexw": ["Śōũŕćē ũńďō ōŕ ŕēďō"],
"4TzU0n": ["Ĩńĩţĩàĺĩźē"],
"4Vgtaz": ["Ţĥē ƀōàŕď ćōũĺď ńōţ ƀē ŕēàćĥēď. Ĩţ ḿàŷ ńōţ ēxĩśţ, ōŕ ţĥē śēŕvēŕ ḿàŷ ƀē ōƒƒĺĩńē."],
+ "4_-TKi": ["Àććēƥţ ƀōţĥ vēŕśĩōńś ƒōŕ ćōńƒĺĩćţ ", ["0"]],
"4buZWd": ["Ĩńĥēŕĩţēď ƒŕōḿ ", ["path"]],
"4c_a6S": ["Ńōţĥĩńĝ śēţ ŷēţ."],
"4d0VYJ": ["Ŵē’ĺĺ ćŕēàţē à śàƒē ţĥēḿē ĨĎ ƒŕōḿ ţĥĩś ńàḿē."],
@@ -389,6 +391,7 @@
"4sUdTJ": ["ţĥēḿēď ƥŕēvĩēŵ"],
"4uNLmk": ["Ƥũĺĺĩńĝ"],
"4v2Yyz": ["Śēĺēćţ ēvēŕŷ vĩśĩƀĺē ƒĩĺē-ţŕēē ŕōŵ ŵĥēń ƒōćũś ĩś ĩń ţĥē Ƒĩĺēś śĩďēƀàŕ."],
+ "4vn1gP": ["Àĺĺ ćōńƒĺĩćţś ŕēśōĺvēď. Àƥƥĺŷ ćĥàńĝēś ţō śàvē."],
"4xtLTl": ["Ĥĩďďēń ƒōĺďēŕ “", ["basename"], "”"],
"4zGlN_": ["Ƥàśţē ĩḿàĝē ŨŔĹ ōŕ ćĺĩćķ ũƥĺōàď"],
"4z_1j2": ["Ŕēńďēŕēď"],
@@ -647,13 +650,6 @@
],
"8AjnFz": ["\"", ["0"], "\" ŵàś àĺŕēàďŷ ĩḿƥōŕţēď (ĩďēńţĩćàĺ ćōńţēńţ)."],
"8F1i42": ["Ƥàĝē ńōţ ƒōũńď"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- { "one": ["#", " ũńŕēśōĺvēď ĥũńķ"], "other": ["#", " ũńŕēśōĺvēď ĥũńķś"] }
- ]
- ],
"8Gzz2G": ["ŵōŕķţŕēē ōƒ ", ["worktreeOf"]],
"8HvJlU": [
"À ĎĨƑƑĒŔĒŃŢ śķĩĺĺ ńàḿēď ĺĩķē ţĥĩś ōńē ĺĩvēś àţ ",
@@ -863,6 +859,7 @@
],
"Aif3E7": ["Ēńàƀĺē śēḿàńţĩć śēàŕćĥ"],
"AkA6DO": ["Ƥàŕţ ōƒ ţĥē ", ["0"], " ƥĺũĝĩń — ŕēàď-ōńĺŷ; ōƥēń ĩţ ţō ēďĩţ à ćōƥŷ"],
+ "Al8HPP": ["Àććēƥţ ćũŕŕēńţ vēŕśĩōń ƒōŕ ćōńƒĺĩćţ ", ["0"]],
"Am78jY": ["Ďŕàĝ ", ["keyName"], " ţō ŕēōŕďēŕ"],
"ApeA0n": ["Ũńďĩď ", ["dropCount"], " ēďĩţś ōń ", ["docName"]],
"Aq-O0x": ["śţàţũś"],
@@ -1610,6 +1607,7 @@
["componentName"],
"> ĩśń'ţ à ķńōŵń ćōḿƥōńēńţ. Ćōƥŷ ţĥē śōũŕćē ţō ũśē ĩţ ēĺśēŵĥēŕē, ōŕ ďēĺēţē ţĥē ƀĺōćķ."
],
+ "KhNkCq": ["Àććēƥţ ƀōţĥ"],
"Khxcyu": ["Ţēŕḿĩńàĺ àććēśś ĩśń'ţ ēńàƀĺēď ƒōŕ ţĥĩś ƥŕōĴēćţ."],
"KjTmeO": ["Ũƥďàţē ŌƥēńĶńōŵĺēďĝē ţō ōƥēń ţĥĩś śĥàŕē."],
"KkEAud": ["Ćŕēàţē à ƒĩĺē ƒŕōḿ ţĥē ćũŕŕēńţ ďōćũḿēńţ ōŕ ƒōĺďēŕ ćōńţēxţ."],
@@ -1686,7 +1684,6 @@
"LaskKp": ["Śēńď ţō ćĥàţ (", ["0"], ")"],
"Lbl6KA": ["Ćōũĺďń'ţ ĩńśţàĺĺ ƒŕōḿ ", ["0"], ": ", ["1"]],
"LbmLyU": ["Ćàń'ţ śàƒēĺŷ ēďĩţ ţĥĩś ţōōĺ'ś ćōńƒĩĝ"],
- "Lcehxn": ["Śàvē ŕēśōĺũţĩōń"],
"LdABLa": ["Ćōũĺď ńōţ ōƥēń ", ["target"], ". Ţŕŷ ōƥēńĩńĝ ĩţ ḿàńũàĺĺŷ."],
"LdKIHS": ["Ďŕàƒţ à śƥēć"],
"LeGeTf": ["ŌƥēńĶńōŵĺēďĝē ōń ĜĩţĤũƀ"],
@@ -1699,6 +1696,7 @@
],
"LhWYpm": ["Ōţĥēŕ ŌĶ ƥàţĥś àŕē ţŕàćķēď ũƥśţŕēàḿ:"],
"Li4U-T": ["Ĺēàŕń ḿōŕē àƀōũţ ", ["title"]],
+ "LkQRL8": ["Śĥōŵ ōŕĩĝĩńàĺ"],
"LlHqdU": ["Ĩńĩţĩàĺĩźĩńĝ ƥŕōĴēćţ"],
"LlJ8LD": [
"Ćōńƒĩĝ śĥàŕĩńĝ ũńćĥàńĝēď: ",
@@ -1860,6 +1858,7 @@
"Ni4b7h": [
"ƤŕōĴēćţ ƥĺũĝĩńś àŕē ŷōũŕ ƥŕōĴēćţ'ś àũţĥōŕĩńĝ śţàńďàŕď — ţũŕń ţĥēḿ ōń ōŕ ōƒƒ ĥēŕē. Ēàćĥ ēńàƀĺēď ƥĺũĝĩń ĝēţś ĩţś ōŵń ƥàĝē ũńďēŕ Ƥĺũĝĩńś ĩń ţĥē śēţţĩńĝś śĩďēƀàŕ."
],
+ "NjnHNV": ["Àććēƥţ ĩńćōḿĩńĝ vēŕśĩōń ƒōŕ ćōńƒĺĩćţ ", ["0"]],
"NjrIak": ["Ƒĩĺē: <0>", ["fixedName"], ".ḿď</0>"],
"NkNfSr": ["Ēďĩţ ", ["tag"]],
"NkXEFS": ["Ŕēśţōŕē ƒàĩĺēď — ďōćũḿēńţ ũńćĥàńĝēď"],
@@ -1869,6 +1868,7 @@
"NnQapF": ["Ōƥēń ŵĩţĥ ÀĨ ", ["targetDisplayName"]],
"NoY1k4": ["Ĩńvàĺĩď śēŕvēŕ ŕēśƥōńśē śĥàƥē"],
"NpC29w": ["Ćŕēàţē à ńēŵ ĺĩśţ ĩţēḿ ƒŕōḿ ţĥē ćũŕŕēńţ ĺĩśţ ĩţēḿ."],
+ "NpRLRj": ["Ũńďō ŷōũŕ ŕēśōĺũţĩōńś ţō ćĥàńĝē ţĥĩś."],
"NrFwux": ["Ƒàĩĺēď ţō śàvē ćōńţēńţ ŕũĺēś — ", ["0"]],
"Ns0z5o": [
"Ŵĥēń ŷōũ ĩńśţàĺĺ à ƥũƀĺĩśĥēď śķĩĺĺ, ţēĺĺ ţĥē śķĩĺĺ ďĩŕēćţōŕŷ (śķĩĺĺś.śĥ) śō ĩţś ĩńśţàĺĺ ćōũńţ ĩś àććũŕàţē. Śēńďś ţĥē śķĩĺĺ ńàḿē, ĩţś śōũŕćē ŕēƥōśĩţōŕŷ, àńď ŵĥĩćĥ àĝēńţ ţōōĺś ĩţ ŵēńţ ţō — ńēvēŕ ƒĩĺē ćōńţēńţś, àńď ńēvēŕ ƒōŕ à śķĩĺĺ ƒŕōḿ à ƥŕĩvàţē, ĺōćàĺ, ōŕ ĥàńď-ţŷƥēď śōũŕćē. Ōńćē ƥēŕ śķĩĺĺ ƥēŕ ḿàćĥĩńē."
@@ -1923,6 +1923,7 @@
"OLBz-_": ["Ḿēŕḿàĩď ďĩàĝŕàḿ ƒàĩĺēď ţō ŕēńďēŕ."],
"OLIKgw": ["Ďŕàĝ ĩţēḿ ", ["0"], " ţō ŕēōŕďēŕ"],
"ONPvOb": ["Ĺōàďĩńĝ àĝēńţ àćţĩvĩţŷ"],
+ "ONUgxB": ["Ţĥàţ ćōńƒĺĩćţ ĩś ńō ĺōńĝēŕ àvàĩĺàƀĺē."],
"ONWvwQ": ["Ũƥĺōàď"],
"ONchxy": ["ţōţàĺ"],
"ONgEZF": ["Ĺōàďĩńĝ ĥēàďĩńĝś ƒōŕ ", ["pageTarget"]],
@@ -2006,6 +2007,7 @@
"PVSwOe": ["Śţēēŕĩńĝ — ŵàĩţĩńĝ ƒōŕ ţĥē ćũŕŕēńţ ŕũń ţō śţōƥ…"],
"PVUn_c": ["Ōƥēń ƒōĺďēŕ"],
"PVggyD": ["Ƒŕōńţḿàţţēŕ śćĥēḿàś"],
+ "PWh9Ii": ["Àƥƥĺŷ ćĥàńĝēś"],
"PWqtgd": ["Ĺōàďĩńĝ ţĥē ćĥàţ"],
"PXaT32": ["Śēŕvēŕ ŕēţũŕńēď àń ĩńćōḿƥĺēţē śķĩĺĺ-ţàŕĝēţś ŕēśƥōńśē."],
"PYmp-0": ["Ĩḿƥōŕţ àś ţēḿƥĺàţē"],
@@ -2085,6 +2087,7 @@
"QQbwzK": ["Ńō àĝēńţś àvàĩĺàƀĺē."],
"QQghPu": ["Ĩńśţàĺĺ ĩń Ćĺàũďē Ďēśķţōƥ"],
"QR5SP1": ["ćŕēàţēď ţēḿƥĺàţē"],
+ "QVk3SK": ["Ţĥĩś ƒĩĺē ŵàś ďēĺēţēď ōń ţĥē ĩńćōḿĩńĝ ƀŕàńćĥ (ḿōďĩƒŷ-ďēĺēţē ćōńƒĺĩćţ)."],
"QWdKwH": ["Ḿōvē"],
"QYTOaN": ["Ŷōũ ćàń ćĥàńĝē ţĥĩś ĺàţēŕ ĩń <0>Śēţţĩńĝś → Śŷńć</0>."],
"QYfQdv": [["displayName"], " ĆĹĨ"],
@@ -2450,6 +2453,7 @@
],
"VIwCaD": ["Ēńţŕŷ"],
"VJaBca": ["Ćĥōōśē à śķĩĺĺ ƒōĺďēŕ"],
+ "VL6VsE": ["Àććēƥţ ćũŕŕēńţ"],
"VM7H66": ["Ţĥĩś ƒĩĺē ĩś ƀĩńàŕŷ àńď ćàń'ţ ƀē śĥōŵń àś ţēxţ."],
"VMlRqi": ["Ĥĩďē ďēţàĩĺś"],
"VNNRfN": ["ḿàķē śōũŕćē"],
@@ -2657,7 +2661,7 @@
"Ćōũĺďń'ţ ŕēśţàŕţ ţĥē śēŕvēŕ — àńōţĥēŕ ƥŕōćēśś ōŵńś ĩţ. Ǫũĩţ ōţĥēŕ ŌƥēńĶńōŵĺēďĝē ŵĩńďōŵś ƒōŕ ţĥĩś ƥŕōĴēćţ, ţĥēń ţŕŷ àĝàĩń."
],
"Xv_ijG": ["ĥţţƥś://ĝĩţĥũƀ.ćōḿ/ōŵńēŕ/ŕēƥō ōŕ ōŵńēŕ/ŕēƥō"],
- "XyOUTJ": ["Ēxĩţ ḿēŕĝē"],
+ "XzL7x7": ["Ŕēōƥēń ", ["filePath"], " ţō ķēēƥ ēďĩţĩńĝ."],
"Xzy0s0": ["Ŕēḿōvē ", ["fullLabel"], " ƒŕōḿ ćōńţēxţ"],
"Y-Urt2": ["ßĺōćķ ḿàţĥ ēǫũàţĩōń ŕēńďēŕēď ŵĩţĥ ĶàŢēX ƒŕōḿ à ĹàŢēX śōũŕćē śţŕĩńĝ."],
"Y1QMlM": ["Ĝēţ śēţ ũƥ"],
@@ -2699,6 +2703,7 @@
"YSFv5w": ["Ńō ĝĩţ ŕēƥōśĩţōŕŷ — ćōńƒĩĝ śĥàŕĩńĝ ďōēś ńōţ àƥƥĺŷ ĥēŕē."],
"YTLmTM": ["Ŕēḿōvē ţĥē ƥàŕēńţ <0>.ĝĩţ</0> ƒōĺďēŕ"],
"YW7Q86": ["Śēàŕćĥ śēţţĩńĝś ńōţ ŷēţ ĺōàďēď — ţŕŷ àĝàĩń ĩń à ḿōḿēńţ"],
+ "YWK2zy": ["Ćōńƒĺĩćţ ďĩƒƒ ƒōŕ ", ["fileName"]],
"Y_GpJd": ["Ţĥē ", ["0"], " ďōŵńĺōàď ŕēǫũēśţ ţĩḿēď ōũţ."],
"Y_ZQ6l": ["Ĩńśţàĺĺĩńĝ ", ["agentName"], "…"],
"Y_iImT": ["Ũńŕēśōĺvàƀĺē ƒĩĺē ", ["identity"], ". Ĝō ţō ŕēƒēŕēńćē."],
@@ -2872,6 +2877,7 @@
"Ŷōũ ƥĩćķēď ŷōũŕ ĥōḿē ďĩŕēćţōŕŷ. ŌƥēńĶńōŵĺēďĝē ŵĩĺĺ ĩńďēx ēvēŕŷţĥĩńĝ ĩń ŷōũŕ ĥōḿē ţŕēē — ĺàŕĝē àńď ḿàŷ śũŕƒàćē ƥēŕśōńàĺ ƒĩĺēś."
],
"_SDGzH": ["Ćōńţĩńũē ĩń ƀŕōŵśēŕ"],
+ "_SkqfM": ["Àććēƥţ ĩńćōḿĩńĝ"],
"_TDESN": ["Ńēţŵōŕķ ēŕŕōŕ - ", ["kind"], " \"", ["createdPath"], "\" śţĩĺĺ ēxĩśţś ōń ďĩśķ"],
"_TF8ep": ["Ƒàĩĺēď ţō ŕēńďēŕ ƤĎƑ"],
"_W-elG": ["(ĩńĺĩńē)"],
@@ -3338,7 +3344,6 @@
}
]
],
- "g3UF2V": ["Àććēƥţ"],
"g4WlQK": ["ƤŕōĴēćţ ÀĨ ţōōĺ ḿàńàĝēḿēńţ ĩś ōńĺŷ àvàĩĺàƀĺē ĩń ţĥē ŌƥēńĶńōŵĺēďĝē ďēśķţōƥ àƥƥ."],
"g4XBm0": ["Śḿàĺĺ śēćţĩōń ĥēàďĩńĝ."],
"g4e0hS": ["Àśķ ", ["agentName"]],
@@ -3355,6 +3360,7 @@
],
"g9Nj4l": ["// ńōţē"],
"gAhHu7": ["Àũţō-ƒĩx àƥƥĺĩēś ōńĺŷ ţō ƥŕōƀĺēḿś ŵĩţĥ à ķńōŵń ḿēćĥàńĩćàĺ ƒĩx."],
+ "gBCeDq": ["Ńō ćōḿḿōń àńćēśţōŕ — ƀōţĥ ƀŕàńćĥēś àďďēď ţĥĩś ƒĩĺē (àďď/àďď ćōńƒĺĩćţ)."],
"gBbxn_": ["Ćĥēćķĩńĝ śĩĝń-ĩń śţàţũś"],
"gDkNHk": ["Àŕē ŷōũ śũŕē ŷōũ ŵàńţ ţō ďēĺēţē \"", ["name"], "\"?"],
"gGVP4q": ["Ćĺĩćķ <0>+</0> <1/> <2>Ćŕēàţē śķĩĺĺ</2> <3/> <4>Ũƥĺōàď śķĩĺĺ</4>."],
@@ -3443,6 +3449,7 @@
"Ķēēƥ à ŵŕĩţţēń ŕēćōŕď ōƒ ĥōŵ ŷōũŕ ƥŕōďũćţ ĝēţś ƀũĩĺţ. À ĥōḿē ƒōŕ ƥŕōƥōśĩńĝ ĩďēàś, ŕēćōŕďĩńĝ ďēćĩśĩōńś, ŵŕĩţĩńĝ śƥēćś, àńď ćàƥţũŕĩńĝ ŵĥàţ ŷōũ ĺēàŕńēď àƒţēŕ śōḿēţĥĩńĝ ƀŕōķē."
],
"hCattk": ["ŌƥēńĶńōŵĺēďĝē ĩḿƥōŕţēď ", ["source"]],
+ "hCghAK": ["Ţĥĩś ćōńƒĺĩćţ ĩś ŕēśōĺvēď."],
"hDEaQu": ["Ćōńńēćţ ŌƥēńĶńōŵĺēďĝē ţō ōţĥēŕ ţōōĺś ŷōũ ũśē."],
"hDKtoF": [["diffHrs"], "ĥ àĝō"],
"hDoLrm": ["Ŕēḿōvē ", ["projectName"], " ƒŕōḿ ŕēćēńţ ƥŕōĴēćţś"],
@@ -3651,6 +3658,7 @@
"jSY41h": ["\"", ["docName"], "\" ţōōķ ţōō ĺōńĝ. Ćĥēćķ ŷōũŕ ćōńńēćţĩōń."],
"jTLWxh": ["Ēḿƀēď àń ēxţēŕńàĺ ƥàĝē ĩń àń ĩńĺĩńē ĩƒŕàḿē (ďōćś, ďēḿōś, Ƒĩĝḿà, ĆōďēŚàńďƀōx)."],
"jTUxaN": ["Ēńàƀĺē Àũţō (Ƥũĺĺ ōńĺŷ)"],
+ "jTdrn1": ["Ćōũĺďń'ţ ćĥēćķ ŵĥēţĥēŕ ", ["filePath"], " ĩś śţĩĺĺ ćōńƒĺĩćţēď — ŕēţŕŷĩńĝ."],
"jWzDfC": ["Ćĥēćķĩńĝ ŵĥĩćĥ ÀĨ ţōōĺś ŷōũ ĥàvē"],
"jZ_E5M": ["Ƒēţćĥ ƒàĩĺēď — ćĥēćķ ţĥē śēŕvēŕ ĺōĝś ƒōŕ ďēţàĩĺś."],
"j_Z6g7": ["Śĥàŕēď ďēƒàũĺţ"],
@@ -3846,7 +3854,6 @@
"À ƥàţĥ ĩńśĩďē ţĥē śķĩĺĺ — àńŷ ƒōĺďēŕ ŵōŕķś (ē.ĝ. ŕēƒēŕēńćēś/ńōţēś.ḿď). Ƒōĺďēŕś ĩń ţĥē ƥàţĥ àŕē ćŕēàţēď ƒōŕ ŷōũ."
],
"lPkjpD": ["Ƥũśĥēď ", ["pushed"]],
- "lPzyrU": ["Àĺĺ ĥũńķś ŕēśōĺvēď"],
"lS83Sg": ["Ćōũĺďń’ţ ŕēàćĥ ţĥē ćĺĩƥƀōàŕď."],
"lScd1O": ["Śĺĩďēv ďēćķś ōƥēń ĩń ţĥē ŌƥēńĶńōŵĺēďĝē ďēśķţōƥ àƥƥ ōńĺŷ."],
"lT6wjt": ["Ēxƥàńď ƀōàŕď"],
@@ -3925,6 +3932,7 @@
"Ōŕĝàńĩźē ḿŷ ēxĩśţĩńĝ śƥēćś ĩńţō à ĺĩńķēď ĩńďēx ĝŕōũƥēď ƀŷ àŕēà, àńď ƒĺàĝ àńŷ ţĥàţ ĥàvē ďŕĩƒţēď ōũţ ōƒ śŷńć ŵĩţĥ ţĥē ćũŕŕēńţ ćōďē."
],
"mPzgTS": ["Ōƥēń ", ["docName"]],
+ "mR3uQg": ["Ţĥĩś ƒĩĺē ŵàś ďēĺēţēď ōń ţĥē ćũŕŕēńţ ƀŕàńćĥ (ďēĺēţē-ḿōďĩƒŷ ćōńƒĺĩćţ)."],
"mToVM9": ["Ḿēśśàĝē ", ["agentName"]],
"mU3j1b": ["Ŕēḿōvē ĩţēḿ ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (ćōńƒĺĩćţ)"],
@@ -4187,6 +4195,9 @@
" ƀēćàũśē ĩţ ćōńţàĩńś à .ĝĩţ ƒōĺďēŕ"
],
"pZAs1T": ["Ƒàĩĺēď ţō ĺōàď ōũţĝōĩńĝ ĺĩńķś"],
+ "pZaMLc": [
+ "Ţĥĩś ƒĩĺē ćōńţàĩńś ĺĩńēś ţĥàţ ĺōōķ ĺĩķē ćōńƒĺĩćţ ḿàŕķēŕś, śō ţĥē ćōńƒĺĩćţ ƀōũńďàŕĩēś ćàń'ţ ƀē ŕēàď ŕēĺĩàƀĺŷ. Ŕēśōĺvē ĩţ ƀŷ ĥàńď ōŕ ŵĩţĥ Àśķ ÀĨ."
+ ],
"paCw0z": ["ēvēŕŷţĥĩńĝ ũńďēŕ ", ["0"], "/ ƒōĺďēŕś ĩńśĩďē ", ["1"], "/"],
"pajIrl": ["Ćōũĺď ńōţ ţũŕń ōƒƒ ţĥē ţēŕḿĩńàĺ: ", ["0"]],
"pbwTg6": [["seconds"], "ś àĝō"],
@@ -4742,6 +4753,7 @@
"wU8WyK": ["Ēĺēḿēńţ ƒĩēĺďś"],
"wVa83H": ["Ćōũĺďń'ţ ćŕēàţē ţĥē ŕēƥōŕţ"],
"wWtVYd": ["Ēńţēŕ à ƥōŕţ ƀēţŵēēń 1 àńď 65535."],
+ "wXFalZ": ["Ƥŕēvĩēŵ ōƒ ", ["filename"]],
"wXO4Tg": [["hrs"], "ĥ àĝō"],
"wXw19Y": [
"Ŕēḿōvēď \"",
@@ -4859,6 +4871,7 @@
"y46m5r": ["Ţĥē ďēśķţōƥ àƥƥ ĩśń'ţ ŕēśƥōńďĩńĝ. Ŕēƒŕēśĥ àńď ţŕŷ àĝàĩń."],
"y5FUYi": ["Śũĝĝēśţĩōń ḿēńũ ōƥēń"],
"y5UgU8": ["Ďĩśàƀĺē ", ["0"]],
+ "y6HGwM": ["Ćōńƒĺĩćţś ŕēḿàĩńĩńĝ: ", ["liveRemaining"], "."],
"y8B54M": ["Ćōũĺďń'ţ śēńď ŷōũŕ ƥŕōḿƥţ — ƥĺēàśē ţŕŷ àĝàĩń."],
"yCX4jp": [" Ŷōũŕ śēĺēćţĩōń ćōũĺď ńōţ ƀē ŕēśţōŕēď."],
"yDlK9k": ["Ŕēśōĺvē ţĥē ćōńƒĺĩćţ ōń ", ["files"], " ƀēƒōŕē ďēĺēţĩńĝ."],
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index 13a5a7155..10b2efee8 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -524,10 +524,6 @@ msgstr ""
msgid "{chars, plural, one {char} other {chars}}"
msgstr ""
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr ""
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr ""
@@ -1327,8 +1323,31 @@ msgstr ""
msgid "Above"
msgstr ""
-#: src/components/DiffView.tsx
-msgid "Accept"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr ""
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr ""
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr ""
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr ""
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr ""
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
msgstr ""
#: src/components/DiffViewBoundary.tsx
@@ -1667,6 +1686,10 @@ msgstr ""
msgid "All"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr ""
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr ""
@@ -1675,10 +1698,6 @@ msgstr ""
msgid "All files are hidden by view filters."
msgstr ""
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr ""
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr ""
@@ -1838,6 +1857,10 @@ msgstr ""
msgid "Apply and restart project server"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr ""
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr ""
@@ -3124,6 +3147,10 @@ msgstr ""
msgid "Conflict"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr ""
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr ""
@@ -3137,6 +3164,10 @@ msgstr ""
msgid "Conflicts"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr ""
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr ""
@@ -3628,6 +3659,10 @@ msgstr ""
msgid "Couldn't apply the change: {0}"
msgstr ""
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr ""
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr ""
@@ -5443,10 +5478,6 @@ msgstr ""
msgid "exit {0}"
msgstr ""
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr ""
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6559,6 +6590,10 @@ msgstr ""
msgid "Hide HTML preview"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr ""
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr ""
@@ -8555,6 +8590,10 @@ msgstr ""
msgid "No comments yet. Select text in the document to add one."
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr ""
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr ""
@@ -10147,6 +10186,10 @@ msgstr ""
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr ""
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr ""
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr ""
@@ -10564,6 +10607,7 @@ msgid "Recycle Bin"
msgstr ""
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr ""
@@ -10600,7 +10644,6 @@ msgid "Reinstalling"
msgstr ""
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr ""
@@ -10850,6 +10893,10 @@ msgstr ""
msgid "Reopen"
msgstr ""
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr ""
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr ""
@@ -11327,10 +11374,6 @@ msgstr ""
msgid "Save queued message"
msgstr ""
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr ""
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr ""
@@ -12091,6 +12134,10 @@ msgstr ""
msgid "Show or hide Terminal"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr ""
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13096,6 +13143,10 @@ msgstr ""
msgid "That branch is already open in another worktree."
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr ""
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr ""
@@ -13566,6 +13617,10 @@ msgstr ""
msgid "This comment is on the whole property"
msgstr ""
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr ""
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr ""
@@ -13606,6 +13661,10 @@ msgstr ""
msgid "This file can't be opened in the text editor."
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr ""
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr ""
@@ -13618,6 +13677,14 @@ msgstr ""
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr ""
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr ""
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr ""
@@ -14198,7 +14265,7 @@ msgstr ""
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14228,6 +14295,10 @@ msgstr ""
msgid "Undo to this edit?"
msgstr ""
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr ""
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index e6596a45a..e66a0e372 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -253,6 +253,7 @@
"2XQ8Ww": ["Abrir a pré-visualização quando o agente editar"],
"2YOwme": ["Reiniciado — agora rodando a v", ["appRuntime"], "."],
"2YZwPB": ["A resposta de links de saída não tinha o formato esperado."],
+ "2Yt22K": ["Ocultar original"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["Ocultar o painel (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["Digite uma URL válida (por exemplo https://api.openai.com/v1)."],
@@ -416,6 +417,7 @@
"4Vgtaz": [
"Não foi possível acessar o quadro. Ele pode não existir, ou o servidor pode estar offline."
],
+ "4_-TKi": ["Aceitar ambas as versões para o conflito ", ["0"]],
"4buZWd": ["Herdado de ", ["path"]],
"4c_a6S": ["Ainda não há nada definido."],
"4d0VYJ": ["Criaremos um ID de tema seguro a partir deste nome."],
@@ -452,6 +454,7 @@
"4v2Yyz": [
"Seleciona todas as linhas visíveis da árvore de arquivos quando o foco está na barra lateral Arquivos."
],
+ "4vn1gP": ["Todos os conflitos resolvidos. Aplique as alterações para salvar."],
"4xtLTl": ["Pasta “", ["basename"], "” oculta"],
"4zGlN_": ["Cole a URL da imagem ou clique em enviar"],
"4z_1j2": ["Renderizado"],
@@ -749,17 +752,6 @@
],
"8AjnFz": ["\"", ["0"], "\" já tinha sido importado (conteúdo idêntico)."],
"8F1i42": ["Página não encontrada"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- {
- "one": ["#", " trecho não resolvido"],
- "many": ["#", " trechos não resolvidos"],
- "other": ["#", " trechos não resolvidos"]
- }
- ]
- ],
"8Gzz2G": ["worktree de ", ["worktreeOf"]],
"8HvJlU": [
"Uma habilidade DIFERENTE com nome parecido com esta fica em ",
@@ -996,6 +988,7 @@
],
"Aif3E7": ["Ativar a busca semântica"],
"AkA6DO": ["Faz parte do plugin ", ["0"], " — somente leitura; abra-o para editar uma cópia"],
+ "Al8HPP": ["Aceitar a versão atual para o conflito ", ["0"]],
"Am78jY": ["Arraste ", ["keyName"], " para reordenar"],
"ApeA0n": [["dropCount"], " edições desfeitas em ", ["docName"]],
"Aq-O0x": ["status"],
@@ -1851,6 +1844,7 @@
["componentName"],
"> não é um componente conhecido. Copie o código para usá-lo em outro lugar ou exclua o bloco."
],
+ "KhNkCq": ["Aceitar ambos"],
"Khxcyu": ["O acesso ao terminal não está ativado neste projeto."],
"KjTmeO": ["Atualize o OpenKnowledge para abrir este compartilhamento."],
"KkEAud": ["Cria um arquivo a partir do documento ou da pasta atual."],
@@ -1934,7 +1928,6 @@
"LaskKp": ["Enviar para o chat (", ["0"], ")"],
"Lbl6KA": ["Não deu para instalar a partir de ", ["0"], ": ", ["1"]],
"LbmLyU": ["Não é seguro editar a configuração desta ferramenta"],
- "Lcehxn": ["Salvar a resolução"],
"LdABLa": ["Não foi possível abrir ", ["target"], ". Tente abrir manualmente."],
"LdKIHS": ["Redigir uma especificação"],
"LeGeTf": ["OpenKnowledge no GitHub"],
@@ -1947,6 +1940,7 @@
],
"LhWYpm": ["Há outros caminhos OK rastreados no remoto:"],
"Li4U-T": ["Saiba mais sobre ", ["title"]],
+ "LkQRL8": ["Mostrar original"],
"LlHqdU": ["Inicializando o projeto"],
"LlJ8LD": [
"O compartilhamento da configuração não mudou: ",
@@ -2128,6 +2122,7 @@
"Ni4b7h": [
"Os plugins de projeto são o padrão de autoria do seu projeto — ligue ou desligue aqui. Cada plugin ativado ganha uma página própria em Plugins, na barra lateral de configurações."
],
+ "NjnHNV": ["Aceitar a versão recebida para o conflito ", ["0"]],
"NjrIak": ["Arquivo: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["Editar ", ["tag"]],
"NkXEFS": ["Falha ao restaurar — o documento não mudou"],
@@ -2137,6 +2132,7 @@
"NnQapF": ["Abrir com a IA ", ["targetDisplayName"]],
"NoY1k4": ["Estrutura da resposta do servidor inválida"],
"NpC29w": ["Cria um novo item de lista a partir do item atual."],
+ "NpRLRj": ["Desfaça suas resoluções para alterar isto."],
"NrFwux": ["Falha ao salvar as regras de conteúdo — ", ["0"]],
"Ns0z5o": [
"Quando você instala uma habilidade publicada, o diretório de habilidades (skills.sh) é avisado para que a contagem de instalações fique correta. São enviados o nome da habilidade, o repositório de origem dela e para quais ferramentas de IA ela foi — nunca o conteúdo dos arquivos, e nunca no caso de uma habilidade de origem privada, local ou digitada à mão. Uma vez por habilidade, por computador."
@@ -2195,6 +2191,7 @@
"OLBz-_": ["Falha ao renderizar o diagrama do Mermaid."],
"OLIKgw": ["Arraste o item ", ["0"], " para reordenar"],
"ONPvOb": ["Carregando a atividade do agente"],
+ "ONUgxB": ["Esse conflito não está mais disponível."],
"ONWvwQ": ["Enviar"],
"ONchxy": ["total"],
"ONgEZF": ["Carregando os títulos de ", ["pageTarget"]],
@@ -2278,6 +2275,7 @@
"PVSwOe": ["Redirecionando — aguardando a execução atual parar…"],
"PVUn_c": ["Abrir pasta"],
"PVggyD": ["Esquemas de frontmatter"],
+ "PWh9Ii": ["Aplicar alterações"],
"PWqtgd": ["Carregando o chat"],
"PXaT32": ["O servidor retornou uma resposta de destinos de habilidades incompleta."],
"PYmp-0": ["Importar como modelo"],
@@ -2368,6 +2366,7 @@
"QQbwzK": ["Nenhum agente disponível."],
"QQghPu": ["Instalar no Claude Desktop"],
"QR5SP1": ["modelo criado"],
+ "QVk3SK": ["Este arquivo foi excluído no ramo recebido (conflito modify-delete)."],
"QWdKwH": ["Mover"],
"QYTOaN": ["Você pode mudar isto depois em <0>Configurações → Sincronização</0>."],
"QYfQdv": ["CLI do ", ["displayName"]],
@@ -2791,6 +2790,7 @@
],
"VIwCaD": ["Entrada"],
"VJaBca": ["Escolha uma pasta de habilidade"],
+ "VL6VsE": ["Aceitar atual"],
"VM7H66": ["Este arquivo é binário e não pode ser mostrado como texto."],
"VMlRqi": ["Ocultar detalhes"],
"VNNRfN": ["tornar fonte"],
@@ -3043,7 +3043,7 @@
"Não deu para reiniciar o servidor — outro processo está com ele. Feche as outras janelas do OpenKnowledge deste projeto e tente de novo."
],
"Xv_ijG": ["https://github.com/dono/repo ou dono/repo"],
- "XyOUTJ": ["Sair da mesclagem"],
+ "XzL7x7": ["Reabra ", ["filePath"], " para continuar editando."],
"Xzy0s0": ["Remover ", ["fullLabel"], " do contexto"],
"Y-Urt2": ["Equação matemática em bloco renderizada com KaTeX a partir de código LaTeX."],
"Y1QMlM": ["Comece agora"],
@@ -3085,6 +3085,7 @@
"YSFv5w": ["Sem repositório git — o compartilhamento de configuração não se aplica aqui."],
"YTLmTM": ["Excluir a pasta <0>.git</0> acima"],
"YW7Q86": ["As configurações de busca ainda não carregaram — tente de novo em instantes"],
+ "YWK2zy": ["Diferenças do conflito em ", ["fileName"]],
"Y_GpJd": ["A requisição de download de ", ["0"], " expirou."],
"Y_ZQ6l": ["Instalando ", ["agentName"], "…"],
"Y_iImT": ["Não foi possível resolver o arquivo ", ["identity"], ". Ir para a referência."],
@@ -3267,6 +3268,7 @@
"Você escolheu sua pasta pessoal. O OpenKnowledge vai indexar toda a sua árvore pessoal — é grande e pode trazer à tona arquivos pessoais."
],
"_SDGzH": ["Continuar no navegador"],
+ "_SkqfM": ["Aceitar recebido"],
"_TDESN": ["Erro de rede - ", ["kind"], " \"", ["createdPath"], "\" ainda existe no disco"],
"_TF8ep": ["Falha ao renderizar o PDF"],
"_W-elG": ["(em linha)"],
@@ -3819,7 +3821,6 @@
}
]
],
- "g3UF2V": ["Aceitar"],
"g4WlQK": [
"O gerenciamento das ferramentas de IA do projeto só está disponível no app de desktop do OpenKnowledge."
],
@@ -3838,6 +3839,7 @@
],
"g9Nj4l": ["// nota"],
"gAhHu7": ["A correção automática só vale para problemas com uma correção mecânica conhecida."],
+ "gBCeDq": ["Sem ancestral comum: os dois ramos adicionaram este arquivo (conflito add/add)."],
"gBbxn_": ["Verificando o estado da sessão"],
"gDkNHk": ["Tem certeza de que deseja excluir \"", ["name"], "\"?"],
"gGVP4q": ["Clique em <0>+</0> <1/> <2>Criar habilidade</2> <3/> <4>Enviar habilidade</4>."],
@@ -3928,6 +3930,7 @@
"Mantenha um registro escrito de como seu produto é construído. Um lugar para propor ideias, registrar decisões, escrever especificações e anotar o que você aprendeu depois que algo quebrou."
],
"hCattk": ["OpenKnowledge importou ", ["source"]],
+ "hCghAK": ["Este conflito foi resolvido."],
"hDEaQu": ["Conecte o OpenKnowledge às outras ferramentas que você usa."],
"hDKtoF": ["há ", ["diffHrs"], " h"],
"hDoLrm": ["Remover ", ["projectName"], " dos projetos recentes"],
@@ -4154,6 +4157,11 @@
"Incorpora uma página externa em um iframe embutido (documentação, demos, Figma, CodeSandbox)."
],
"jTUxaN": ["Ativar Automático (somente Pull)"],
+ "jTdrn1": [
+ "Não foi possível verificar se ",
+ ["filePath"],
+ " ainda está em conflito — tentando novamente."
+ ],
"jWzDfC": ["Verificando quais ferramentas de IA você tem"],
"jZ_E5M": ["Falha ao buscar — veja os logs do servidor para os detalhes."],
"j_Z6g7": ["Padrão compartilhado"],
@@ -4358,7 +4366,6 @@
"Um caminho dentro da habilidade — qualquer pasta serve (ex.: references/notes.md). As pastas do caminho são criadas para você."
],
"lPkjpD": ["Enviado ", ["pushed"]],
- "lPzyrU": ["Todos os trechos resolvidos"],
"lS83Sg": ["Não foi possível acessar a área de transferência."],
"lScd1O": ["Os slides do Slidev abrem apenas no aplicativo de desktop do OpenKnowledge."],
"lT6wjt": ["Expandir o quadro"],
@@ -4446,6 +4453,7 @@
"Organize minhas especificações existentes em um índice interligado e agrupado por área, e sinalize as que se desencontraram do código atual."
],
"mPzgTS": ["Abrir ", ["docName"]],
+ "mR3uQg": ["Este arquivo foi excluído no ramo atual (conflito delete-modify)."],
"mToVM9": ["Enviar mensagem para ", ["agentName"]],
"mU3j1b": ["Remover o item ", ["0"]],
"mVFyH-": [["accessibleLabel"], " (conflito)"],
@@ -4730,6 +4738,9 @@
" foi aberta porque contém uma pasta .git"
],
"pZAs1T": ["Falha ao carregar os links de saída"],
+ "pZaMLc": [
+ "Este arquivo contém linhas que parecem marcadores de conflito, então os limites do conflito não podem ser lidos de forma confiável. Resolva-o manualmente ou com Perguntar à IA."
+ ],
"paCw0z": ["tudo dentro das pastas ", ["0"], "/ que estão em ", ["1"], "/"],
"pajIrl": ["Não foi possível desligar o terminal: ", ["0"]],
"pbwTg6": ["há ", ["seconds"], " s"],
@@ -5353,6 +5364,7 @@
"wU8WyK": ["Campos do elemento"],
"wVa83H": ["Não deu para criar o relatório"],
"wWtVYd": ["Digite uma porta entre 1 e 65535."],
+ "wXFalZ": ["Pré-visualização de ", ["filename"]],
"wXO4Tg": ["há ", ["hrs"], " h"],
"wXw19Y": [
"\"",
@@ -5472,6 +5484,7 @@
"y46m5r": ["O app de desktop não está respondendo. Atualize e tente de novo."],
"y5FUYi": ["Menu de sugestões aberto"],
"y5UgU8": ["Desativar ", ["0"]],
+ "y6HGwM": ["Conflitos restantes: ", ["liveRemaining"], "."],
"y8B54M": ["Não deu para enviar seu prompt — tente de novo."],
"yCX4jp": [" Não foi possível restaurar sua seleção."],
"yDlK9k": ["Resolva o conflito em ", ["files"], " antes de excluir."],
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 5b078cf24..cc97161d1 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} fica fora deste projeto, em <0>{source}</0> — os agentes ex
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {caractere} many {caracteres} other {caracteres}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# trecho não resolvido} many {# trechos não resolvidos} other {# trechos não resolvidos}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (vazio)"
@@ -1327,9 +1323,32 @@ msgstr "Sobre o {appName}"
msgid "Above"
msgstr "Acima"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "Aceitar"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "Aceitar ambos"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "Aceitar ambas as versões para o conflito {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "Aceitar atual"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "Aceitar a versão atual para o conflito {0}"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "Aceitar recebido"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "Aceitar a versão recebida para o conflito {0}"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1667,6 +1686,10 @@ msgstr "{editor} alinhado ao código fonte (os bytes dele têm backup)"
msgid "All"
msgstr "Tudo"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "Todos os conflitos resolvidos. Aplique as alterações para salvar."
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "Todos os arquivos"
@@ -1675,10 +1698,6 @@ msgstr "Todos os arquivos"
msgid "All files are hidden by view filters."
msgstr "Os filtros de visualização ocultam todos os arquivos."
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "Todos os trechos resolvidos"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "Todas as tags"
@@ -1838,6 +1857,10 @@ msgstr "Aplica-se quando você retomar esta conversa"
msgid "Apply and restart project server"
msgstr "Aplicar e reiniciar o servidor do projeto"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "Aplicar alterações"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "Aplicar link"
@@ -3124,6 +3147,10 @@ msgstr "conflito"
msgid "Conflict"
msgstr "Conflito"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "Diferenças do conflito em {fileName}"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "Arquivos em conflito"
@@ -3137,6 +3164,10 @@ msgstr "Arquivos em conflito: {0}."
msgid "Conflicts"
msgstr "Conflitos"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "Conflitos restantes: {liveRemaining}."
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "Conectar"
@@ -3628,6 +3659,10 @@ msgstr "Não deu para adicionar esse comentário."
msgid "Couldn't apply the change: {0}"
msgstr "Não deu para aplicar a alteração: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "Não foi possível verificar se {filePath} ainda está em conflito — tentando novamente."
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "Não deu para limpar a chave — tente de novo."
@@ -5443,10 +5478,6 @@ msgstr "Sair"
msgid "exit {0}"
msgstr "saída {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "Sair da mesclagem"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6559,6 +6590,10 @@ msgstr "Ocultar a pasta"
msgid "Hide HTML preview"
msgstr "Ocultar a pré-visualização do HTML"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "Ocultar original"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "Ocultar os outros"
@@ -8555,6 +8590,10 @@ msgstr "Ainda não há comentários neste projeto. Comente um trecho para começ
msgid "No comments yet. Select text in the document to add one."
msgstr "Ainda não há comentários. Selecione um texto no documento para adicionar um."
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "Sem ancestral comum: os dois ramos adicionaram este arquivo (conflito add/add)."
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "Nenhuma alteração de conteúdo nesta versão."
@@ -10147,6 +10186,10 @@ msgstr "Pressione o sol ou a lua em “Custom” acima para usar este tema."
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "Navegadores de pré-visualização não conseguem copiar sozinhos. Use Cmd/Ctrl+C na URL acima ou abra o OK no app de desktop."
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "Pré-visualização de {filename}"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "Pré-visualização da captura de tela"
@@ -10564,6 +10607,7 @@ msgid "Recycle Bin"
msgstr "Lixeira"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "Refazer"
@@ -10600,7 +10644,6 @@ msgid "Reinstalling"
msgstr "Reinstalando"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "Rejeitar"
@@ -10850,6 +10893,10 @@ msgstr "Renderizado"
msgid "Reopen"
msgstr "Reabrir"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "Reabra {filePath} para continuar editando."
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "Reabrir um chat anterior"
@@ -11327,10 +11374,6 @@ msgstr "Falha ao salvar: {error}"
msgid "Save queued message"
msgstr "Salvar a mensagem na fila"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "Salvar a resolução"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "Salvar este comentário (Enter)"
@@ -12091,6 +12134,10 @@ msgstr "Mostrar ou ocultar Arquivos"
msgid "Show or hide Terminal"
msgstr "Mostrar ou ocultar o Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "Mostrar original"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13096,6 +13143,10 @@ msgstr "Obrigado pelo relatório!"
msgid "That branch is already open in another worktree."
msgstr "Esse ramo já está aberto em outro worktree."
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "Esse conflito não está mais disponível."
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "Isso não foi concluído. Verifique os logs do servidor e tente de novo."
@@ -13566,6 +13617,10 @@ msgstr "Isto pode ser configurado em Configurações > Ferramentas de IA e CLI"
msgid "This comment is on the whole property"
msgstr "Este comentário é sobre a propriedade inteira"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "Este conflito foi resolvido."
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "Este documento"
@@ -13606,6 +13661,10 @@ msgstr "Este campo carrega palavras-chave de esquema adicionais que o editor nã
msgid "This file can't be opened in the text editor."
msgstr "Não dá para abrir este arquivo no editor de texto."
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "Este arquivo contém linhas que parecem marcadores de conflito, então os limites do conflito não podem ser lidos de forma confiável. Resolva-o manualmente ou com Perguntar à IA."
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "Este arquivo não foi encontrado."
@@ -13618,6 +13677,14 @@ msgstr "Este arquivo é binário e não pode ser mostrado como texto."
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "Este arquivo é grande demais para abrir no editor de texto integrado (limite de 1 MB). Use Abrir arquivo, abaixo, para abri-lo em outro app."
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "Este arquivo foi excluído no ramo atual (conflito delete-modify)."
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "Este arquivo foi excluído no ramo recebido (conflito modify-delete)."
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "Esta pasta não contém um repositório git. Escolher outra pasta?"
@@ -14198,7 +14265,7 @@ msgstr "A última edição em {docName} foi desfeita"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14228,6 +14295,10 @@ msgstr "Desfaz ou refaz suas próprias edições, deixando intactas as de colabo
msgid "Undo to this edit?"
msgstr "Desfazer até esta edição?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "Desfaça suas resoluções para alterar isto."
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "Desfaz, refaz ou percorre as mudanças de seleção no painel Editar código ou em um campo de propriedade em formato de código."
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index fa322197a..44d3c9e9b 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -231,6 +231,7 @@
"2XQ8Ww": ["ایجنٹ کی ترمیم پر پیش منظر کھولیں"],
"2YOwme": ["دوبارہ چل پڑا — اب v", ["appRuntime"], " چل رہا ہے۔"],
"2YZwPB": ["باہر جانے والے لنکس کا جواب متوقع ساخت سے میل نہیں کھایا۔"],
+ "2Yt22K": ["اصل چھپائیں"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["پینل چھپائیں (", ["panelShortcutLabel"], ")"],
"2j1kfc": ["درست URL درج کریں (مثلاً https://api.openai.com/v1)۔"],
@@ -366,6 +367,7 @@
"4Sxexw": ["سورس میں واپسی یا دوبارہ"],
"4TzU0n": ["ابتدائیہ کریں"],
"4Vgtaz": ["بورڈ تک رسائی نہیں ہو سکی۔ ہو سکتا ہے وہ موجود نہ ہو، یا سرور آف لائن ہو۔"],
+ "4_-TKi": ["کنفلکٹ ", ["0"], " کے لیے دونوں ورژن قبول کریں"],
"4buZWd": [["path"], " سے وراثت میں ملا"],
"4c_a6S": ["ابھی کچھ مقرر نہیں۔"],
"4d0VYJ": ["ہم اس نام سے ایک محفوظ تھیم ID بنائیں گے۔"],
@@ -398,6 +400,7 @@
"4v2Yyz": [
"جب فوکس فائلوں کے سائیڈ بار میں ہو تو فائل ٹری کی ہر نظر آنے والی قطار منتخب کریں۔"
],
+ "4vn1gP": ["تمام کنفلکٹس حل ہو گئے۔ محفوظ کرنے کے لیے تبدیلیاں لاگو کریں۔"],
"4xtLTl": ["چھپا ہوا فولڈر “", ["basename"], "”"],
"4zGlN_": ["تصویر کا URL چسپاں کریں یا اپ لوڈ پر کلک کریں"],
"4z_1j2": ["رینڈر شدہ"],
@@ -667,13 +670,6 @@
],
"8AjnFz": ["«", ["0"], "» پہلے ہی درآمد ہو چکا تھا (یکساں مواد)۔"],
"8F1i42": ["صفحہ نہیں ملا"],
- "8FqTCr": [
- [
- "chunksRemaining",
- "plural",
- { "one": ["#", " غیر حل شدہ حصہ"], "other": ["#", " غیر حل شدہ حصے"] }
- ]
- ],
"8Gzz2G": [["worktreeOf"], " کا ورک ٹری"],
"8HvJlU": [
"اس جیسے نام کی ایک مختلف مہارت ",
@@ -879,6 +875,7 @@
],
"Aif3E7": ["معنوی تلاش فعال کریں"],
"AkA6DO": [["0"], " پلگ اِن کا حصہ — صرف پڑھنے کے لیے؛ نقل میں ترمیم کے لیے اسے کھولیں"],
+ "Al8HPP": ["کنفلکٹ ", ["0"], " کے لیے موجودہ ورژن قبول کریں"],
"Am78jY": ["ترتیب بدلنے کے لیے ", ["keyName"], " کھینچیں"],
"ApeA0n": [["docName"], " پر ", ["dropCount"], " ترامیم واپس لے لی گئیں"],
"Aq-O0x": ["حالت"],
@@ -1649,6 +1646,7 @@
["componentName"],
"> کوئی معلوم جزو نہیں ہے۔ اسے کہیں اور استعمال کرنے کے لیے سورس کاپی کریں، یا بلاک حذف کر دیں۔"
],
+ "KhNkCq": ["دونوں قبول کریں"],
"Khxcyu": ["اس پروجیکٹ کے لیے ٹرمینل کی رسائی فعال نہیں۔"],
"KjTmeO": ["اس شیئر کو کھولنے کے لیے OpenKnowledge اپ ڈیٹ کریں۔"],
"KkEAud": ["موجودہ دستاویز یا فولڈر کے سیاق سے فائل بنائیں۔"],
@@ -1727,7 +1725,6 @@
"LaskKp": ["چیٹ میں بھیجیں (", ["0"], ")"],
"Lbl6KA": [["0"], " سے نصب نہیں ہو سکا: ", ["1"]],
"LbmLyU": ["اس ٹول کی کنفیگ محفوظ طریقے سے ترمیم نہیں کی جا سکتی"],
- "Lcehxn": ["حل محفوظ کریں"],
"LdABLa": [["target"], " نہیں کھل سکا۔ اسے دستی طور پر کھولنے کی کوشش کریں۔"],
"LdKIHS": ["ایک اسپیک لکھیں"],
"LeGeTf": ["GitHub پر OpenKnowledge"],
@@ -1740,6 +1737,7 @@
],
"LhWYpm": ["OK کے دیگر راستے اپ سٹریم ٹریک ہوتے ہیں:"],
"Li4U-T": [["title"], " کے بارے میں مزید جانیں"],
+ "LkQRL8": ["اصل دکھائیں"],
"LlHqdU": ["پروجیکٹ کا ابتدائیہ ہو رہا ہے"],
"LlJ8LD": [
"کنفیگ شیئرنگ میں تبدیلی نہیں ہوئی: اپ اسٹریم پر ",
@@ -1903,6 +1901,7 @@
"Ni4b7h": [
"پروجیکٹ کے پلگ اِنز آپ کے پروجیکٹ کا تصنیفی معیار ہیں — انہیں یہاں فعال یا بند کریں۔ ہر فعال پلگ اِن کو ترتیبات کے سائیڈ بار میں پلگ اِنز کے تحت اپنا صفحہ ملتا ہے۔"
],
+ "NjnHNV": ["کنفلکٹ ", ["0"], " کے لیے آنے والا ورژن قبول کریں"],
"NjrIak": ["فائل: <0>", ["fixedName"], ".md</0>"],
"NkNfSr": [["tag"], " میں ترمیم کریں"],
"NkXEFS": ["بحالی ناکام — دستاویز میں کوئی تبدیلی نہیں"],
@@ -1912,6 +1911,7 @@
"NnQapF": ["AI ", ["targetDisplayName"], " کے ساتھ کھولیں"],
"NoY1k4": ["سرور کے جواب کی ساخت غیر درست ہے"],
"NpC29w": ["موجودہ فہرست آئٹم سے نیا فہرست آئٹم بنائیں۔"],
+ "NpRLRj": ["اسے تبدیل کرنے کے لیے اپنی ریزولوشنز واپس لیں۔"],
"NrFwux": ["مواد کے قواعد محفوظ نہیں ہو سکے — ", ["0"]],
"Ns0z5o": [
"جب آپ کوئی شائع شدہ مہارت نصب کریں تو مہارتوں کی ڈائریکٹری (skills.sh) کو بتائیں تاکہ اس کی تنصیبات کی تعداد درست رہے۔ مہارت کا نام، اس کا ماخذ ریپازٹری، اور یہ کہ وہ کن ایجنٹ ٹولز میں گئی، بھیجا جاتا ہے — فائلوں کا مواد کبھی نہیں، اور نجی، مقامی یا ہاتھ سے لکھے ماخذ کی مہارت کے لیے کبھی نہیں۔ ہر مشین پر ہر مہارت کے لیے ایک بار۔"
@@ -1968,6 +1968,7 @@
"OLBz-_": ["Mermaid خاکہ رینڈر نہیں ہو سکا۔"],
"OLIKgw": ["ترتیب بدلنے کے لیے آئٹم ", ["0"], " کھینچیں"],
"ONPvOb": ["ایجنٹ کی سرگرمی لوڈ ہو رہی ہے"],
+ "ONUgxB": ["وہ کنفلکٹ اب دستیاب نہیں ہے۔"],
"ONWvwQ": ["اپ لوڈ کریں"],
"ONchxy": ["کل"],
"ONgEZF": [["pageTarget"], " کے عنوانات لوڈ ہو رہے ہیں"],
@@ -2051,6 +2052,7 @@
"PVSwOe": ["رخ بدلا جا رہا ہے — موجودہ عمل کے رکنے کا انتظار…"],
"PVUn_c": ["فولڈر کھولیں"],
"PVggyD": ["Frontmatter اسکیماز"],
+ "PWh9Ii": ["تبدیلیاں لاگو کریں"],
"PWqtgd": ["چیٹ لوڈ ہو رہی ہے"],
"PXaT32": ["سرور نے نامکمل اسکل ٹارگٹس جواب لوٹایا۔"],
"PYmp-0": ["ٹیمپلیٹ کے طور پر درآمد کریں"],
@@ -2131,6 +2133,7 @@
"QQbwzK": ["کوئی ایجنٹ دستیاب نہیں۔"],
"QQghPu": ["Claude Desktop میں نصب کریں"],
"QR5SP1": ["ٹیمپلیٹ بنایا"],
+ "QVk3SK": ["یہ فائل آنے والی برانچ پر حذف کر دی گئی تھی (modify-delete تنازع)۔"],
"QWdKwH": ["منتقل کریں"],
"QYTOaN": ["آپ اسے بعد میں <0>ترتیبات ← مطابقت پذیری</0> میں بدل سکتے ہیں۔"],
"QYfQdv": [["displayName"], " CLI"],
@@ -2510,6 +2513,7 @@
],
"VIwCaD": ["اندراج"],
"VJaBca": ["مہارت کا فولڈر منتخب کریں"],
+ "VL6VsE": ["موجودہ قبول کریں"],
"VM7H66": ["یہ فائل بائنری ہے اور متن کے طور پر نہیں دکھائی جا سکتی۔"],
"VMlRqi": ["تفصیلات چھپائیں"],
"VNNRfN": ["ماخذ بنائیں"],
@@ -2723,7 +2727,7 @@
"سرور دوبارہ نہیں چل سکا — کوئی اور عمل اس کا مالک ہے۔ اس پروجیکٹ کے لیے OpenKnowledge کی دیگر ونڈوز بند کریں، پھر دوبارہ کوشش کریں۔"
],
"Xv_ijG": ["https://github.com/owner/repo یا owner/repo"],
- "XyOUTJ": ["ضم کرنا ختم کریں"],
+ "XzL7x7": ["ترمیم جاری رکھنے کے لیے ", ["filePath"], " دوبارہ کھولیں۔"],
"Xzy0s0": [["fullLabel"], " کو سیاق سے ہٹائیں"],
"Y-Urt2": ["LaTeX سورس سٹرنگ سے KaTeX کے ذریعے رینڈر کی گئی بلاک ریاضی مساوات۔"],
"Y1QMlM": ["ترتیب دیں"],
@@ -2765,6 +2769,7 @@
"YSFv5w": ["کوئی git ریپازٹری نہیں — کنفیگ کا اشتراک یہاں لاگو نہیں ہوتا۔"],
"YTLmTM": ["والد <0>.git</0> فولڈر ہٹائیں"],
"YW7Q86": ["تلاش کی ترتیبات ابھی لوڈ نہیں ہوئیں — تھوڑی دیر بعد دوبارہ کوشش کریں"],
+ "YWK2zy": [["fileName"], " کے لیے کنفلکٹ ڈِف"],
"Y_GpJd": [["0"], " کی ڈاؤن لوڈ درخواست کا وقت ختم ہو گیا۔"],
"Y_ZQ6l": [["agentName"], " نصب کیا جا رہا ہے…"],
"Y_iImT": ["ناقابلِ حل فائل ", ["identity"], "۔ حوالہ پر جائیں۔"],
@@ -2941,6 +2946,7 @@
"آپ نے اپنی ہوم ڈائریکٹری منتخب کی۔ OpenKnowledge آپ کے پورے ہوم ٹری کی ہر چیز اشاریہ بند کرے گا — یہ بڑا ہے اور ذاتی فائلیں سامنے لا سکتا ہے۔"
],
"_SDGzH": ["براؤزر میں جاری رکھیں"],
+ "_SkqfM": ["آنے والا قبول کریں"],
"_TDESN": ["نیٹ ورک کی خرابی - ", ["kind"], " «", ["createdPath"], "» اب بھی ڈسک پر موجود ہے"],
"_TF8ep": ["PDF رینڈر نہیں ہو سکی"],
"_W-elG": ["(اِن لائن)"],
@@ -3419,7 +3425,6 @@
}
]
],
- "g3UF2V": ["قبول کریں"],
"g4WlQK": ["پروجیکٹ کے AI ٹولز کا انتظام صرف OpenKnowledge ڈیسک ٹاپ ایپ میں دستیاب ہے۔"],
"g4XBm0": ["چھوٹا سیکشن عنوان۔"],
"g4e0hS": [["agentName"], " سے پوچھیں"],
@@ -3435,6 +3440,7 @@
],
"g9Nj4l": ["// نوٹ"],
"gAhHu7": ["خودکار اصلاح صرف ان مسائل پر لاگو ہوتی ہے جن کا معلوم میکانکی حل موجود ہو۔"],
+ "gBCeDq": ["کوئی مشترکہ سلف نہیں — دونوں برانچوں نے یہ فائل شامل کی (add/add تنازع)۔"],
"gBbxn_": ["سائن اِن کی حالت جانچی جا رہی ہے"],
"gDkNHk": ["کیا آپ واقعی \"", ["name"], "\" کو حذف کرنا چاہتے ہیں؟"],
"gGVP4q": ["<0>+</0> <1/> <2>مہارت بنائیں</2> <3/> <4>مہارت اپ لوڈ کریں</4> پر کلک کریں۔"],
@@ -3522,6 +3528,7 @@
"اس کا تحریری ریکارڈ رکھیں کہ آپ کی مصنوع کیسے بنتی ہے۔ خیالات پیش کرنے، فیصلے درج کرنے، اسپیکس لکھنے، اور کچھ ٹوٹنے کے بعد سیکھے گئے اسباق محفوظ کرنے کا ٹھکانہ۔"
],
"hCattk": ["OpenKnowledge نے ", ["source"], " درآمد کیا"],
+ "hCghAK": ["یہ تنازع حل ہو گیا ہے۔"],
"hDEaQu": ["OpenKnowledge کو اپنے استعمال کے دیگر ٹولز سے منسلک کریں۔"],
"hDKtoF": [["diffHrs"], " گھنٹے پہلے"],
"hDoLrm": [["projectName"], " کو حالیہ پروجیکٹس سے ہٹائیں"],
@@ -3737,6 +3744,7 @@
"کوئی بیرونی صفحہ اِن لائن iframe میں شامل کریں (دستاویزات، ڈیمو، Figma، CodeSandbox)۔"
],
"jTUxaN": ["خودکار (صرف کھینچیں) فعال کریں"],
+ "jTdrn1": [["filePath"], " میں اب بھی کنفلکٹ ہے یا نہیں، جانچا نہ جا سکا — دوبارہ کوشش جاری۔"],
"jWzDfC": ["دیکھا جا رہا ہے کہ آپ کے پاس کون سے AI ٹولز ہیں"],
"jZ_E5M": ["لانا ناکام رہا — تفصیلات کے لیے سرور کے لاگز دیکھیں۔"],
"j_Z6g7": ["مشترکہ طے شدہ"],
@@ -3936,7 +3944,6 @@
"مہارت کے اندر کا راستہ — کوئی بھی فولڈر چلتا ہے (مثلاً references/notes.md)۔ راستے میں شامل فولڈرز آپ کے لیے بنا دیے جاتے ہیں۔"
],
"lPkjpD": [["pushed"], " بھیجا گیا"],
- "lPzyrU": ["تمام حصے حل ہو گئے"],
"lS83Sg": ["کلپ بورڈ تک رسائی نہیں ہو سکی۔"],
"lScd1O": ["Slidev ڈیک صرف OpenKnowledge ڈیسک ٹاپ ایپ میں کھلتے ہیں۔"],
"lT6wjt": ["بورڈ پھیلائیں"],
@@ -4021,6 +4028,7 @@
"میری موجودہ اسپیکس کو شعبے کے لحاظ سے گروپ شدہ ایک مربوط اشاریے میں منظم کریں، اور ان میں سے کسی کو نشان زد کریں جو موجودہ کوڈ سے ہم آہنگ نہ رہی ہو۔"
],
"mPzgTS": [["docName"], " کھولیں"],
+ "mR3uQg": ["یہ فائل موجودہ برانچ پر حذف کر دی گئی تھی (delete-modify تنازع)۔"],
"mToVM9": [["agentName"], " کو پیغام بھیجیں"],
"mU3j1b": ["آئٹم ", ["0"], " ہٹائیں"],
"mVFyH-": [["accessibleLabel"], " (تصادم)"],
@@ -4281,6 +4289,9 @@
" کا اوپر والا فولڈر کھولا گیا، کیونکہ اس میں ‎.git فولڈر موجود ہے"
],
"pZAs1T": ["باہر جانے والے لنکس لوڈ نہیں ہو سکے"],
+ "pZaMLc": [
+ "اس فائل میں ایسی سطریں ہیں جو کنفلکٹ مارکرز جیسی لگتی ہیں، اس لیے کنفلکٹ کی حدود بھروسے سے نہیں پڑھی جا سکتیں۔ اسے خود حل کریں یا AI سے پوچھیں استعمال کریں۔"
+ ],
"paCw0z": [["1"], "/ کے اندر ", ["0"], "/ فولڈرز کے تحت سب کچھ"],
"pajIrl": ["ٹرمینل بند نہیں ہو سکا: ", ["0"]],
"pbwTg6": [["seconds"], " سیکنڈ پہلے"],
@@ -4824,6 +4835,7 @@
"wU8WyK": ["عنصر کے فیلڈز"],
"wVa83H": ["رپورٹ نہیں بن سکی"],
"wWtVYd": ["1 اور 65535 کے درمیان ایک پورٹ درج کریں۔"],
+ "wXFalZ": [["filename"], " کا پیش منظر"],
"wXO4Tg": [["hrs"], " گھنٹے پہلے"],
"wXw19Y": [
"«",
@@ -4939,6 +4951,7 @@
"y46m5r": ["ڈیسک ٹاپ ایپ جواب نہیں دے رہی۔ تازہ کریں اور دوبارہ کوشش کریں۔"],
"y5FUYi": ["تجاویز کا مینو کھلا ہے"],
"y5UgU8": [["0"], " بند کریں"],
+ "y6HGwM": ["باقی کنفلکٹس: ", ["liveRemaining"], "۔"],
"y8B54M": ["آپ کا پرامپٹ نہیں بھیجا جا سکا — براہِ کرم دوبارہ کوشش کریں۔"],
"yCX4jp": [" آپ کا انتخاب بحال نہیں کیا جا سکا۔"],
"yDlK9k": ["حذف کرنے سے پہلے ", ["files"], " کا تنازع حل کریں۔"],
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index ffb39ea6d..2dc8335d8 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} اس پروجیکٹ سے باہر، <0>{source}</0> پر ہے
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, one {حرف} other {حروف}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, one {# غیر حل شدہ حصہ} other {# غیر حل شدہ حصے}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel} (خالی)"
@@ -1331,9 +1327,32 @@ msgstr "{appName} کے بارے میں"
msgid "Above"
msgstr "اوپر"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "قبول کریں"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "دونوں قبول کریں"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "کنفلکٹ {0} کے لیے دونوں ورژن قبول کریں"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "موجودہ قبول کریں"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "کنفلکٹ {0} کے لیے موجودہ ورژن قبول کریں"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "آنے والا قبول کریں"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "کنفلکٹ {0} کے لیے آنے والا ورژن قبول کریں"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "{editor} کو ماخذ سے ہم آہنگ کر دیا گیا (اس کے
msgid "All"
msgstr "سب"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "تمام کنفلکٹس حل ہو گئے۔ محفوظ کرنے کے لیے تبدیلیاں لاگو کریں۔"
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "تمام فائلیں"
@@ -1679,10 +1702,6 @@ msgstr "تمام فائلیں"
msgid "All files are hidden by view filters."
msgstr "تمام فائلیں ویو فلٹرز سے چھپی ہوئی ہیں۔"
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "تمام حصے حل ہو گئے"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "تمام ٹیگز"
@@ -1842,6 +1861,10 @@ msgstr "جب آپ یہ گفتگو دوبارہ شروع کریں گے تو لا
msgid "Apply and restart project server"
msgstr "لاگو کریں اور پروجیکٹ سرور دوبارہ شروع کریں"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "تبدیلیاں لاگو کریں"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "لنک لاگو کریں"
@@ -3128,6 +3151,10 @@ msgstr "تصادم"
msgid "Conflict"
msgstr "تصادم"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "{fileName} کے لیے کنفلکٹ ڈِف"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "متضاد فائلیں"
@@ -3141,6 +3168,10 @@ msgstr "متصادم فائلیں: {0}۔"
msgid "Conflicts"
msgstr "تنازعات"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "باقی کنفلکٹس: {liveRemaining}۔"
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "منسلک کریں"
@@ -3632,6 +3663,10 @@ msgstr "وہ تبصرہ شامل نہیں ہو سکا۔"
msgid "Couldn't apply the change: {0}"
msgstr "تبدیلی لاگو نہیں ہو سکی: {0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "{filePath} میں اب بھی کنفلکٹ ہے یا نہیں، جانچا نہ جا سکا — دوبارہ کوشش جاری۔"
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "کلید صاف نہیں ہو سکی — براہِ کرم دوبارہ کوشش کریں۔"
@@ -5447,10 +5482,6 @@ msgstr "باہر نکلیں"
msgid "exit {0}"
msgstr "{0} سے باہر نکلیں"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "ضم کرنا ختم کریں"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "فولڈر چھپائیں"
msgid "Hide HTML preview"
msgstr "HTML کا پیش منظر چھپائیں"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "اصل چھپائیں"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "دیگر چھپائیں"
@@ -8559,6 +8594,10 @@ msgstr "اس پروجیکٹ میں ابھی کوئی تبصرہ نہیں ہے۔
msgid "No comments yet. Select text in the document to add one."
msgstr "ابھی کوئی تبصرہ نہیں۔ ایک شامل کرنے کے لیے دستاویز میں متن منتخب کریں۔"
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "کوئی مشترکہ سلف نہیں — دونوں برانچوں نے یہ فائل شامل کی (add/add تنازع)۔"
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "اس ورژن میں مواد کی کوئی تبدیلی نہیں۔"
@@ -10151,6 +10190,10 @@ msgstr "اس تھیم کو استعمال کرنے کے لیے اوپر “حس
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "پیش منظر کے براؤزر خودکار نقل نہیں کر سکتے۔ اوپر دیے گئے URL پر Cmd/Ctrl+C استعمال کریں، یا OK کو ڈیسک ٹاپ ایپ میں کھولیں۔"
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "{filename} کا پیش منظر"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "اسکرین شاٹ کا پیش منظر"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "ری سائیکل بن"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "دوبارہ کریں"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "دوبارہ نصب کیا جا رہا ہے"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "مسترد کریں"
@@ -10854,6 +10897,10 @@ msgstr "رینڈر شدہ"
msgid "Reopen"
msgstr "دوبارہ کھولیں"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "ترمیم جاری رکھنے کے لیے {filePath} دوبارہ کھولیں۔"
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "پچھلی چیٹ دوبارہ کھولیں"
@@ -11331,10 +11378,6 @@ msgstr "محفوظ کرنا ناکام: {error}"
msgid "Save queued message"
msgstr "قطار میں موجود پیغام محفوظ کریں"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "حل محفوظ کریں"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "یہ تبصرہ محفوظ کریں (Enter)"
@@ -12095,6 +12138,10 @@ msgstr "فائلیں دکھائیں یا چھپائیں"
msgid "Show or hide Terminal"
msgstr "Terminal دکھائیں یا چھپائیں"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "اصل دکھائیں"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "رپورٹ کا شکریہ!"
msgid "That branch is already open in another worktree."
msgstr "وہ برانچ پہلے سے کسی اور ورک ٹری میں کھلی ہے۔"
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "وہ کنفلکٹ اب دستیاب نہیں ہے۔"
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "یہ مکمل نہیں ہوا۔ سرور لاگ دیکھیں اور دوبارہ کوشش کریں۔"
@@ -13570,6 +13621,10 @@ msgstr "یہ ترتیبات > AI ٹولز اور CLI میں مقرر کیا جا
msgid "This comment is on the whole property"
msgstr "یہ تبصرہ پوری خصوصیت پر ہے"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "یہ تنازع حل ہو گیا ہے۔"
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "یہ دستاویز"
@@ -13610,6 +13665,10 @@ msgstr "اس فیلڈ میں اسکیما کے اضافی کلیدی الفاظ
msgid "This file can't be opened in the text editor."
msgstr "یہ فائل ٹیکسٹ ایڈیٹر میں نہیں کھل سکتی۔"
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "اس فائل میں ایسی سطریں ہیں جو کنفلکٹ مارکرز جیسی لگتی ہیں، اس لیے کنفلکٹ کی حدود بھروسے سے نہیں پڑھی جا سکتیں۔ اسے خود حل کریں یا AI سے پوچھیں استعمال کریں۔"
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "یہ فائل نہیں مل سکی۔"
@@ -13622,6 +13681,14 @@ msgstr "یہ فائل بائنری ہے اور متن کے طور پر نہیں
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "یہ فائل بلٹ اِن ٹیکسٹ ایڈیٹر میں کھولنے کے لیے بہت بڑی ہے (حد 1 MB)۔ اسے کسی اور ایپ میں کھولنے کے لیے نیچے «فائل کھولیں» استعمال کریں۔"
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "یہ فائل موجودہ برانچ پر حذف کر دی گئی تھی (delete-modify تنازع)۔"
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "یہ فائل آنے والی برانچ پر حذف کر دی گئی تھی (modify-delete تنازع)۔"
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "اس فولڈر میں کوئی git ریپوزٹری نہیں۔ کوئی اور فولڈر منتخب کریں؟"
@@ -14202,7 +14269,7 @@ msgstr "{docName} پر آخری ترمیم واپس لے لی گئی"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "اپنی ترامیم واپس لیں یا دوبارہ کریں، سا
msgid "Undo to this edit?"
msgstr "اس ترمیم تک واپس جائیں؟"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "اسے تبدیل کرنے کے لیے اپنی ریزولوشنز واپس لیں۔"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "«سورس میں ترمیم» کے پین یا کوڈ نما خصوصیت کے فیلڈ میں انتخاب کی تبدیلیاں واپس لیں، دوبارہ کریں، یا ان میں گھومیں۔"
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index 72bbd3c08..d8dba2b55 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -210,6 +210,7 @@
"2XQ8Ww": ["智能体编辑时打开预览"],
"2YOwme": ["已重启——现在运行的是 v", ["appRuntime"], "。"],
"2YZwPB": ["出链响应的结构与预期不符。"],
+ "2Yt22K": ["隐藏原始版本"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["隐藏面板(", ["panelShortcutLabel"], ")"],
"2j1kfc": ["请输入有效的 URL(例如 https://api.openai.com/v1)。"],
@@ -333,6 +334,7 @@
"4Sxexw": ["源码撤销或重做"],
"4TzU0n": ["初始化"],
"4Vgtaz": ["无法访问画板。它可能不存在,或服务器已离线。"],
+ "4_-TKi": ["对冲突 ", ["0"], " 同时采用两个版本"],
"4buZWd": ["继承自 ", ["path"]],
"4c_a6S": ["还没有设置任何内容。"],
"4d0VYJ": ["我们将根据此名称创建安全的主题 ID。"],
@@ -357,6 +359,7 @@
"4sUdTJ": ["带主题的预览"],
"4uNLmk": ["正在拉取"],
"4v2Yyz": ["当焦点在「文件」侧边栏时,选中文件树中所有可见的行。"],
+ "4vn1gP": ["所有冲突已解决。应用更改以保存。"],
"4xtLTl": ["已隐藏文件夹“", ["basename"], "”"],
"4zGlN_": ["粘贴图片 URL,或点击上传"],
"4z_1j2": ["已渲染"],
@@ -586,7 +589,6 @@
"89TtiD": ["在项目根目录中用模板“", ["displayTitle"], "”新建文件(", ["fileName"], ")"],
"8AjnFz": ["“", ["0"], "”已导入过(内容相同)。"],
"8F1i42": ["找不到页面"],
- "8FqTCr": [["chunksRemaining", "plural", { "other": ["#", " 处未解决的差异块"] }]],
"8Gzz2G": [["worktreeOf"], " 的 worktree"],
"8HvJlU": [
["0"],
@@ -774,6 +776,7 @@
"AiNMQ7": ["这个项目只存在于这台电脑上。把它连接到 GitHub 即可备份并与他人共享。"],
"Aif3E7": ["开启语义搜索"],
"AkA6DO": ["属于 ", ["0"], " 插件——只读;打开它可编辑一份副本"],
+ "Al8HPP": ["对冲突 ", ["0"], " 采用当前版本"],
"Am78jY": ["拖动 ", ["keyName"], " 以重新排序"],
"ApeA0n": ["已撤销 ", ["docName"], " 上的 ", ["dropCount"], " 次编辑"],
"Aq-O0x": ["状态"],
@@ -1417,6 +1420,7 @@
"Kf7GG5": ["正在重启服务器…"],
"Kge76t": ["行选项"],
"Kh1n4a": ["<", ["componentName"], "> 不是已知的组件。复制源码以便在别处使用,或删除这个块。"],
+ "KhNkCq": ["两者都采用"],
"Khxcyu": ["这个项目没有启用终端访问。"],
"KjTmeO": ["请更新 OpenKnowledge 以打开此共享内容。"],
"KkEAud": ["基于当前文档或文件夹创建一个文件。"],
@@ -1482,13 +1486,13 @@
"LaskKp": ["发送到对话(", ["0"], ")"],
"Lbl6KA": ["无法从 ", ["0"], " 安装:", ["1"]],
"LbmLyU": ["无法安全地编辑这个工具的配置"],
- "Lcehxn": ["保存解决结果"],
"LdABLa": ["无法打开 ", ["target"], "。请尝试手动打开。"],
"LdKIHS": ["起草一份规格"],
"LeGeTf": ["GitHub 上的 OpenKnowledge"],
"LhQlGR": ["这个项目运行的 OpenKnowledge 版本(v", ["0"], ")比这个应用(v", ["1"], ")旧。"],
"LhWYpm": ["其他 OK 路径在远程受跟踪:"],
"Li4U-T": ["了解更多关于 ", ["title"], " 的信息"],
+ "LkQRL8": ["显示原始版本"],
"LlHqdU": ["正在初始化项目"],
"LlJ8LD": [
"配置共享未更改:已在上游跟踪 ",
@@ -1634,6 +1638,7 @@
"Ni4b7h": [
"项目插件是你项目的写作规范——在这里开启或关闭它们。每个启用的插件在设置侧边栏的「插件」下都有自己的页面。"
],
+ "NjnHNV": ["对冲突 ", ["0"], " 采用传入版本"],
"NjrIak": ["文件:<0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["编辑 ", ["tag"]],
"NkXEFS": ["恢复失败——文档未改变"],
@@ -1643,6 +1648,7 @@
"NnQapF": ["用 AI ", ["targetDisplayName"], " 打开"],
"NoY1k4": ["服务器响应结构无效"],
"NpC29w": ["基于当前列表项创建一个新的列表项。"],
+ "NpRLRj": ["撤销已做的解决操作后才能更改。"],
"NrFwux": ["保存内容规则失败——", ["0"]],
"Ns0z5o": [
"当你安装一个已发布的技能时,会告知技能目录(skills.sh),让它的安装量统计保持准确。发送的内容包括技能名称、它的来源仓库,以及它被安装到了哪些 AI 工具——绝不包含文件内容,也绝不会为来自私有、本地或手动输入来源的技能发送。每个技能在每台电脑上只发送一次。"
@@ -1693,6 +1699,7 @@
"OLBz-_": ["Mermaid 图示渲染失败。"],
"OLIKgw": ["拖动项目 ", ["0"], " 以重新排序"],
"ONPvOb": ["正在加载智能体活动"],
+ "ONUgxB": ["该冲突已不再可用。"],
"ONWvwQ": ["上传"],
"ONchxy": ["总计"],
"ONgEZF": ["正在加载 ", ["pageTarget"], " 的标题"],
@@ -1768,6 +1775,7 @@
"PVSwOe": ["正在改向——等待当前运行停止…"],
"PVUn_c": ["打开文件夹"],
"PVggyD": ["frontmatter 架构"],
+ "PWh9Ii": ["应用更改"],
"PWqtgd": ["正在加载对话"],
"PXaT32": ["服务器返回的技能目标响应不完整。"],
"PYmp-0": ["作为模板导入"],
@@ -1833,6 +1841,7 @@
"QQbwzK": ["没有可用的智能体。"],
"QQghPu": ["安装到 Claude Desktop"],
"QR5SP1": ["已创建模板"],
+ "QVk3SK": ["此文件已在传入分支中删除(modify-delete 冲突)。"],
"QWdKwH": ["移动"],
"QYTOaN": ["之后可以在<0>「设置 → 同步」</0>中更改。"],
"QYfQdv": [["displayName"], " CLI"],
@@ -2152,6 +2161,7 @@
"VFQXPl": ["开启后,把鼠标悬停在链接上会显示一张卡片,包含站点名称、页面标题和描述。"],
"VIwCaD": ["条目"],
"VJaBca": ["选择技能文件夹"],
+ "VL6VsE": ["采用当前"],
"VM7H66": ["这是一个二进制文件,无法以文本形式显示。"],
"VMlRqi": ["隐藏详情"],
"VNNRfN": ["设为来源"],
@@ -2338,7 +2348,7 @@
"无法重启服务器——它被另一个进程占用。请关闭这个项目的其他 OpenKnowledge 窗口后重试。"
],
"Xv_ijG": ["https://github.com/owner/repo 或 owner/repo"],
- "XyOUTJ": ["退出合并"],
+ "XzL7x7": ["重新打开 ", ["filePath"], " 以继续编辑。"],
"Xzy0s0": ["把 ", ["fullLabel"], " 从上下文中移除"],
"Y-Urt2": ["由 LaTeX 源码经 KaTeX 渲染的独立数学公式。"],
"Y1QMlM": ["开始设置"],
@@ -2378,6 +2388,7 @@
"YSFv5w": ["没有 git 仓库——配置共享在这里不适用。"],
"YTLmTM": ["删除上层的 <0>.git</0> 文件夹"],
"YW7Q86": ["搜索设置尚未加载——请稍后再试"],
+ "YWK2zy": [["fileName"], " 的冲突差异"],
"Y_GpJd": [["0"], " 的下载请求超时。"],
"Y_ZQ6l": ["正在安装 ", ["agentName"], "…"],
"Y_iImT": ["无法解析文件 ", ["identity"], "。转到引用位置。"],
@@ -2532,6 +2543,7 @@
"你选择了主目录。OpenKnowledge 会索引整个主目录树——数量庞大,而且可能暴露个人文件。"
],
"_SDGzH": ["在浏览器中继续"],
+ "_SkqfM": ["采用传入"],
"_TDESN": ["网络错误 - ", ["kind"], "“", ["createdPath"], "”在磁盘上仍然存在"],
"_TF8ep": ["渲染 PDF 失败"],
"_W-elG": ["(内联)"],
@@ -2937,7 +2949,6 @@
"g1ZTh_": [
["count", "plural", { "other": ["确定要删除以下 ", "#", " 个文件/文件夹及其内容吗?"] }]
],
- "g3UF2V": ["接受"],
"g4WlQK": ["项目的 AI 工具管理仅在 OpenKnowledge 桌面应用中可用。"],
"g4XBm0": ["小号章节标题。"],
"g4e0hS": ["询问 ", ["agentName"]],
@@ -2954,6 +2965,7 @@
],
"g9Nj4l": ["// 注释"],
"gAhHu7": ["自动修复只作用于有已知机械修复方案的问题。"],
+ "gBCeDq": ["没有共同祖先 — 两个分支都新增了此文件(add/add 冲突)。"],
"gBbxn_": ["正在检查登录状态"],
"gDkNHk": ["确定要删除“", ["name"], "”吗?"],
"gGVP4q": ["依次点击 <0>+</0> <1/> <2>创建技能</2> <3/> <4>上传技能</4>。"],
@@ -3026,6 +3038,7 @@
"为你的产品是怎么做出来的留下书面记录。一个提出想法、记录决策、撰写规格,以及在出问题后总结经验的地方。"
],
"hCattk": ["OpenKnowledge 导入了 ", ["source"]],
+ "hCghAK": ["此冲突已解决。"],
"hDEaQu": ["把 OpenKnowledge 与你使用的其他工具连接起来。"],
"hDKtoF": [["diffHrs"], " 小时前"],
"hDoLrm": ["把 ", ["projectName"], " 从最近的项目中移除"],
@@ -3216,6 +3229,7 @@
"jSY41h": ["“", ["docName"], "”耗时过长。请检查你的网络连接。"],
"jTLWxh": ["用内联 iframe 嵌入外部页面(文档、演示、Figma、CodeSandbox)。"],
"jTUxaN": ["启用自动(仅拉取)"],
+ "jTdrn1": ["无法确认 ", ["filePath"], " 是否仍有冲突 — 正在重试。"],
"jWzDfC": ["正在检查你安装了哪些 AI 工具"],
"jZ_E5M": ["获取失败——详情请查看服务器日志。"],
"j_Z6g7": ["共享的默认值"],
@@ -3394,7 +3408,6 @@
"技能内部的一个路径——任何文件夹都可以(例如 references/notes.md)。路径中的文件夹会自动创建。"
],
"lPkjpD": [["pushed"], "推送"],
- "lPzyrU": ["所有差异块均已解决"],
"lS83Sg": ["无法访问剪贴板。"],
"lScd1O": ["Slidev 幻灯片仅在 OpenKnowledge 桌面应用中打开。"],
"lT6wjt": ["展开画板"],
@@ -3458,6 +3471,7 @@
"mPoOmg": ["请先在此处安装一个技能"],
"mPy9lS": ["把我现有的规格整理成一个按领域分组的链接索引,并标出与当前代码脱节的部分。"],
"mPzgTS": ["打开 ", ["docName"]],
+ "mR3uQg": ["此文件已在当前分支中删除(delete-modify 冲突)。"],
"mToVM9": ["给 ", ["agentName"], " 发消息"],
"mU3j1b": ["移除项目 ", ["0"]],
"mVFyH-": [["accessibleLabel"], "(冲突)"],
@@ -3677,6 +3691,9 @@
" 的上级文件夹,因为其中包含 .git 文件夹"
],
"pZAs1T": ["加载出链失败"],
+ "pZaMLc": [
+ "此文件包含看起来像冲突标记的行,因此无法可靠地识别冲突边界。请手动解决,或使用“问 AI”。"
+ ],
"paCw0z": [["1"], "/ 中各个 ", ["0"], "/ 文件夹下的所有内容"],
"pajIrl": ["无法关闭终端:", ["0"]],
"pbwTg6": [["seconds"], " 秒前"],
@@ -4135,6 +4152,7 @@
"wU8WyK": ["元素字段"],
"wVa83H": ["无法生成报告"],
"wWtVYd": ["请输入 1 到 65535 之间的端口。"],
+ "wXFalZ": [["filename"], " 预览"],
"wXO4Tg": [["hrs"], " 小时前"],
"wXw19Y": ["已把“", ["projectName"], "”从最近的项目中移除。它的文件夹已不存在。"],
"wZPUJx": ["“", ["0"], "”"],
@@ -4242,6 +4260,7 @@
"y46m5r": ["桌面应用没有响应。请刷新后重试。"],
"y5FUYi": ["建议菜单已打开"],
"y5UgU8": ["禁用 ", ["0"]],
+ "y6HGwM": ["剩余冲突:", ["liveRemaining"], " 个。"],
"y8B54M": ["无法发送你的提示词——请重试。"],
"yCX4jp": [" 无法恢复你的选择。"],
"yDlK9k": ["删除前请先解决 ", ["files"], " 上的冲突。"],
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index 8c5a8f68d..2599672e2 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} 位于本项目之外的 <0>{source}</0>,在此运行的智
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, other {字符}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, other {# 处未解决的差异块}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel}(空)"
@@ -1331,9 +1327,32 @@ msgstr "关于 {appName}"
msgid "Above"
msgstr "上方"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "接受"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "两者都采用"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "对冲突 {0} 同时采用两个版本"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "采用当前"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "对冲突 {0} 采用当前版本"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "采用传入"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "对冲突 {0} 采用传入版本"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "已将 {editor} 对齐到源码(其字节已备份)"
msgid "All"
msgstr "全部"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "所有冲突已解决。应用更改以保存。"
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "所有文件"
@@ -1679,10 +1702,6 @@ msgstr "所有文件"
msgid "All files are hidden by view filters."
msgstr "所有文件都被视图筛选条件隐藏了。"
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "所有差异块均已解决"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "所有标签"
@@ -1842,6 +1861,10 @@ msgstr "继续此对话时生效"
msgid "Apply and restart project server"
msgstr "应用并重启项目服务器"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "应用更改"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "应用链接"
@@ -3128,6 +3151,10 @@ msgstr "冲突"
msgid "Conflict"
msgstr "冲突"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "{fileName} 的冲突差异"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "冲突文件"
@@ -3141,6 +3168,10 @@ msgstr "冲突文件:{0}。"
msgid "Conflicts"
msgstr "冲突"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "剩余冲突:{liveRemaining} 个。"
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "连接"
@@ -3632,6 +3663,10 @@ msgstr "无法添加那条评论。"
msgid "Couldn't apply the change: {0}"
msgstr "无法应用该更改:{0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "无法确认 {filePath} 是否仍有冲突 — 正在重试。"
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "无法清除密钥——请重试。"
@@ -5447,10 +5482,6 @@ msgstr "退出"
msgid "exit {0}"
msgstr "退出 {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "退出合并"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "隐藏文件夹"
msgid "Hide HTML preview"
msgstr "隐藏 HTML 预览"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "隐藏原始版本"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "隐藏其他"
@@ -8559,6 +8594,10 @@ msgstr "本项目还没有评论。对一段内容添加评论即可开始。"
msgid "No comments yet. Select text in the document to add one."
msgstr "还没有评论。在文档中选中文本即可添加。"
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "没有共同祖先 — 两个分支都新增了此文件(add/add 冲突)。"
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "这个版本没有内容改动。"
@@ -10151,6 +10190,10 @@ msgstr "按上方“自定义”中的太阳或月亮图标以使用此主题。
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "预览浏览器无法自动复制。请对上方的 URL 使用 Cmd/Ctrl+C,或在桌面应用中打开 OK。"
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "{filename} 预览"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "截图预览"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "回收站"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "重做"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "正在重新安装"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "拒绝"
@@ -10854,6 +10897,10 @@ msgstr "已渲染"
msgid "Reopen"
msgstr "重新打开"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "重新打开 {filePath} 以继续编辑。"
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "重新打开之前的对话"
@@ -11331,10 +11378,6 @@ msgstr "保存失败:{error}"
msgid "Save queued message"
msgstr "保存排队中的消息"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "保存解决结果"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "保存这条评论(Enter)"
@@ -12095,6 +12138,10 @@ msgstr "显示或隐藏「文件」"
msgid "Show or hide Terminal"
msgstr "显示或隐藏 Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "显示原始版本"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "感谢你的报告!"
msgid "That branch is already open in another worktree."
msgstr "那个分支已经在另一个 worktree 中打开了。"
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "该冲突已不再可用。"
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "操作没有成功。请查看服务器日志后重试。"
@@ -13570,6 +13621,10 @@ msgstr "这可以在「设置 > AI 工具与 CLI」中配置"
msgid "This comment is on the whole property"
msgstr "这条评论针对的是整个属性"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "此冲突已解决。"
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "这个文档"
@@ -13610,6 +13665,10 @@ msgstr "这个字段带有编辑器不显示的额外架构关键字——保存
msgid "This file can't be opened in the text editor."
msgstr "这个文件无法在文本编辑器中打开。"
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "此文件包含看起来像冲突标记的行,因此无法可靠地识别冲突边界。请手动解决,或使用“问 AI”。"
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "找不到这个文件。"
@@ -13622,6 +13681,14 @@ msgstr "这是一个二进制文件,无法以文本形式显示。"
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "这个文件太大,无法在内置文本编辑器中打开(上限 1 MB)。请用下方的「打开文件」在其他应用中打开它。"
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "此文件已在当前分支中删除(delete-modify 冲突)。"
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "此文件已在传入分支中删除(modify-delete 冲突)。"
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "此文件夹不包含 git 仓库。要换一个文件夹吗?"
@@ -14202,7 +14269,7 @@ msgstr "已撤销 {docName} 上的最后一次编辑"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "撤销或重做你自己的编辑,协作者和智能体的编辑保持
msgid "Undo to this edit?"
msgstr "要撤销到这次编辑吗?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "撤销已做的解决操作后才能更改。"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "在「编辑源码」面板或代码类属性字段中撤销、重做,或逐步回溯选区变化。"
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index 30ffcb9a0..103010623 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -214,6 +214,7 @@
"2XQ8Ww": ["代理編輯時開啟預覽"],
"2YOwme": ["已重新啟動——現在執行的是 v", ["appRuntime"], "。"],
"2YZwPB": ["外連連結回應的結構與預期不符。"],
+ "2Yt22K": ["隱藏原始版本"],
"2hYmUH": ["[email protected]"],
"2hpdRq": ["隱藏面板(", ["panelShortcutLabel"], ")"],
"2j1kfc": ["請輸入有效的 URL(例如 https://api.openai.com/v1)。"],
@@ -337,6 +338,7 @@
"4Sxexw": ["原始碼復原或重做"],
"4TzU0n": ["初始化"],
"4Vgtaz": ["無法連線至畫板。它可能不存在,或伺服器已離線。"],
+ "4_-TKi": ["對衝突 ", ["0"], " 同時採用兩個版本"],
"4buZWd": ["繼承自 ", ["path"]],
"4c_a6S": ["還沒有設定任何東西。"],
"4d0VYJ": ["我們會根據這個名稱建立安全的主題 ID。"],
@@ -361,6 +363,7 @@
"4sUdTJ": ["帶主題的預覽"],
"4uNLmk": ["正在拉取"],
"4v2Yyz": ["當焦點在「檔案」側邊欄時,選取檔案樹中所有看得到的列。"],
+ "4vn1gP": ["所有衝突已解決。套用變更以儲存。"],
"4xtLTl": ["已隱藏資料夾「", ["basename"], "」"],
"4zGlN_": ["貼上圖片 URL,或點一下上傳"],
"4z_1j2": ["已顯示"],
@@ -588,7 +591,6 @@
"89TtiD": ["在專案根目錄中用範本「", ["displayTitle"], "」新增檔案(", ["fileName"], ")"],
"8AjnFz": ["「", ["0"], "」先前已匯入過(內容相同)。"],
"8F1i42": ["找不到頁面"],
- "8FqTCr": [["chunksRemaining", "plural", { "other": ["#", " 處未解決的差異區塊"] }]],
"8Gzz2G": [["worktreeOf"], " 的 worktree"],
"8HvJlU": [
["0"],
@@ -776,6 +778,7 @@
"AiNMQ7": ["這個專案只存在於這台電腦上。把它連接到 GitHub 就能備份,也能和別人分享。"],
"Aif3E7": ["開啟語意搜尋"],
"AkA6DO": ["屬於 ", ["0"], " 外掛——唯讀;開啟它可以編輯一份副本"],
+ "Al8HPP": ["對衝突 ", ["0"], " 採用目前版本"],
"Am78jY": ["拖曳 ", ["keyName"], " 以重新排序"],
"ApeA0n": ["已復原 ", ["docName"], " 上的 ", ["dropCount"], " 次編輯"],
"Aq-O0x": ["狀態"],
@@ -1433,6 +1436,7 @@
["componentName"],
"> 不是已知的元件。複製原始碼以便在別處使用,或刪除這個區塊。"
],
+ "KhNkCq": ["兩者都採用"],
"Khxcyu": ["這個專案沒有啟用終端機存取。"],
"KjTmeO": ["請更新 OpenKnowledge 以開啟這個分享內容。"],
"KkEAud": ["依目前的文件或資料夾情境建立一個檔案。"],
@@ -1498,7 +1502,6 @@
"LaskKp": ["傳送到對話(", ["0"], ")"],
"Lbl6KA": ["無法從 ", ["0"], " 安裝:", ["1"]],
"LbmLyU": ["無法安全地編輯這個工具的設定"],
- "Lcehxn": ["儲存解決結果"],
"LdABLa": ["無法開啟 ", ["target"], "。請試著手動開啟。"],
"LdKIHS": ["草擬一份規格"],
"LeGeTf": ["GitHub 上的 OpenKnowledge"],
@@ -1511,6 +1514,7 @@
],
"LhWYpm": ["其他 OK 路徑在上游受追蹤:"],
"Li4U-T": ["進一步了解 ", ["title"]],
+ "LkQRL8": ["顯示原始版本"],
"LlHqdU": ["正在初始化專案"],
"LlJ8LD": [
"設定分享未變更:已在上游追蹤 ",
@@ -1656,6 +1660,7 @@
"Ni4b7h": [
"專案外掛是你專案的寫作標準——在這裡開啟或關閉它們。每個啟用的外掛在設定側邊欄的「外掛」底下都有自己的頁面。"
],
+ "NjnHNV": ["對衝突 ", ["0"], " 採用傳入版本"],
"NjrIak": ["檔案:<0>", ["fixedName"], ".md</0>"],
"NkNfSr": ["編輯 ", ["tag"]],
"NkXEFS": ["還原失敗——文件沒有變動"],
@@ -1665,6 +1670,7 @@
"NnQapF": ["用 AI ", ["targetDisplayName"], " 開啟"],
"NoY1k4": ["伺服器回應結構無效"],
"NpC29w": ["從目前的清單項目建立一個新的清單項目。"],
+ "NpRLRj": ["復原已做的解決操作後才能變更。"],
"NrFwux": ["儲存內容規則失敗——", ["0"]],
"Ns0z5o": [
"當你安裝一個已發布的技能時,會告知技能目錄(skills.sh),讓它的安裝次數保持準確。送出的內容包括技能名稱、它的來源儲存庫,以及它被裝到哪些代理工具——絕不包含檔案內容,也絕不會為來自私人、本機或手動輸入來源的技能送出。每個技能在每台電腦只送一次。"
@@ -1715,6 +1721,7 @@
"OLBz-_": ["Mermaid 圖表顯示失敗。"],
"OLIKgw": ["拖曳項目 ", ["0"], " 以重新排序"],
"ONPvOb": ["正在載入代理活動"],
+ "ONUgxB": ["該衝突已不再可用。"],
"ONWvwQ": ["上傳"],
"ONchxy": ["總計"],
"ONgEZF": ["正在載入 ", ["pageTarget"], " 的標題"],
@@ -1792,6 +1799,7 @@
"PVSwOe": ["正在改向——等待目前執行停止…"],
"PVUn_c": ["開啟資料夾"],
"PVggyD": ["frontmatter 結構描述"],
+ "PWh9Ii": ["套用變更"],
"PWqtgd": ["正在載入對話"],
"PXaT32": ["伺服器回傳的技能目標回應不完整。"],
"PYmp-0": ["當成範本匯入"],
@@ -1857,6 +1865,7 @@
"QQbwzK": ["沒有可用的代理。"],
"QQghPu": ["安裝到 Claude Desktop"],
"QR5SP1": ["已建立範本"],
+ "QVk3SK": ["此檔案已在傳入分支中刪除(modify-delete 衝突)。"],
"QWdKwH": ["移動"],
"QYTOaN": ["之後可以在<0>「設定 → 同步」</0>中變更。"],
"QYfQdv": [["displayName"], " CLI"],
@@ -2178,6 +2187,7 @@
],
"VIwCaD": ["項目"],
"VJaBca": ["選擇技能資料夾"],
+ "VL6VsE": ["採用目前"],
"VM7H66": ["這是二進位檔案,無法用文字方式顯示。"],
"VMlRqi": ["隱藏詳細資料"],
"VNNRfN": ["設為來源"],
@@ -2364,7 +2374,7 @@
"無法重新啟動伺服器——它被另一個處理程序佔用。請關閉這個專案的其他 OpenKnowledge 視窗,然後再試一次。"
],
"Xv_ijG": ["https://github.com/owner/repo 或 owner/repo"],
- "XyOUTJ": ["結束合併"],
+ "XzL7x7": ["重新開啟 ", ["filePath"], " 以繼續編輯。"],
"Xzy0s0": ["把 ", ["fullLabel"], " 從脈絡中移除"],
"Y-Urt2": ["由 LaTeX 原始碼經 KaTeX 顯示的獨立數學公式。"],
"Y1QMlM": ["開始設定"],
@@ -2404,6 +2414,7 @@
"YSFv5w": ["沒有 git 儲存庫——設定分享在這裡不適用。"],
"YTLmTM": ["刪除上層的 <0>.git</0> 資料夾"],
"YW7Q86": ["搜尋設定尚未載入——請稍候再試"],
+ "YWK2zy": [["fileName"], " 的衝突差異"],
"Y_GpJd": [["0"], " 的下載要求逾時。"],
"Y_ZQ6l": ["正在安裝 ", ["agentName"], "…"],
"Y_iImT": ["無法解析檔案 ", ["identity"], "。前往引用位置。"],
@@ -2556,6 +2567,7 @@
"你選了家目錄。OpenKnowledge 會把整個家目錄樹都建立索引——數量龐大,而且可能把個人檔案帶出來。"
],
"_SDGzH": ["在瀏覽器中繼續"],
+ "_SkqfM": ["採用傳入"],
"_TDESN": ["網路錯誤 - ", ["kind"], "「", ["createdPath"], "」在磁碟上仍然存在"],
"_TF8ep": ["顯示 PDF 失敗"],
"_W-elG": ["(行內)"],
@@ -2961,7 +2973,6 @@
"g1ZTh_": [
["count", "plural", { "other": ["確定要刪除以下 ", "#", " 個檔案/資料夾及其內容嗎?"] }]
],
- "g3UF2V": ["接受"],
"g4WlQK": ["專案的 AI 工具管理只在 OpenKnowledge 桌面應用程式中提供。"],
"g4XBm0": ["小型章節標題。"],
"g4e0hS": ["詢問 ", ["agentName"]],
@@ -2978,6 +2989,7 @@
],
"g9Nj4l": ["// 註解"],
"gAhHu7": ["自動修正只作用於有已知機械式修正方式的問題。"],
+ "gBCeDq": ["沒有共同祖先 — 兩個分支都新增了此檔案(add/add 衝突)。"],
"gBbxn_": ["正在檢查登入狀態"],
"gDkNHk": ["確定要刪除「", ["name"], "」嗎?"],
"gGVP4q": ["依序點 <0>+</0> <1/> <2>建立技能</2> <3/> <4>上傳技能</4>。"],
@@ -3054,6 +3066,7 @@
"為你的產品是怎麼做出來的留下書面記錄。一個提出想法、記錄決策、撰寫規格,以及在出事之後總結心得的地方。"
],
"hCattk": ["OpenKnowledge 匯入了 ", ["source"]],
+ "hCghAK": ["此衝突已解決。"],
"hDEaQu": ["把 OpenKnowledge 和你用的其他工具連接起來。"],
"hDKtoF": [["diffHrs"], " 小時前"],
"hDoLrm": ["把 ", ["projectName"], " 從最近的專案中移除"],
@@ -3240,6 +3253,7 @@
"jSY41h": ["「", ["docName"], "」耗時過久。請檢查你的網路連線。"],
"jTLWxh": ["用行內 iframe 嵌入外部頁面(說明文件、示範、Figma、CodeSandbox)。"],
"jTUxaN": ["啟用自動(僅拉取)"],
+ "jTdrn1": ["無法確認 ", ["filePath"], " 是否仍有衝突 — 正在重試。"],
"jWzDfC": ["正在檢查你安裝了哪些 AI 工具"],
"jZ_E5M": ["取得失敗——詳情請看伺服器記錄。"],
"j_Z6g7": ["分享的預設值"],
@@ -3418,7 +3432,6 @@
"技能內部的一個路徑——任何資料夾都可以(例如 references/notes.md)。路徑中的資料夾會自動建立。"
],
"lPkjpD": [["pushed"], "推送"],
- "lPzyrU": ["所有差異區塊都已解決"],
"lS83Sg": ["無法存取剪貼簿。"],
"lScd1O": ["Slidev 簡報僅能在 OpenKnowledge 桌面應用程式中開啟。"],
"lT6wjt": ["展開畫板"],
@@ -3482,6 +3495,7 @@
"mPoOmg": ["請先在此處安裝一個技能"],
"mPy9lS": ["把我現有的規格整理成一個依領域分組的連結索引,並標出和目前程式碼已經脫節的部分。"],
"mPzgTS": ["開啟 ", ["docName"]],
+ "mR3uQg": ["此檔案已在目前分支中刪除(delete-modify 衝突)。"],
"mToVM9": ["傳訊息給 ", ["agentName"]],
"mU3j1b": ["移除項目 ", ["0"]],
"mVFyH-": [["accessibleLabel"], "(衝突)"],
@@ -3703,6 +3717,9 @@
" 的上層資料夾,因為其中含有 .git 資料夾"
],
"pZAs1T": ["載入外連連結失敗"],
+ "pZaMLc": [
+ "此檔案包含看起來像衝突標記的行,因此無法可靠地辨識衝突邊界。請手動解決,或使用「問 AI」。"
+ ],
"paCw0z": [["1"], "/ 裡各個 ", ["0"], "/ 資料夾底下的所有內容"],
"pajIrl": ["無法關閉終端機:", ["0"]],
"pbwTg6": [["seconds"], " 秒前"],
@@ -4163,6 +4180,7 @@
"wU8WyK": ["元素欄位"],
"wVa83H": ["無法建立回報"],
"wWtVYd": ["請輸入介於 1 到 65535 之間的連接埠。"],
+ "wXFalZ": [["filename"], " 預覽"],
"wXO4Tg": [["hrs"], " 小時前"],
"wXw19Y": ["已把「", ["projectName"], "」從最近的專案中移除。它的資料夾已經不存在了。"],
"wZPUJx": ["「", ["0"], "」"],
@@ -4270,6 +4288,7 @@
"y46m5r": ["桌面應用程式沒有回應。請重新整理後再試一次。"],
"y5FUYi": ["建議選單已開啟"],
"y5UgU8": ["停用 ", ["0"]],
+ "y6HGwM": ["剩餘衝突:", ["liveRemaining"], " 個。"],
"y8B54M": ["無法送出你的提示——請再試一次。"],
"yCX4jp": [" 無法還原你的選取內容。"],
"yDlK9k": ["刪除前請先解決 ", ["files"], " 上的衝突。"],
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 3d578f5ed..9b9b9621c 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -524,10 +524,6 @@ msgstr "{boldName} 位於本專案之外的 <0>{source}</0>,在此執行的智
msgid "{chars, plural, one {char} other {chars}}"
msgstr "{chars, plural, other {字元}}"
-#: src/components/DiffView.tsx
-msgid "{chunksRemaining, plural, one {# unresolved hunk} other {# unresolved hunks}}"
-msgstr "{chunksRemaining, plural, other {# 處未解決的差異區塊}}"
-
#: src/editor/utils/editor-strings.ts
msgid "{componentLabel} (empty)"
msgstr "{componentLabel}(空的)"
@@ -1331,9 +1327,32 @@ msgstr "關於 {appName}"
msgid "Above"
msgstr "上方"
-#: src/components/DiffView.tsx
-msgid "Accept"
-msgstr "接受"
+#: src/components/ConflictView.tsx
+msgid "Accept both"
+msgstr "兩者都採用"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept both versions for conflict {0}"
+msgstr "對衝突 {0} 同時採用兩個版本"
+
+#: src/components/ConflictView.tsx
+msgid "Accept current"
+msgstr "採用目前"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept current version for conflict {0}"
+msgstr "對衝突 {0} 採用目前版本"
+
+#: src/components/ConflictView.tsx
+msgid "Accept incoming"
+msgstr "採用傳入"
+
+#. placeholder {0}: control.conflict.conflictIndex + 1
+#: src/components/ConflictView.tsx
+msgid "Accept incoming version for conflict {0}"
+msgstr "對衝突 {0} 採用傳入版本"
#: src/components/DiffViewBoundary.tsx
msgid "Accept their deletion"
@@ -1671,6 +1690,10 @@ msgstr "已把 {editor} 對齊到原始碼(它的位元組已備份)"
msgid "All"
msgstr "全部"
+#: src/components/ConflictView.tsx
+msgid "All conflicts resolved. Apply changes to save."
+msgstr "所有衝突已解決。套用變更以儲存。"
+
#: src/components/FolderOverview.tsx
msgid "All files"
msgstr "所有檔案"
@@ -1679,10 +1702,6 @@ msgstr "所有檔案"
msgid "All files are hidden by view filters."
msgstr "所有檔案都被檢視篩選條件隱藏了。"
-#: src/components/DiffView.tsx
-msgid "All hunks resolved"
-msgstr "所有差異區塊都已解決"
-
#: src/components/CommandPalette.tsx
msgid "All tags"
msgstr "所有標籤"
@@ -1842,6 +1861,10 @@ msgstr "繼續此對話時生效"
msgid "Apply and restart project server"
msgstr "套用並重新啟動專案伺服器"
+#: src/components/ConflictView.tsx
+msgid "Apply changes"
+msgstr "套用變更"
+
#: src/editor/bubble-menu/LinkEditPopover.tsx
msgid "Apply link"
msgstr "套用連結"
@@ -3128,6 +3151,10 @@ msgstr "衝突"
msgid "Conflict"
msgstr "衝突"
+#: src/components/ConflictView.tsx
+msgid "Conflict diff for {fileName}"
+msgstr "{fileName} 的衝突差異"
+
#: src/components/ConflictsSection.tsx
msgid "Conflicted files"
msgstr "衝突的檔案"
@@ -3141,6 +3168,10 @@ msgstr "衝突的檔案:{0}。"
msgid "Conflicts"
msgstr "衝突"
+#: src/components/ConflictView.tsx
+msgid "Conflicts remaining: {liveRemaining}."
+msgstr "剩餘衝突:{liveRemaining} 個。"
+
#: src/components/AuthModal.tsx
msgid "Connect"
msgstr "連接"
@@ -3632,6 +3663,10 @@ msgstr "無法加上那則註解。"
msgid "Couldn't apply the change: {0}"
msgstr "無法套用這項變更:{0}"
+#: src/components/DiffViewBoundary.tsx
+msgid "Couldn't check whether {filePath} is still conflicted — retrying."
+msgstr "無法確認 {filePath} 是否仍有衝突 — 正在重試。"
+
#: src/components/settings/SearchSection.tsx
msgid "Couldn't clear the key — please try again."
msgstr "無法清除金鑰——請再試一次。"
@@ -5447,10 +5482,6 @@ msgstr "結束"
msgid "exit {0}"
msgstr "結束 {0}"
-#: src/components/DiffView.tsx
-msgid "Exit merge"
-msgstr "結束合併"
-
#: src/components/ArrayOfObjectsWidget.tsx
#: src/components/ObjectWidget.tsx
msgid "Expand {keyName}"
@@ -6563,6 +6594,10 @@ msgstr "隱藏資料夾"
msgid "Hide HTML preview"
msgstr "隱藏 HTML 預覽"
+#: src/components/ConflictView.tsx
+msgid "Hide original"
+msgstr "隱藏原始版本"
+
#: src/lib/native-menu-catalog.ts
msgid "Hide Others"
msgstr "隱藏其他"
@@ -8559,6 +8594,10 @@ msgstr "這個專案還沒有註解。為一段內容新增註解即可開始。
msgid "No comments yet. Select text in the document to add one."
msgstr "還沒有註解。在文件中選取文字就能加上一則。"
+#: src/components/ConflictView.tsx
+msgid "No common ancestor — both branches added this file (add/add conflict)."
+msgstr "沒有共同祖先 — 兩個分支都新增了此檔案(add/add 衝突)。"
+
#: src/components/AgentDiffPane.tsx
msgid "No content changes at this version."
msgstr "這個版本沒有內容變更。"
@@ -10151,6 +10190,10 @@ msgstr "按上方「自訂」中的太陽或月亮圖示以使用這個主題。
msgid "Preview browsers can't auto-copy. Use Cmd/Ctrl+C on the URL above, or open OK in the desktop app."
msgstr "預覽用的瀏覽器無法自動複製。請對上面的 URL 按 Cmd/Ctrl+C,或在桌面應用程式中開啟 OK。"
+#: src/components/ConflictFilePreview.tsx
+msgid "Preview of {filename}"
+msgstr "{filename} 預覽"
+
#: src/components/ReportBugDialogBody.tsx
msgid "Preview of the screenshot"
msgstr "螢幕擷圖預覽"
@@ -10568,6 +10611,7 @@ msgid "Recycle Bin"
msgstr "資源回收筒"
#: src/components/AppMenubar.tsx
+#: src/components/ConflictView.tsx
#: src/lib/native-menu-catalog.ts
msgid "Redo"
msgstr "重做"
@@ -10604,7 +10648,6 @@ msgid "Reinstalling"
msgstr "正在重新安裝"
#: src/components/acp/PlanChecklist.tsx
-#: src/components/DiffView.tsx
msgid "Reject"
msgstr "拒絕"
@@ -10854,6 +10897,10 @@ msgstr "已顯示"
msgid "Reopen"
msgstr "重新開啟"
+#: src/components/DiffViewBoundary.tsx
+msgid "Reopen {filePath} to keep editing."
+msgstr "重新開啟 {filePath} 以繼續編輯。"
+
#: src/components/acp/ThreadHistoryMenu.tsx
msgid "Reopen a past chat"
msgstr "重新開啟先前的對話"
@@ -11331,10 +11378,6 @@ msgstr "儲存失敗:{error}"
msgid "Save queued message"
msgstr "儲存排隊中的訊息"
-#: src/components/DiffView.tsx
-msgid "Save resolution"
-msgstr "儲存解決結果"
-
#: src/comments/ThreadCard.tsx
msgid "Save this comment (Enter)"
msgstr "儲存這則註解(Enter)"
@@ -12095,6 +12138,10 @@ msgstr "顯示或隱藏「檔案」"
msgid "Show or hide Terminal"
msgstr "顯示或隱藏 Terminal"
+#: src/components/ConflictView.tsx
+msgid "Show original"
+msgstr "顯示原始版本"
+
#: src/components/AgentDiffPane.tsx
#: src/components/EditorToolbar.tsx
#: src/components/TimelineDiffPane.tsx
@@ -13100,6 +13147,10 @@ msgstr "謝謝你的回報!"
msgid "That branch is already open in another worktree."
msgstr "那個分支已經在另一個 worktree 中開啟了。"
+#: src/components/ConflictView.tsx
+msgid "That conflict is no longer available."
+msgstr "該衝突已不再可用。"
+
#: src/components/SyncBlockingChanges.tsx
msgid "That did not go through. Check the server logs and try again."
msgstr "操作沒有成功。請查看伺服器記錄後再試一次。"
@@ -13570,6 +13621,10 @@ msgstr "這可以在「設定 > AI 工具與 CLI」中設定"
msgid "This comment is on the whole property"
msgstr "這則註解是針對整個屬性的"
+#: src/components/DiffViewBoundary.tsx
+msgid "This conflict is resolved."
+msgstr "此衝突已解決。"
+
#: src/components/PanelScopeHeader.tsx
msgid "This doc"
msgstr "這份文件"
@@ -13610,6 +13665,10 @@ msgstr "這個欄位帶有編輯器沒有顯示的額外結構描述關鍵字—
msgid "This file can't be opened in the text editor."
msgstr "這個檔案無法在文字編輯器中開啟。"
+#: src/components/ConflictView.tsx
+msgid "This file contains lines that look like conflict markers, so the conflict boundaries can't be read reliably. Resolve it by hand or with Ask AI."
+msgstr "此檔案包含看起來像衝突標記的行,因此無法可靠地辨識衝突邊界。請手動解決,或使用「問 AI」。"
+
#: src/components/use-viewer-text.ts
msgid "This file could not be found."
msgstr "找不到這個檔案。"
@@ -13622,6 +13681,14 @@ msgstr "這是二進位檔案,無法用文字方式顯示。"
msgid "This file is too large to open in the built-in text editor (1 MB limit). Use Open file below to open it in another app."
msgstr "這個檔案太大,無法在內建文字編輯器中開啟(上限 1 MB)。請用下面的「開啟檔案」在其他應用程式中開啟它。"
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the current branch (delete-modify conflict)."
+msgstr "此檔案已在目前分支中刪除(delete-modify 衝突)。"
+
+#: src/components/ConflictView.tsx
+msgid "This file was deleted on the incoming branch (modify-delete conflict)."
+msgstr "此檔案已在傳入分支中刪除(modify-delete 衝突)。"
+
#: src/lib/share/receive-flow.ts
msgid "This folder doesn't contain a git repository. Pick a different folder?"
msgstr "這個資料夾沒有 git 儲存庫。要換一個資料夾嗎?"
@@ -14202,7 +14269,7 @@ msgstr "已復原 {docName} 上的最後一次編輯"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
-#: src/components/DiffView.tsx
+#: src/components/ConflictView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/lib/native-menu-catalog.ts
msgid "Undo"
@@ -14232,6 +14299,10 @@ msgstr "復原或重做你自己的編輯,協作者和代理的編輯維持不
msgid "Undo to this edit?"
msgstr "要復原到這次編輯嗎?"
+#: src/components/ConflictView.tsx
+msgid "Undo your resolutions to change this."
+msgstr "復原已做的解決操作後才能變更。"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Undo, redo, or step through selection changes in the Edit source pane or a code-shaped property field."
msgstr "在「編輯原始碼」窗格或程式碼類屬性欄位中復原、重做,或逐步回溯選取範圍的變化。"
diff --git a/packages/app/tests/dom/jsdom-preload.ts b/packages/app/tests/dom/jsdom-preload.ts
index 0afe76ec2..4568fd304 100644
--- a/packages/app/tests/dom/jsdom-preload.ts
+++ b/packages/app/tests/dom/jsdom-preload.ts
@@ -69,7 +69,10 @@ if (domWindow) {
}
// jsdom doesn't ship `ResizeObserver`; Radix's Select/Popper collections read it
-// from globalThis on mount.
+// from globalThis on mount. It deliberately never fires its callback: a firing
+// observer re-runs resize-driven effects in every component that listens for
+// one, so a suite that installs it globally makes unrelated suites see a resize
+// they never asked for. A suite that needs delivery installs it for itself.
class MinimalResizeObserver {
observe() {}
unobserve() {}
diff --git a/packages/app/tests/integration/api-error-envelope/sync-resolve-conflict.test.ts b/packages/app/tests/integration/api-error-envelope/sync-resolve-conflict.test.ts
index 282d7826f..8e508efa6 100644
--- a/packages/app/tests/integration/api-error-envelope/sync-resolve-conflict.test.ts
+++ b/packages/app/tests/integration/api-error-envelope/sync-resolve-conflict.test.ts
@@ -72,6 +72,73 @@ describe('sync-resolve-conflict envelope (RFC 9457)', () => {
}
});
+ /**
+ * Seed a tracked conflict so the marker check is reached against real store
+ * state. `conflictStore` is private on the engine; this is the narrowest way
+ * to put the handler in the state the 422's remediation text is written for,
+ * short of driving a real merge.
+ */
+ function trackConflict(file: string): void {
+ const engine = server.instance.syncEngine;
+ if (!engine) throw new Error('expected a SyncEngine on the test harness');
+ const store = (engine as unknown as { conflictStore: { addConflict: (e: unknown) => boolean } })
+ .conflictStore;
+ store.addConflict({ file, detectedAt: new Date().toISOString() });
+ }
+
+ test('content still carrying a conflict block is a typed 422, not a 500', async () => {
+ // Asserted against a TRACKED conflict on purpose. The earlier version of
+ // this test used an untracked path, which only reached the marker check
+ // because that check had been hoisted above the tracked-conflict lookup —
+ // so it pinned the mapping and the hoist together, and its 422 carried
+ // remediation ("resolve every region") that was wrong for the state it
+ // actually exercised. Tracked is the state the 422's advice is true for.
+ trackConflict('tracked-conflict.md');
+ const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/resolve-conflict`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ file: 'tracked-conflict.md',
+ strategy: 'content',
+ content: '<<<<<<< ours\nmine\n=======\ntheirs\n>>>>>>> theirs\n',
+ }),
+ });
+ expect(res.status).toBe(422);
+
+ const parsed = ProblemDetailsSchema.safeParse(await res.json());
+ expect(parsed.success).toBe(true);
+ if (parsed.success) {
+ expect(parsed.data.type).toBe('urn:ok:error:unresolved-conflict-markers');
+ }
+ });
+
+ test('an untracked path is a typed 404, not a 500 — even when the bytes are bad', async () => {
+ // The sibling of the case above, and the reason neither mapping depends on
+ // the order of the two guards any more. While `!entry` threw bare, this
+ // returned 500 `internal-server-error`, which `resolve_conflict` documents
+ // as a transient commit failure worth retrying — so an agent retried a path
+ // that cannot succeed, and a caller-side error sat in the 5xx signal.
+ //
+ // Bad bytes are sent deliberately: both guards would fire, so this pins
+ // which one answers, not merely that something 4xx happened.
+ const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/resolve-conflict`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ file: 'never-tracked.md',
+ strategy: 'content',
+ content: '<<<<<<< ours\nmine\n=======\ntheirs\n>>>>>>> theirs\n',
+ }),
+ });
+ expect(res.status).toBe(404);
+
+ const parsed = ProblemDetailsSchema.safeParse(await res.json());
+ expect(parsed.success).toBe(true);
+ if (parsed.success) {
+ expect(parsed.data.type).toBe('urn:ok:error:no-conflict-tracked');
+ }
+ });
+
test('method-not-allowed on GET emits problem+json with Allow: POST', async () => {
const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/resolve-conflict`);
expect(res.status).toBe(405);
diff --git a/packages/app/tests/stress/_helpers/index.ts b/packages/app/tests/stress/_helpers/index.ts
index ff9a9d7ba..87970c35c 100644
--- a/packages/app/tests/stress/_helpers/index.ts
+++ b/packages/app/tests/stress/_helpers/index.ts
@@ -44,6 +44,7 @@ export {
waitForActiveProviderSynced,
} from './provider.ts';
export { escapeRegExp } from './regexp.ts';
+export { stubRemoteImages } from './remote-image-stub.ts';
export { matchIsWithinReadableScrollport } from './scrollport.ts';
export {
checkCollabSync,
diff --git a/packages/app/tests/stress/_helpers/remote-image-stub.ts b/packages/app/tests/stress/_helpers/remote-image-stub.ts
new file mode 100644
index 000000000..a18daf6bc
--- /dev/null
+++ b/packages/app/tests/stress/_helpers/remote-image-stub.ts
@@ -0,0 +1,42 @@
+import type { Page } from '@playwright/test';
+
+/**
+ * A real 300x200 PNG, inline. Solid slate so a failure screenshot or video
+ * still reads as "the stub loaded" rather than as a blank frame.
+ *
+ * Deliberately not the 1x1 from `upload-fixtures`: these tests click the
+ * rendered image, and an `<img>` with no width/height attributes lays out at
+ * its intrinsic size — a 1x1 click target lands on whatever is underneath.
+ */
+const STUB_PNG_BASE64 =
+ 'iVBORw0KGgoAAAANSUhEUgAAASwAAADICAIAAADdvUsCAAABsUlEQVR42u3TQQ0AAAjEsBOLBFxgGhk8aFIFS5bqAQ5FAjAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQMCGYEDAhmBAwIZgQTKgCmBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAiYEEwImBBMCJgQTAgmVAFMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBEwIJgRMCCYETAgmBBMCJgQTAiaEnxboihYsGmarVAAAAABJRU5ErkJggg==';
+
+/** Hosts whose images tests embed to get a genuinely-decoded raster. */
+const REMOTE_IMAGE_HOSTS = ['picsum.photos'];
+
+/**
+ * Serve a valid PNG for every remote image host a test embeds, so the assertion
+ * under test does not depend on a third-party CDN.
+ *
+ * Both observed CI failure shapes came from that dependency, and both look like
+ * product bugs at the assertion site:
+ * - no bytes: the `<img>` stays `opacity-0` and never becomes visible;
+ * - bad bytes: the request completes so `loaded` flips to `opacity-100`,
+ * then `decode()` rejects and `LoadingImage` sets `hidden` — correct
+ * component behaviour for a broken image, and still never visible.
+ *
+ * Call before navigating; routes are per-page and released with the context.
+ */
+export async function stubRemoteImages(page: Page): Promise<void> {
+ const body = Buffer.from(STUB_PNG_BASE64, 'base64');
+ for (const host of REMOTE_IMAGE_HOSTS) {
+ await page.route(`**://${host}/**`, (route) =>
+ route.fulfill({
+ status: 200,
+ contentType: 'image/png',
+ headers: { 'cache-control': 'no-store' },
+ body,
+ }),
+ );
+ }
+}
diff --git a/packages/app/tests/stress/grip-click-nodeselect.e2e.ts b/packages/app/tests/stress/grip-click-nodeselect.e2e.ts
index 47777ca2e..62f8ac719 100644
--- a/packages/app/tests/stress/grip-click-nodeselect.e2e.ts
+++ b/packages/app/tests/stress/grip-click-nodeselect.e2e.ts
@@ -34,14 +34,14 @@
* `mousedown → mousemove → dragstart-or-click` decision, and the platform
* drag threshold are not faithful in happy-dom / jsdom.
*
- * Excluded from CI's fixed `test:e2e` subset; runs under
- * `bunx playwright test` for pre-push coverage (mirrors
- * jsx-backspace-delete.e2e.ts policy).
+ * Runs in CI's fixed `test:e2e` subset (listed in packages/app/package.json),
+ * so it gates the merge queue — which is why its image bytes are stubbed
+ * rather than fetched.
*/
import { randomUUID } from 'node:crypto';
import type { Page } from '@playwright/test';
-import { expect, test } from './_helpers';
+import { expect, stubRemoteImages, test } from './_helpers';
interface ApiSeed {
seedDocs: (docs: Array<{ name: string; markdown: string }>) => Promise<void>;
@@ -216,6 +216,10 @@ test('AC22: grip click NodeSelects an Accordion (composite)', async ({ page, api
});
test('AC22: grip click NodeSelects an img (self-closing leaf)', async ({ page, api }) => {
+ // Same third-party-CDN hazard as `jsx-image-body-click`: the grip is only
+ // reachable once the image has laid out, so unfetched bytes fail this as a
+ // grip bug. Stub them.
+ await stubRemoteImages(page);
await setupDoc(page, api, '<img src="https://picsum.photos/200" alt="test image" />\n\nafter\n');
await resetSelectionToDocStart(page);
diff --git a/packages/app/tests/stress/jsx-image-body-click.e2e.ts b/packages/app/tests/stress/jsx-image-body-click.e2e.ts
index 004e5e9b1..871e6816e 100644
--- a/packages/app/tests/stress/jsx-image-body-click.e2e.ts
+++ b/packages/app/tests/stress/jsx-image-body-click.e2e.ts
@@ -25,14 +25,14 @@
* floating-ui chrome rendering, and the PM mousedown pipeline are not
* faithful in happy-dom / jsdom.
*
- * Excluded from CI's fixed `test:e2e` subset; runs under
- * `bunx playwright test` for pre-push coverage (mirrors
- * grip-click-nodeselect.e2e.ts policy).
+ * Runs in CI's fixed `test:e2e` subset (listed in packages/app/package.json),
+ * so it gates the merge queue — which is why its image bytes are stubbed
+ * rather than fetched.
*/
import { randomUUID } from 'node:crypto';
import type { Page } from '@playwright/test';
-import { expect, test } from './_helpers';
+import { expect, stubRemoteImages, test } from './_helpers';
interface ApiSeed {
seedDocs: (docs: Array<{ name: string; markdown: string }>) => Promise<void>;
@@ -51,6 +51,11 @@ test('AC21/F4: img body-click does NOT NodeSelect (Zoom interception pin)', asyn
page,
api,
}) => {
+ // The pin is about what a click on a *loaded* image does, so the bytes have
+ // to arrive — but they need not arrive over the network. Fetching them for
+ // real made a third-party CDN a required-gate dependency, and it failed two
+ // unrelated PRs and three merge-queue attempts in one morning.
+ await stubRemoteImages(page);
await setupDoc(
page,
api,
diff --git a/packages/app/vite.dedupe.ts b/packages/app/vite.dedupe.ts
index 2c83742cf..9fda38a63 100644
--- a/packages/app/vite.dedupe.ts
+++ b/packages/app/vite.dedupe.ts
@@ -53,7 +53,6 @@ export const RENDERER_DEDUPE: readonly string[] = [
'@codemirror/view',
'@codemirror/language',
'@codemirror/commands',
- '@codemirror/merge',
'@codemirror/lang-markdown',
// Yjs intermediaries (TipTap collaboration + Hocuspocus). Each runs
// `import * as Y from 'yjs'` at module load with mixed CJS/ESM
diff --git a/packages/core/src/bridge/index.ts b/packages/core/src/bridge/index.ts
index d16e2da50..14bd777aa 100644
--- a/packages/core/src/bridge/index.ts
+++ b/packages/core/src/bridge/index.ts
@@ -110,6 +110,12 @@ export {
type StructuralFreshnessChecker,
type StructuralFreshnessCheckerOptions,
} from './structural-freshness.ts';
+export {
+ type SynthesisedConflictMarkers,
+ type SynthesisedConflictRegion,
+ synthesiseConflictMarkers,
+ synthesiseConflictMarkersWithRegions,
+} from './synthesise-conflict-markers.ts';
export {
classifySeverity,
emitToleranceFire,
diff --git a/packages/core/src/bridge/synthesise-conflict-markers.ts b/packages/core/src/bridge/synthesise-conflict-markers.ts
new file mode 100644
index 000000000..190dbfe43
--- /dev/null
+++ b/packages/core/src/bridge/synthesise-conflict-markers.ts
@@ -0,0 +1,97 @@
+import { diff3Merge } from 'node-diff3';
+
+const MARKER_OURS = '<<<<<<< ours';
+const MARKER_BASE = '||||||| original';
+const MARKER_SEPARATOR = '=======';
+const MARKER_THEIRS = '>>>>>>> theirs';
+
+export function synthesiseConflictMarkers(
+ ours: string,
+ base: string | null | undefined,
+ theirs: string,
+ options: { includeBaseSection?: boolean } = {},
+): string {
+ return synthesiseConflictMarkersWithRegions(ours, base, theirs, options).text;
+}
+
+export interface SynthesisedConflictRegion {
+ startLineIndex: number;
+ baseMarkerLineIndex?: number;
+ separatorLineIndex: number;
+ endLineIndex: number;
+}
+
+export interface SynthesisedConflictMarkers {
+ text: string;
+ regions: SynthesisedConflictRegion[];
+}
+
+export function synthesiseConflictMarkersWithRegions(
+ ours: string,
+ base: string | null | undefined,
+ theirs: string,
+ options: { includeBaseSection?: boolean } = {},
+): SynthesisedConflictMarkers {
+ const { includeBaseSection = true } = options;
+ if (base == null) {
+ return twoWayBlock(ours, theirs);
+ }
+
+ const hasTrailing = ours.endsWith('\n') || base.endsWith('\n') || theirs.endsWith('\n');
+ const dropTrailingEmpty = (lines: string[]): string[] =>
+ lines.at(-1) === '' ? lines.slice(0, -1) : lines;
+ const oursLines = dropTrailingEmpty(ours.split('\n'));
+ const baseLines = dropTrailingEmpty(base.split('\n'));
+ const theirsLines = dropTrailingEmpty(theirs.split('\n'));
+
+ const regions = diff3Merge(oursLines, baseLines, theirsLines);
+
+ const parts: string[] = [];
+ const written: SynthesisedConflictRegion[] = [];
+ for (const region of regions) {
+ if (region.ok) {
+ parts.push(...region.ok);
+ } else if (region.conflict) {
+ const startLineIndex = parts.length;
+ parts.push(MARKER_OURS);
+ parts.push(...region.conflict.a);
+ let baseMarkerLineIndex: number | undefined;
+ if (includeBaseSection) {
+ baseMarkerLineIndex = parts.length;
+ parts.push(MARKER_BASE);
+ parts.push(...region.conflict.o);
+ }
+ const separatorLineIndex = parts.length;
+ parts.push(MARKER_SEPARATOR);
+ parts.push(...region.conflict.b);
+ const endLineIndex = parts.length;
+ parts.push(MARKER_THEIRS);
+ written.push({ startLineIndex, baseMarkerLineIndex, separatorLineIndex, endLineIndex });
+ }
+ }
+
+ if (hasTrailing) parts.push('');
+ return { text: parts.join('\n'), regions: written };
+}
+
+function twoWayBlock(ours: string, theirs: string): SynthesisedConflictMarkers {
+ if (ours === theirs) return { text: ours, regions: [] };
+
+ const oursLines = ours.split('\n');
+ const theirsLines = theirs.split('\n');
+
+ const hasTrailing = oursLines.at(-1) === '' || theirsLines.at(-1) === '';
+ const oursContent = oursLines.at(-1) === '' ? oursLines.slice(0, -1) : oursLines;
+ const theirsContent = theirsLines.at(-1) === '' ? theirsLines.slice(0, -1) : theirsLines;
+
+ const parts: string[] = [MARKER_OURS, ...oursContent];
+ const separatorLineIndex = parts.length;
+ parts.push(MARKER_SEPARATOR, ...theirsContent);
+ const endLineIndex = parts.length;
+ parts.push(MARKER_THEIRS);
+ if (hasTrailing) parts.push('');
+ return {
+ text: parts.join('\n'),
+ regions: [{ startLineIndex: 0, separatorLineIndex, endLineIndex }],
+ };
+}
diff --git a/packages/core/src/handoff/urn-ipc-registry.ts b/packages/core/src/handoff/urn-ipc-registry.ts
index 23a415ec4..85fd55780 100644
--- a/packages/core/src/handoff/urn-ipc-registry.ts
+++ b/packages/core/src/handoff/urn-ipc-registry.ts
@@ -244,6 +244,12 @@ export const URN_HTTP_ONLY: ReadonlySet<ProblemType> = new Set<ProblemType>([
// doesn't track the requested file. HTTP-only (same surface as the rest
// of /api/sync/*).
'urn:ok:error:no-conflict-tracked',
+ // 422 from handleSyncResolveConflict when the submitted resolution still
+ // carries a `<<<<<<< … >>>>>>>` block. A permanent rejection of the
+ // caller's bytes rather than a failure of ours, which is why it is not the
+ // 500 the rest of that catch emits. HTTP-only (same surface as the rest of
+ // /api/sync/*).
+ 'urn:ok:error:unresolved-conflict-markers',
// 409 from handleSyncResolveBlocking when the engine is no longer paused on a
// pre-merge overlap — a stale panel, or a second click after the first
// cleared it. HTTP-only (same surface as the rest of /api/sync/*; there is no
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 7b72c5c1f..d7d62e5e1 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1692,9 +1692,13 @@ export {
type StructuralEquivalenceResult,
type StructuralFreshnessChecker,
type StructuralFreshnessCheckerOptions,
+ type SynthesisedConflictMarkers,
+ type SynthesisedConflictRegion,
setToleranceTelemetryHook,
splitFmBoundarySlot,
structuralDivergence,
+ synthesiseConflictMarkers,
+ synthesiseConflictMarkersWithRegions,
type ToleranceClassSeverity,
type ToleranceFireRecord,
type ToleranceTelemetryHook,
diff --git a/packages/core/src/schemas/api/_envelope.ts b/packages/core/src/schemas/api/_envelope.ts
index dc44c494e..06f709eb2 100644
--- a/packages/core/src/schemas/api/_envelope.ts
+++ b/packages/core/src/schemas/api/_envelope.ts
@@ -315,6 +315,12 @@ export const ProblemTypeSchema = z.enum([
// enum mirror) so agents can transition straight to `conflicts({ kind: 'content' })`
// + `resolve_conflict` without parsing the detail string.
'urn:ok:error:doc-in-conflict',
+ // `unresolved-conflict-markers` is the 422 for a resolution whose bytes still
+ // carry a complete `<<<<<<< … >>>>>>>` block. A permanent rejection of the
+ // caller's content, deliberately not the 500 the resolve handler used to
+ // give it: `resolve_conflict`'s own contract reads a 500 as a transient
+ // commit failure worth retrying, which this can never become.
+ 'urn:ok:error:unresolved-conflict-markers',
// `no-conflict-tracked` is the 404 surfaced by handleSyncConflictContent
// when an agent asks for stages on a file the conflict store doesn't
// track (stale 409 envelope, post-resolution retry, or wrong path).
diff --git a/packages/core/src/theme/base16.test.ts b/packages/core/src/theme/base16.test.ts
index b34b3819e..c9b766344 100644
--- a/packages/core/src/theme/base16.test.ts
+++ b/packages/core/src/theme/base16.test.ts
@@ -244,6 +244,7 @@ describe('base16ToTokens', () => {
'link-color',
'diff-added',
'diff-removed',
+ 'diff-modified',
'syntax-bg',
]) {
expect(t[name], name).toBeTruthy();
diff --git a/packages/core/src/theme/base16.ts b/packages/core/src/theme/base16.ts
index 2ee67123f..3ae8cb649 100644
--- a/packages/core/src/theme/base16.ts
+++ b/packages/core/src/theme/base16.ts
@@ -200,6 +200,10 @@ export function base16ToTokens(scheme: Base16Scheme): Record<string, string> {
'lint-error-color': p.base08,
'diff-added': p.base0B,
'diff-removed': p.base08,
+ // base0D is the "functions / headings / links" blue. A three-way merge
+ // needs a third accent for the incoming side, and blue-against-green is
+ // the convention every merge tool converged on.
+ 'diff-modified': p.base0D,
// --- callouts ----------------------------------------------------------
// Spread across all eight accents so adjacent types stay distinguishable;
diff --git a/packages/server/src/api-extension.ts b/packages/server/src/api-extension.ts
index 7a2edfdf6..a5e5af754 100644
--- a/packages/server/src/api-extension.ts
+++ b/packages/server/src/api-extension.ts
@@ -16624,6 +16624,8 @@ export function createApiExtension(
});
const syncRoutes = createSyncRoutes({
projectDir,
+ contentDir,
+ getPrincipal,
hocuspocus,
log,
checkLocalOpSecurity,
diff --git a/packages/server/src/conflict-errors.ts b/packages/server/src/conflict-errors.ts
index 8eeaa0a15..9d1c49dc1 100644
--- a/packages/server/src/conflict-errors.ts
+++ b/packages/server/src/conflict-errors.ts
@@ -51,7 +51,7 @@ import { errorResponse } from './http/error-response.ts';
* strategy is added without updating this array, the type resolves
* to the missing member's literal and the assignment errors out.
*/
-const RESOLUTION_OPTIONS = [
+export const RESOLUTION_OPTIONS = [
'mine',
'theirs',
'content',
@@ -176,3 +176,49 @@ export function respondDocInConflict(
},
});
}
+
+/**
+ * Typed throw when a submitted resolution still carries a complete conflict
+ * block. A permanent rejection of the caller's bytes, not a failure of ours —
+ * which is the whole reason it needs its own type. Thrown bare, it landed in
+ * the resolve handler's generic catch and became a 500: it moved the 5xx
+ * alerting signal, and told an agent — whose own `resolve_conflict` contract
+ * reads "500 indicates commit failure … the file may have been resolved by
+ * another session" — that a permanent input error was a transient one worth
+ * retrying.
+ */
+export class ConflictMarkersInContentError extends Error {
+ readonly file: string;
+ override readonly name = 'ConflictMarkersInContentError' as const;
+
+ constructor(opts: { file: string }) {
+ super(`Resolution for ${opts.file} still contains conflict markers`);
+ this.file = opts.file;
+ }
+}
+
+/**
+ * Typed throw when the store tracks no conflict for the requested path —
+ * resolved by another session, or simply the wrong path.
+ *
+ * Bare, it reached the resolve handler's generic catch as a 500, which reads to
+ * an agent as a transient commit failure worth retrying and moves the 5xx
+ * alerting signal for what is a caller-side path error. `handleSyncConflictContent`
+ * already answers this exact condition with 404 `no-conflict-tracked`; typing the
+ * throw lets the resolve path say the same thing.
+ *
+ * Typing it also makes guard ORDER stop mattering. While `!entry` threw bare,
+ * checking it before the marker validation turned a permanent content error into
+ * a transient-looking 500, and checking it after told a caller with a stale path
+ * to fix bytes that were never the problem. With both errors typed, each
+ * ordering reports something true.
+ */
+export class NoConflictTrackedError extends Error {
+ readonly file: string;
+ override readonly name = 'NoConflictTrackedError' as const;
+
+ constructor(opts: { file: string }) {
+ super(`[conflicts] no conflict tracked for file: ${opts.file}`);
+ this.file = opts.file;
+ }
+}
diff --git a/packages/server/src/conflict-storage.test.ts b/packages/server/src/conflict-storage.test.ts
index f2eb85b3a..23b88afd7 100644
--- a/packages/server/src/conflict-storage.test.ts
+++ b/packages/server/src/conflict-storage.test.ts
@@ -8,6 +8,7 @@ import { join } from 'node:path';
import { LOCAL_DIR } from '@inkeep/open-knowledge-core';
import simpleGit from 'simple-git';
import { afterEach, beforeEach, describe, expect, test } from 'vitest';
+import { ConflictMarkersInContentError } from './conflict-errors.ts';
import { type ConflictEntry, ConflictStore } from './conflict-storage.ts';
// ─── Test helpers ─────────────────────────────────────────────────────────────
@@ -161,6 +162,65 @@ describe('ConflictStore resolveConflict()', () => {
);
});
+ test("strategy 'content': refuses content that still carries conflict markers", async () => {
+ // Writing this would commit a document with literal `<<<<<<<` in it AND
+ // clear the tracked conflict, so the UI reports it solved while the file is
+ // broken. Refused before any git command runs.
+ const store = new ConflictStore(projectDir, 'main');
+ store.addConflict(makeEntry('a.md'));
+
+ const markered = [
+ '# Pricing',
+ '',
+ '<<<<<<< ours',
+ 'The Team tier moves to $29 per seat.',
+ '=======',
+ 'The Team tier moves to $29 per seat, grandfathered.',
+ '>>>>>>> theirs',
+ '',
+ ].join('\n');
+
+ await expect(store.resolveConflict('a.md', 'content', markered)).rejects.toThrow(
+ ConflictMarkersInContentError,
+ );
+ // Typed, not bare: the HTTP boundary keys a 422 off this, so a bare Error
+ // would fall into the generic catch and become a 500 — which the
+ // `resolve_conflict` contract reads as a transient commit failure.
+ await expect(store.resolveConflict('a.md', 'content', markered)).rejects.toMatchObject({
+ name: 'ConflictMarkersInContentError',
+ file: 'a.md',
+ });
+ // Still tracked — a refused resolution must not clear the conflict.
+ expect(store.count()).toBe(1);
+ });
+
+ test("strategy 'content': accepts a genuine resolution mentioning no markers", async () => {
+ const store = new ConflictStore(projectDir, 'main');
+ store.addConflict(makeEntry('a.md'));
+ // Rejected later for lack of git, but NOT by the marker guard — proving the
+ // guard does not refuse ordinary content.
+ await expect(
+ store.resolveConflict('a.md', 'content', '# Pricing\n\nThe Team tier moves to $29.\n'),
+ ).rejects.not.toThrow(/contains conflict markers/);
+ });
+
+ test("strategy 'content': accepts a resolution whose body contains a setext H1", async () => {
+ // Seven `=` is both a conflict separator and a Markdown setext H1
+ // underline. Refusing on the loose marker predicate made every document
+ // with such a heading unresolvable through the UI: the user accepts every
+ // hunk, presses Apply, and gets "Couldn't save the resolution" forever.
+ const store = new ConflictStore(projectDir, 'main');
+ store.addConflict(makeEntry('a.md'));
+ await expect(
+ store.resolveConflict(
+ 'a.md',
+ 'content',
+ 'Release Notes\n=======\n\nThe Team tier moves to $29.\n',
+ ),
+ ).rejects.not.toThrow(/contains conflict markers/);
+ expect(store.count()).toBe(1);
+ });
+
test("strategy 'mine'/'theirs': removes conflict from store when git succeeds", async () => {
// git is not available in unit test env (broken simple-git symlink).
// We verify that removeConflict() removes the entry, which is the contract
@@ -428,6 +488,33 @@ describe('ConflictStore resolveConflict() — working-tree variant', () => {
expect(await headSha()).toBe(before);
});
+ test('the entry leaves the store BEFORE the resolved bytes reach disk', async () => {
+ // Ordering, not timing. Writing first opens a window the file watcher can
+ // land in: it re-seeds the doc from disk while the store still lists this
+ // file, and conflict-lifecycle-seed re-marks lifecycle.status='conflict'
+ // from an entry that is about to be deleted. That re-mark can outlive the
+ // resolve's own clear, leaving the doc flagged with no store entry behind
+ // it — which strands the conflict view on its loading state.
+ const { blobSha } = await seedOverlay('a.md', 'REMOTE\n', 'LOCAL\n');
+ const store = new ConflictStore(projectDir, 'main');
+ store.addConflict(makeEntry('a.md', { variant: 'working-tree', theirsSha: blobSha }));
+
+ const target = join(projectDir, 'a.md');
+ let diskAtRemoval: string | null = null;
+ const realRemove = store.removeConflict.bind(store);
+ store.removeConflict = (f: string) => {
+ diskAtRemoval = readFileSync(target, 'utf-8');
+ return realRemove(f);
+ };
+
+ await store.resolveConflict('a.md', 'content', 'HAND-MERGED\n');
+
+ // Still the pre-resolve bytes: the store was cleared first.
+ expect(diskAtRemoval).toBe('LOCAL\n');
+ expect(readFileSync(target, 'utf-8')).toBe('HAND-MERGED\n');
+ expect(store.count()).toBe(0);
+ });
+
test("'content' writes the merged bytes without committing", async () => {
const { blobSha, headSha: before } = await seedOverlay('a.md', 'REMOTE\n', 'LOCAL\n');
const store = new ConflictStore(projectDir, 'main');
diff --git a/packages/server/src/conflict-storage.ts b/packages/server/src/conflict-storage.ts
index e9e736aec..b8c539894 100644
--- a/packages/server/src/conflict-storage.ts
+++ b/packages/server/src/conflict-storage.ts
@@ -13,11 +13,13 @@
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
import { dirname, join, resolve } from 'node:path';
import { getLocalDir } from './config/paths.ts';
+import { ConflictMarkersInContentError, NoConflictTrackedError } from './conflict-errors.ts';
import { isShareableOkArtifact } from './content-filter.ts';
import { tracedUnlinkSync, tracedWriteFileSync } from './fs-traced.ts';
import { listNames } from './git-paths.ts';
import { getLogger } from './logger.ts';
import { isWithinDir } from './path-utils.ts';
+import { containsUnresolvedConflictBlock } from './reconciliation.ts';
import { assertRealpathWithinDir } from './symlink-guard.ts';
const log = getLogger('conflict-storage');
@@ -149,7 +151,16 @@ export class ConflictStore {
/** Remove all conflicts for the current branch. */
clear(): void {
this.conflicts = [];
- this.save();
+ // Lower stakes than the resolve paths — a failed persist here leaves a
+ // ledger listing conflicts the branch no longer has — but the same
+ // discarded signal, so it completes the sweep rather than leaving one
+ // call site silently different from its siblings.
+ if (!this.save()) {
+ log.error(
+ { branch: this.branch },
+ '[conflicts] cleared conflicts in memory but conflicts.json persist failed — the ledger will resurrect them on restart',
+ );
+ }
}
/** Number of unresolved conflicts. */
@@ -192,7 +203,30 @@ export class ConflictStore {
async resolveConflict(file: string, strategy: ResolveStrategy, content?: string): Promise<void> {
const entry = this.conflicts.find((c) => c.file === file);
if (!entry) {
- throw new Error(`[conflicts] no conflict tracked for file: ${file}`);
+ throw new NoConflictTrackedError({ file });
+ }
+
+ // Content carrying conflict markers is a broken file, not a resolution, and
+ // this call would write it, commit it, and clear the tracked conflict — so
+ // the document keeps the markers as literal text while the UI reports the
+ // conflict solved. Observed from an agent handed an unsatisfiable
+ // instruction ("resolve only this region"), where emitting markers was the
+ // only way to obey. The refusal lives here rather than in a tool prompt
+ // because prompts are editable by the user and ignorable by the model,
+ // while every caller reaches this method.
+ //
+ // Order relative to the lookup above is deliberately NOT load-bearing. It
+ // was, while `!entry` threw bare: whichever check ran second lost, because
+ // a bare throw became a generic 500 that tells an agent to retry. Both are
+ // typed now, so each ordering reports something true — and this one reports
+ // the more useful thing first, since a caller with a stale path has no
+ // byte problem to fix.
+ if (
+ strategy === 'content' &&
+ content !== undefined &&
+ containsUnresolvedConflictBlock(content)
+ ) {
+ throw new ConflictMarkersInContentError({ file });
}
// Validate strategy-specific params before touching git
@@ -278,10 +312,27 @@ export class ConflictStore {
}
}
+ // Snapshot detection times BEFORE the removal below, so the commit-failure
+ // path can re-add these conflicts as the same ones rather than as newly
+ // detected. See the re-add in that catch.
+ const priorDetectedAt = new Map<string, string>(
+ this.list().map((entry) => [entry.file, entry.detectedAt] as const),
+ );
+
// Remove from store — but defer final removal if this is the last conflict
// so we can re-add on commit failure (prevents losing conflict from UI while
// git is still in half-merged state).
- this.removeConflict(file);
+ //
+ // Same persist divergence as the working-tree path, and the harder of the
+ // two to correlate from logs: this is the branch that goes on to run
+ // `git commit --no-edit`, so the generic `save()` warn lands amid commit
+ // noise with no file name on it.
+ if (!this.removeConflict(file)) {
+ log.error(
+ { file },
+ '[conflicts] resolve dropped the conflict in memory but conflicts.json persist failed — the ledger will resurrect this conflict on restart',
+ );
+ }
// If all conflicts resolved, create the merge commit
if (!this.hasConflicts()) {
@@ -292,7 +343,22 @@ export class ConflictStore {
// Commit failed — the git index may still contain unmerged entries from
// other files the user resolved earlier in this merge. Re-scan the
// index so every unmerged file is visible again, not just `file`.
- const detectedAt = new Date().toISOString();
+ // NOT COVERED BY A UNIT TEST. Reaching this branch needs a working git
+ // that then fails to commit; without git the resolve throws at `git
+ // add` and never arrives, and with only in-memory entries the commit is
+ // never attempted at all. Two attempts at a unit test passed whether or
+ // not the preservation below was present. It wants an integration
+ // fixture that stages a real merge and forces the commit to fail.
+ //
+ // Detection timestamps are PRESERVED across this re-add. A failed commit
+ // is not a new detection — these conflicts have been standing since
+ // they were first found. Re-minting `detectedAt` changed the identity
+ // the client keys its conflict-content fetch on, so an open resolution
+ // was torn down and its undo history discarded. Worse, the re-scan
+ // re-adds every unmerged file, so failing the commit on one file reset
+ // an open view on another, one CC1 cycle later and long enough after
+ // the toast that the two did not look related.
+ const fallbackDetectedAt = new Date().toISOString();
let reAdded = false;
try {
// git-paths.ts has no runtime simple-git dependency, so this needs no
@@ -300,7 +366,10 @@ export class ConflictStore {
// out of the CRUD-test module graph.
const unmerged = await listNames(handle.git, ['diff', '--name-only', '--diff-filter=U']);
for (const f of unmerged) {
- this.addConflict({ file: f, detectedAt });
+ this.addConflict({
+ file: f,
+ detectedAt: priorDetectedAt.get(f) ?? fallbackDetectedAt,
+ });
}
reAdded = unmerged.length > 0;
} catch (scanErr) {
@@ -313,7 +382,7 @@ export class ConflictStore {
// Either the re-scan failed or reported no unmerged files but the
// commit still failed — at minimum keep the file we just touched
// visible so the user has something to act on.
- this.addConflict({ file, detectedAt });
+ this.addConflict({ file, detectedAt: priorDetectedAt.get(file) ?? fallbackDetectedAt });
}
log.warn(
{ err: e },
@@ -369,6 +438,60 @@ export class ConflictStore {
allowShareableOkArtifact: isShareableOkArtifact,
});
+ // Drop the entry BEFORE touching disk. Writing first opens a window the
+ // file watcher can land in: it re-seeds the doc from disk, and
+ // `conflict-lifecycle-seed` re-marks `lifecycle.status = 'conflict'`
+ // because the store still lists this file. That re-mark can arrive after
+ // the resolve's own clear, leaving the doc permanently flagged as
+ // conflicted with no store entry behind it — the editor stays swapped to
+ // the conflict view, which then finds nothing to fetch.
+ //
+ // Unlike the merge-native path there is no commit to roll back here, so
+ // the only thing to undo is the removal itself if the write throws.
+ const restoreOnFailure = { ...entry };
+ // `removeConflict` returns false when the in-memory drop landed but the
+ // conflicts.json persist did not. `save()` already warns generically on
+ // that failure; what this adds is the file name and the consequence — after
+ // a restart the ledger still lists a file whose overlay is gone, so the
+ // editor swaps to a conflict view with nothing to fetch, the exact state
+ // the drop-before-write ordering exists to avoid. Message text is identical
+ // on the merge-native path so one grep finds both.
+ if (!this.removeConflict(entry.file)) {
+ log.error(
+ { file: entry.file },
+ '[conflicts] resolve dropped the conflict in memory but conflicts.json persist failed — the ledger will resurrect this conflict on restart',
+ );
+ }
+
+ try {
+ await this.applyWorkingTreeStrategy(absPath, projectRoot, entry, strategy, content);
+ } catch (err) {
+ // `addConflict` returns false when the in-memory upsert landed but the
+ // conflicts.json persist did not, and its contract puts the call on the
+ // caller. Ignored, that divergence survives a restart as a ledger that
+ // reads resolved over a working tree still holding the overlay — the
+ // user has no conflict left to act on.
+ if (!this.addConflict(restoreOnFailure)) {
+ log.error(
+ { file: entry.file, err },
+ '[conflicts] resolve rolled back in memory but conflicts.json persist failed — the ledger will lose this conflict on restart',
+ );
+ }
+ throw err;
+ }
+ }
+
+ /**
+ * The disk half of `resolveWorkingTreeConflict`, split out so the store
+ * removal can be ordered ahead of it and restored if it throws.
+ */
+ private async applyWorkingTreeStrategy(
+ absPath: string,
+ projectRoot: string,
+ entry: ConflictEntry,
+ strategy: ResolveStrategy,
+ content: string | undefined,
+ ): Promise<void> {
switch (strategy) {
case 'mine':
// The working tree already holds the overlay — keep it as-is.
@@ -412,7 +535,5 @@ export class ConflictStore {
throw new Error(`[conflicts] unknown resolve strategy: ${exhaustive}`);
}
}
-
- this.removeConflict(entry.file);
}
}
diff --git a/packages/server/src/external-change-attribution.test.ts b/packages/server/src/external-change-attribution.test.ts
new file mode 100644
index 000000000..130f133a5
--- /dev/null
+++ b/packages/server/src/external-change-attribution.test.ts
@@ -0,0 +1,113 @@
+import { beforeEach, describe, expect, test } from 'vitest';
+import {
+ claimExternalChange,
+ clearExternalChangeClaims,
+ releaseExternalChangeClaim,
+ takeExternalChangeAttribution,
+} from './external-change-attribution.ts';
+
+const ALICE = {
+ writerId: 'principal-11111111-1111-1111-1111-111111111111',
+ displayName: 'Alice',
+ colorSeed: 'principal-11111111-1111-1111-1111-111111111111',
+};
+const BOB = {
+ writerId: 'principal-22222222-2222-2222-2222-222222222222',
+ displayName: 'Bob',
+ colorSeed: 'principal-22222222-2222-2222-2222-222222222222',
+};
+
+const T0 = 1_000_000;
+
+beforeEach(() => {
+ clearExternalChangeClaims();
+});
+
+describe('external-change attribution claims', () => {
+ test('a claimed doc attributes to the claiming writer', () => {
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 100)).toEqual(ALICE);
+ });
+
+ test('an unclaimed doc yields nothing, so the caller keeps file-system attribution', () => {
+ expect(takeExternalChangeAttribution('notes/untouched', T0)).toBeUndefined();
+ });
+
+ test('a claim is single-use', () => {
+ // The second external change to a doc is a genuinely new event; reusing the
+ // actor would be a guess, and a wrong name is worse than no name.
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 100)).toEqual(ALICE);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 200)).toBeUndefined();
+ });
+
+ test('an expired claim yields nothing rather than a stale name', () => {
+ // The failure mode that matters: a claim whose write never arrived must not
+ // sit there and mis-credit some later, unrelated edit to the same doc.
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 60_000)).toBeUndefined();
+ });
+
+ test('claims are per-doc', () => {
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ claimExternalChange('notes/pricing', BOB, T0);
+ expect(takeExternalChangeAttribution('notes/pricing', T0 + 100)).toEqual(BOB);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 100)).toEqual(ALICE);
+ });
+
+ test('a re-claim on one doc takes the later actor', () => {
+ // Two people resolving the same file: whoever wrote last owns the bytes.
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ claimExternalChange('notes/roadmap', BOB, T0 + 10);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 100)).toEqual(BOB);
+ });
+
+ test('unconsumed claims cannot grow without bound', () => {
+ for (let i = 0; i < 400; i += 1) {
+ claimExternalChange(`notes/doc-${i}`, ALICE, T0);
+ }
+ // Oldest evicted first, so the most recent claims are the ones that survive
+ // to be consumed.
+ expect(takeExternalChangeAttribution('notes/doc-399', T0 + 100)).toEqual(ALICE);
+ expect(takeExternalChangeAttribution('notes/doc-0', T0 + 100)).toBeUndefined();
+ });
+});
+
+describe('releasing a claim whose write never landed', () => {
+ test('a released claim does not credit the next external change', () => {
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ releaseExternalChangeClaim('notes/roadmap');
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 100)).toBeUndefined();
+ });
+
+ test('releasing one doc leaves other claims standing', () => {
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ claimExternalChange('notes/pricing', BOB, T0);
+ releaseExternalChangeClaim('notes/roadmap');
+ expect(takeExternalChangeAttribution('notes/pricing', T0 + 100)).toEqual(BOB);
+ });
+
+ test('releasing an unclaimed doc is a no-op', () => {
+ expect(() => releaseExternalChangeClaim('notes/never-claimed')).not.toThrow();
+ });
+});
+
+describe('a claim window sized to its own write', () => {
+ test('a caller-supplied window expires the claim ahead of the default', () => {
+ // The resolve handler's case: several ordinary successes never produce an
+ // ingest to consume the claim, so at the default window it sat waiting to
+ // credit the actor for whoever edited that file next.
+ claimExternalChange('notes/roadmap', ALICE, T0, 3_000);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 5_000)).toBeUndefined();
+ });
+
+ test('a write inside the window is still attributed', () => {
+ claimExternalChange('notes/roadmap', ALICE, T0, 3_000);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 500)).toEqual(ALICE);
+ });
+
+ test('omitting the window keeps the default', () => {
+ claimExternalChange('notes/roadmap', ALICE, T0);
+ expect(takeExternalChangeAttribution('notes/roadmap', T0 + 5_000)).toEqual(ALICE);
+ });
+});
diff --git a/packages/server/src/external-change-attribution.ts b/packages/server/src/external-change-attribution.ts
new file mode 100644
index 000000000..2a3ac35b2
--- /dev/null
+++ b/packages/server/src/external-change-attribution.ts
@@ -0,0 +1,127 @@
+/**
+ * A short-lived claim that a disk change about to happen was made by a person.
+ *
+ * `applyExternalChange` attributes everything it ingests to `FILE_SYSTEM_WRITER`
+ * — correct for its usual caller, the file watcher, which sees bytes appear and
+ * cannot know why. But a merge-conflict resolution is a human decision the
+ * server itself performed on the user's behalf: it writes the resolved content
+ * to disk through git, and the watcher then ingests it like any other external
+ * edit. The Timeline row lands as "File System", crediting nobody for what is
+ * arguably the highest-stakes edit the product supports.
+ *
+ * A handler that is about to make such a write files a claim here first; the
+ * ingest consumes it and attributes the row to that writer instead. The writer
+ * id is an ordinary `principal-<UUID>` from the precedent #25 taxonomy — this
+ * changes who a write is credited to, never what a writer id may look like.
+ *
+ * Deliberately weak by design. Claims are keyed by docName, single-use, and
+ * expire; anything unmatched falls back to `FILE_SYSTEM_WRITER`. A lost race
+ * therefore reproduces today's behaviour, while a stale claim can never
+ * outlive its window and mis-credit a later unrelated edit. Wrong-but-silent
+ * is the one outcome attribution must not have.
+ */
+
+import { getLogger } from './logger.ts';
+
+const log = getLogger('external-change-attribution');
+
+/** Who caused an imminent disk write, in `recordContributor`'s vocabulary. */
+export interface ExternalChangeWriter {
+ writerId: string;
+ displayName: string;
+ colorSeed: string;
+}
+
+interface Claim extends ExternalChangeWriter {
+ expiresAtMs: number;
+}
+
+/**
+ * How long a claim stays valid. The write and the watcher event that carries
+ * it are decoupled by fs-event latency plus the sync engine's batch drain
+ * (`setBatchInProgress` buffers the burst git emits), so this is a
+ * generous multiple of the observed gap rather than a tight bound — an expired
+ * claim costs attribution, never correctness.
+ */
+const CLAIM_TTL_MS = 30_000;
+
+/** Bounds the map if a caller ever claims without a write following. */
+const MAX_CLAIMS = 256;
+
+const claims = new Map<string, Claim>();
+
+function pruneExpired(nowMs: number): void {
+ for (const [docName, claim] of claims) {
+ if (claim.expiresAtMs <= nowMs) claims.delete(docName);
+ }
+}
+
+/**
+ * Record that the next external change to `docName` is attributable to
+ * `writer`. Overwrites any outstanding claim for the same doc: two resolutions
+ * racing on one file means the later actor is the one whose bytes land.
+ *
+ * `ttlMs` exists because not every claimed write produces an ingest to consume
+ * it. A resolve can leave the bytes unchanged, delete the file, or touch a doc
+ * nobody has open — and consumption happens only on a loaded doc whose bytes
+ * actually changed. An unconsumed claim then sits for its full window waiting
+ * to mis-credit whoever edits that file next. A caller that knows its write is
+ * imminent should say so with a window sized to the ingest, not to the worst
+ * case: an expired claim costs attribution, which this module has always
+ * preferred to crediting the wrong person.
+ */
+export function claimExternalChange(
+ docName: string,
+ writer: ExternalChangeWriter,
+ nowMs: number = Date.now(),
+ ttlMs: number = CLAIM_TTL_MS,
+): void {
+ pruneExpired(nowMs);
+ // Oldest-first eviction (Map preserves insertion order) — a flood of
+ // unconsumed claims must not grow without bound.
+ if (claims.size >= MAX_CLAIMS && !claims.has(docName)) {
+ const oldest = claims.keys().next();
+ if (!oldest.done) claims.delete(oldest.value);
+ }
+ claims.set(docName, { ...writer, expiresAtMs: nowMs + ttlMs });
+}
+
+/**
+ * Consume the claim for `docName`, if one is live. Single-use: a second
+ * external change to the same doc is a genuinely new event and attributing it
+ * to the same actor would be a guess.
+ */
+export function takeExternalChangeAttribution(
+ docName: string,
+ nowMs: number = Date.now(),
+): ExternalChangeWriter | undefined {
+ const claim = claims.get(docName);
+ if (!claim) return undefined;
+ claims.delete(docName);
+ if (claim.expiresAtMs <= nowMs) {
+ // Worth a line: a claim that consistently expires means the window no
+ // longer matches how long a resolution takes to reach the watcher, and the
+ // symptom (rows silently reading "File System" again) is otherwise mute.
+ log.debug({ docName }, 'external-change claim expired before its write arrived');
+ return undefined;
+ }
+ const { expiresAtMs: _expiresAtMs, ...writer } = claim;
+ return writer;
+}
+
+/**
+ * Drop the claim for `docName` without consuming it.
+ *
+ * A claim is filed before the write it describes, so a write that then fails
+ * leaves one standing with no bytes coming. The next genuine external edit to
+ * that doc inside the TTL would consume it and credit the actor for someone
+ * else's change — the wrong-but-silent outcome this module exists to avoid.
+ */
+export function releaseExternalChangeClaim(docName: string): void {
+ claims.delete(docName);
+}
+
+/** Test seam — drops every outstanding claim. */
+export function clearExternalChangeClaims(): void {
+ claims.clear();
+}
diff --git a/packages/server/src/external-change.ts b/packages/server/src/external-change.ts
index 895903d20..5a0592adf 100644
--- a/packages/server/src/external-change.ts
+++ b/packages/server/src/external-change.ts
@@ -34,6 +34,7 @@ import { isWithinContentDir, safeContentPath } from './content-path.ts';
import { recordContributor } from './contributor-tracker.ts';
import { applyDiskContentToDoc, FILE_WATCHER_ORIGIN } from './disk-content-intake.ts';
import type { DocumentDurabilityState } from './document-durability-state.ts';
+import { takeExternalChangeAttribution } from './external-change-attribution.ts';
import { recordFrontmatterEditSurface } from './frontmatter-telemetry.ts';
import { getLogger } from './logger.ts';
import {
@@ -179,11 +180,21 @@ export function applyExternalChange(
// recording here would manufacture a spurious "File System" row for a
// trailing/duplicate event or a cross-branch reset.
if (!bytesUnchanged) {
+ // A handler that made this write on a person's behalf (today: merge-conflict
+ // resolution) files a claim first, so the row credits them rather than
+ // "File System". Everything else — a real external edit, an editor saving
+ // through disk — has no claim and keeps the file-system attribution.
+ const claimed = takeExternalChangeAttribution(docName);
+ const writer = claimed ?? {
+ writerId: FILE_SYSTEM_WRITER.id,
+ displayName: FILE_SYSTEM_WRITER.name,
+ colorSeed: FILE_SYSTEM_WRITER.id,
+ };
recordContributor(
docName,
- FILE_SYSTEM_WRITER.id,
- FILE_SYSTEM_WRITER.name,
- FILE_SYSTEM_WRITER.id,
+ writer.writerId,
+ writer.displayName,
+ writer.colorSeed,
formatReconcileSubject(docName),
);
}
diff --git a/packages/server/src/http/sync-routes.test.ts b/packages/server/src/http/sync-routes.test.ts
index 4a66209d8..b3d4b7ca0 100644
--- a/packages/server/src/http/sync-routes.test.ts
+++ b/packages/server/src/http/sync-routes.test.ts
@@ -25,6 +25,8 @@ import { createSyncRoutes } from './sync-routes.ts';
function buildGroup() {
return createSyncRoutes({
projectDir: undefined,
+ contentDir: '/tmp/ok-sync-routes-test',
+ getPrincipal: undefined,
hocuspocus: new Hocuspocus({ quiet: true }),
log: loggerFactory.getLogger('test'),
checkLocalOpSecurity: () => true,
@@ -74,6 +76,8 @@ describe('conflict-content working-tree ours-read errno discrimination', () => {
} as unknown as SyncEngine;
return createSyncRoutes({
projectDir,
+ contentDir: '/tmp/ok-sync-routes-test',
+ getPrincipal: undefined,
hocuspocus: new Hocuspocus({ quiet: true }),
log: loggerFactory.getLogger('test'),
checkLocalOpSecurity: () => true,
diff --git a/packages/server/src/http/sync-routes.ts b/packages/server/src/http/sync-routes.ts
index e02cfdfb2..39fc32593 100644
--- a/packages/server/src/http/sync-routes.ts
+++ b/packages/server/src/http/sync-routes.ts
@@ -13,8 +13,9 @@
import { readFileSync } from 'node:fs';
import type { IncomingMessage, ServerResponse } from 'node:http';
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
import type { Hocuspocus } from '@hocuspocus/server';
+import type { Principal } from '@inkeep/open-knowledge-core';
import {
SyncConflictContentSuccessSchema,
SyncConflictsSuccessSchema,
@@ -27,9 +28,17 @@ import {
SyncTriggerSuccessSchema,
} from '@inkeep/open-knowledge-core';
import simpleGit from 'simple-git';
+import {
+ ConflictMarkersInContentError,
+ NoConflictTrackedError,
+ RESOLUTION_OPTIONS,
+} from '../conflict-errors.ts';
import type { ResolveStrategy } from '../conflict-storage.ts';
import { isShareableOkArtifact } from '../content-filter.ts';
import { stripDocExtension } from '../doc-extensions.ts';
+import { claimExternalChange, releaseExternalChangeClaim } from '../external-change-attribution.ts';
+import { extractActorIdentity } from '../extract-actor-identity.ts';
+import { pathToDocName } from '../file-watcher.ts';
import type { PinoLogger } from '../logger.ts';
import { assertRealpathWithinDir } from '../symlink-guard.ts';
import type { SyncEngine } from '../sync-engine.ts';
@@ -55,8 +64,20 @@ function ytextHasConflictMarkers(text: string): boolean {
return /^<{7} /m.test(text) && /^={7}$/m.test(text) && /^>{7} /m.test(text);
}
+/**
+ * How long a conflict-resolution attribution claim stays live.
+ *
+ * The write it describes lands within milliseconds when it lands at all, so
+ * this is sized to the ingest rather than to the worst case — an unconsumed
+ * claim is the one that mis-credits the next unrelated edit.
+ */
+const RESOLVE_ATTRIBUTION_WINDOW_MS = 3_000;
+
export interface SyncRouteDeps {
projectDir: string | undefined;
+ contentDir: string;
+ /** Server-side principal resolver — the only trusted actor source (precedent #24). */
+ getPrincipal: (() => Principal | null) | undefined;
hocuspocus: Hocuspocus;
log: PinoLogger;
/** The extension's shared local-op security gate (emits RFC 9457 on refusal). */
@@ -71,7 +92,16 @@ export interface SyncRouteDeps {
}
export function createSyncRoutes(deps: SyncRouteDeps): ApiRouteGroup {
- const { projectDir, hocuspocus, log, checkLocalOpSecurity, getSyncEngine, serializeDoc } = deps;
+ const {
+ projectDir,
+ contentDir,
+ getPrincipal,
+ hocuspocus,
+ log,
+ checkLocalOpSecurity,
+ getSyncEngine,
+ serializeDoc,
+ } = deps;
async function handleSyncStatus(req: IncomingMessage, res: ServerResponse): Promise<void> {
if (!checkLocalOpSecurity(req, res, { handler: 'sync-status' })) return;
@@ -281,6 +311,45 @@ export function createSyncRoutes(deps: SyncRouteDeps): ApiRouteGroup {
return;
}
const { file, strategy, content } = body;
+ // Resolving a conflict is a decision, not a file sync. The write reaches
+ // the Y.Doc through the watcher, which would otherwise credit the
+ // Timeline row to "File System" — claim it for the actor first so the
+ // history says who chose. Applies to every strategy: picking a side is
+ // as much a decision as hand-merging.
+ //
+ // `extractActorIdentity` is the mandated resolver for actor-attributed
+ // handlers (precedent #24); body `principalId` is ignored by contract,
+ // the server's `getPrincipal()` being the only trusted source. An
+ // anonymous caller yields no writer and simply keeps today's behaviour.
+ const actor = extractActorIdentity(body as unknown as Record<string, unknown>, getPrincipal);
+ let claimedDocName: string | undefined;
+ if (projectDir && (actor.kind === 'agent' || actor.kind === 'principal')) {
+ // `pathToDocName` matches the watcher's own derivation for ordinary
+ // paths. A conflicted file reached through a symlink resolves by a
+ // different name there, so its claim goes unconsumed and the row falls
+ // back to "File System" — attribution lost, never misattributed.
+ claimedDocName = pathToDocName(resolve(projectDir, file), contentDir);
+ // Short window on purpose. Only a loaded doc whose bytes actually
+ // changed consumes a claim, and several ordinary successes never do:
+ // `mine` on a working-tree conflict writes nothing, `delete` emits a
+ // delete rather than an update, an all-"accept current" resolve can
+ // reconcile to a noop, and resolving from the sidebar or via an agent
+ // usually touches a doc nobody has open. At the default window each of
+ // those left a live claim waiting to credit this actor for whoever
+ // edited the file next. The write is milliseconds away when it happens
+ // at all, so an ingest slower than this loses attribution rather than
+ // misplacing it.
+ claimExternalChange(
+ claimedDocName,
+ {
+ writerId: actor.writerId,
+ displayName: actor.displayName,
+ colorSeed: actor.colorSeed,
+ },
+ Date.now(),
+ RESOLVE_ATTRIBUTION_WINDOW_MS,
+ );
+ }
try {
await engine.resolveConflict(file, strategy as ResolveStrategy, content);
successResponse(
@@ -293,6 +362,49 @@ export function createSyncRoutes(deps: SyncRouteDeps): ApiRouteGroup {
},
);
} catch (e) {
+ // The claim was filed ahead of a write that never landed. Left
+ // standing it would be consumed by whatever genuinely edits this doc
+ // next inside the TTL, crediting the actor for someone else's change.
+ if (claimedDocName) releaseExternalChangeClaim(claimedDocName);
+ // A permanent rejection of the caller's bytes, not a failure of ours.
+ // As a 500 it moved the 5xx alerting signal and, worse, matched the
+ // `resolve_conflict` contract's description of a transient commit
+ // failure — so an agent was told to retry something that can only fail
+ // the same way.
+ // The store tracks nothing at this path — resolved by another session,
+ // or the path is wrong. Caller-side, so not a 5xx, and the remediation
+ // is to re-read the list rather than to touch the bytes. Mirrors the
+ // 404 `handleSyncConflictContent` already returns for this condition.
+ if (e instanceof NoConflictTrackedError) {
+ errorResponse(
+ res,
+ 404,
+ 'urn:ok:error:no-conflict-tracked',
+ 'No conflict is tracked for this path.',
+ {
+ handler: 'sync-resolve-conflict',
+ detail:
+ 'This file has no tracked conflict — it may have been resolved by another session, or the path may be stale. Re-read conflicts({ kind: "list" }) before retrying.',
+ extensions: { file: e.file },
+ },
+ );
+ return;
+ }
+ if (e instanceof ConflictMarkersInContentError) {
+ errorResponse(
+ res,
+ 422,
+ 'urn:ok:error:unresolved-conflict-markers',
+ 'Resolution still contains conflict markers.',
+ {
+ handler: 'sync-resolve-conflict',
+ detail:
+ 'The submitted content still contains a `<<<<<<< … >>>>>>>` block. Resolve every region, or use strategy "mine" / "theirs" to take one side wholesale.',
+ extensions: { file: e.file, resolutionOptions: RESOLUTION_OPTIONS },
+ },
+ );
+ return;
+ }
// Surface the underlying error (typically the git commit stderr
// wrapped by `ConflictStore.resolveConflict`) on the RFC 9457
// `detail` field so operators + UI toasts + agent tools have the
diff --git a/packages/server/src/mcp/tools/resolve-conflict.ts b/packages/server/src/mcp/tools/resolve-conflict.ts
index 9bb990542..ae849a0a2 100644
--- a/packages/server/src/mcp/tools/resolve-conflict.ts
+++ b/packages/server/src/mcp/tools/resolve-conflict.ts
@@ -37,7 +37,7 @@ const DESCRIPTION = [
'- `content` — writes the provided `content` argument (e.g. a per-hunk merged result, or the live Y.Text bytes the user sees in the DiffView). The provided string must be non-empty — use `delete` to remove the file entirely (an agent constructing a per-hunk merge that happens to land on `""` gets a 400 at the Zod boundary rather than a misleading 500).',
'- `delete` — runs `git rm <file>` then commits the deletion. Honors deletion intent for delete-modify (DU: "keep deletion") and modify-delete (UD: "accept their deletion") shapes. Inspect the `shape` field on `conflicts({ kind: "content" })` to pick the right strategy for the conflict shape.',
'',
- 'Returns 200 on success; 500 indicates commit failure (re-call `conflicts({ kind: "list" })` to confirm post-state — the resolve API is best-effort, non-atomic, and the file may have been resolved by another session).',
+ 'Returns 200 on success. 422 (`urn:ok:error:unresolved-conflict-markers`) means the `content` you sent still contains a `<<<<<<< … >>>>>>>` block — a permanent rejection of those bytes, so resolve every region before retrying rather than re-sending. 500 indicates commit failure (re-call `conflicts({ kind: "list" })` to confirm post-state — the resolve API is best-effort, non-atomic, and the file may have been resolved by another session).',
'',
'**DESTRUCTIVE:** this modifies the working tree and creates a git commit.',
'',
diff --git a/packages/server/src/persistence-fan-out.test.ts b/packages/server/src/persistence-fan-out.test.ts
index 2f0ce44da..eb1f40ca0 100644
--- a/packages/server/src/persistence-fan-out.test.ts
+++ b/packages/server/src/persistence-fan-out.test.ts
@@ -14,6 +14,7 @@ import { afterEach, beforeEach, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
import { recordContributor, swapContributors } from './contributor-tracker.ts';
import { applyExternalChange } from './external-change.ts';
+import { claimExternalChange, clearExternalChangeClaims } from './external-change-attribution.ts';
import { createServer } from './server-factory.ts';
import { FILE_SYSTEM_WRITER, initShadowRepo, shadowGit } from './shadow-repo.ts';
@@ -167,6 +168,64 @@ describe('persistence L2 fan-out (US-014)', () => {
expect(subject).toBe('reconcile: fs-writer-doc');
});
+ test('a claimed external change commits on the actor ref, not file-system', async () => {
+ // A merge-conflict resolution reaches the Y.Doc through the watcher like
+ // any other disk edit, so without a claim it lands on `file-system` and the
+ // history cannot say who chose. The claim is what moves it to the actor.
+ clearExternalChangeClaims();
+ const projectDir = tmpDir;
+ const contentDir = join(tmpDir, 'content');
+ mkdirSync(contentDir, { recursive: true });
+ const historyHandle = await initShadowRepo(projectDir);
+
+ const server = createServer({
+ contentDir,
+ projectDir,
+ contentRoot: 'content',
+ quiet: true,
+ debounce: 60_000,
+ shadowRepo: historyHandle,
+ });
+ await server.ready;
+
+ const conn = await server.hocuspocus.openDirectConnection('claimed-doc');
+ await conn.transact((doc) => {
+ const xmlFragment = doc.getXmlFragment('default');
+ const paragraph = new Y.XmlElement('paragraph');
+ paragraph.insert(0, [new Y.XmlText('initial content')]);
+ xmlFragment.insert(0, [paragraph]);
+ });
+
+ const writerId = 'principal-33333333-3333-3333-3333-333333333333';
+ claimExternalChange('claimed-doc', {
+ writerId,
+ displayName: 'Alice',
+ colorSeed: writerId,
+ });
+
+ applyExternalChange(
+ server.durabilityState,
+ server.hocuspocus,
+ 'claimed-doc',
+ '# Resolved by a person\n',
+ );
+
+ const doc = server.hocuspocus.documents.get('claimed-doc');
+ doc?.removeDirectConnection();
+
+ await server.destroy();
+
+ const sg = shadowGit(historyHandle);
+ const actorRef = (await sg.raw('rev-parse', `refs/wip/main/${writerId}`)).trim();
+ expect(actorRef).toBeTruthy();
+
+ // And nothing was credited to the file system for this doc.
+ const fsRefs = (
+ await sg.raw('for-each-ref', '--format=%(refname)', 'refs/wip/main/file-system')
+ ).trim();
+ expect(fsRefs).toBe('');
+ });
+
test('concurrent agent + file-watcher → two commits sharing tree SHA', async () => {
const projectDir = tmpDir;
const contentDir = join(tmpDir, 'content');
diff --git a/packages/server/src/reconciliation.test.ts b/packages/server/src/reconciliation.test.ts
index b67a92d22..f3df57ffa 100644
--- a/packages/server/src/reconciliation.test.ts
+++ b/packages/server/src/reconciliation.test.ts
@@ -1,6 +1,7 @@
import { describe, expect, test } from 'vitest';
import {
containsConflictMarkers,
+ containsUnresolvedConflictBlock,
MAX_LCS_CELLS,
reconcile,
splitMarkdownBlocks,
@@ -251,3 +252,41 @@ describe('reconcile', () => {
}
});
});
+
+// ─── containsUnresolvedConflictBlock ─────────────────────────────────────────
+
+describe('containsUnresolvedConflictBlock', () => {
+ test('a complete unresolved block is detected', () => {
+ expect(
+ containsUnresolvedConflictBlock('<<<<<<< ours\nmine\n=======\ntheirs\n>>>>>>> theirs\n'),
+ ).toBe(true);
+ });
+
+ test('a half-resolved file with one block left is detected', () => {
+ expect(
+ containsUnresolvedConflictBlock(
+ 'resolved prose\n\n<<<<<<< ours\nmine\n=======\ntheirs\n>>>>>>> theirs\n\ntail\n',
+ ),
+ ).toBe(true);
+ });
+
+ test('a setext H1 underline is not a conflict', () => {
+ expect(containsUnresolvedConflictBlock('Release Notes\n=======\n\nWe shipped it.\n')).toBe(
+ false,
+ );
+ });
+
+ test('an end marker with no start is not a conflict', () => {
+ expect(containsUnresolvedConflictBlock('prose\n>>>>>>> theirs\n')).toBe(false);
+ });
+
+ test('a start marker with no end is not a complete block', () => {
+ expect(containsUnresolvedConflictBlock('<<<<<<< ours\nmine\n')).toBe(false);
+ });
+
+ test('the loose predicate still flags the setext heading it always did', () => {
+ // Guards the split: `containsConflictMarkers` keeps its deliberately loose
+ // bias for the watcher, and only the write-refusal path uses the strict one.
+ expect(containsConflictMarkers('Release Notes\n=======\n')).toBe(true);
+ });
+});
diff --git a/packages/server/src/reconciliation.ts b/packages/server/src/reconciliation.ts
index 743d53cb7..5c4e5766c 100644
--- a/packages/server/src/reconciliation.ts
+++ b/packages/server/src/reconciliation.ts
@@ -79,6 +79,27 @@ export function containsConflictMarkers(content: string): boolean {
return CONFLICT_MARKER_RE.test(content);
}
+/**
+ * Detect a COMPLETE unresolved conflict block: a `<<<<<<< ` start marker with a
+ * `>>>>>>> ` end marker after it.
+ *
+ * `containsConflictMarkers` above answers "might this be conflicted?" and is
+ * deliberately loose — a false positive there costs a slower path and nothing
+ * else. Refusing to write needs the opposite bias, because seven `=` is both a
+ * separator and a Markdown setext H1 underline: the loose predicate rejects the
+ * ordinary document `Release Notes\n=======\n`, and a rejected resolution
+ * leaves the user with no way to resolve that file at all.
+ *
+ * Still refuses a document that quotes a whole conflict block inside a fence.
+ * That is rarer than a setext heading and, unlike it, genuinely ambiguous from
+ * the bytes alone.
+ */
+export function containsUnresolvedConflictBlock(content: string): boolean {
+ const start = /^<{7} /m.exec(content);
+ if (!start) return false;
+ return /^>{7} /m.test(content.slice(start.index + start[0].length));
+}
+
// ─── Block splitting ─────────────────────────────────────────────────────────
/**
diff --git a/packages/server/src/sync-engine.test.ts b/packages/server/src/sync-engine.test.ts
index 36f81e778..2ea9c3823 100644
--- a/packages/server/src/sync-engine.test.ts
+++ b/packages/server/src/sync-engine.test.ts
@@ -6607,6 +6607,85 @@ describe('SyncEngine pull-only B1 fast-forward cycle', () => {
}
});
+ test('REPRO: content-strategy resolve fires the resolved callback', async () => {
+ // The callback is what clears the doc's `lifecycle.status`, which is what
+ // swaps DiffViewBoundary out. If it does not fire on the `content` path,
+ // the conflict view outlives its conflict and hangs.
+ await cloneBehindOrigin({
+ seed: { 'a.md': 'line1\nline2\n' },
+ advance: { 'a.md': 'ORIGIN1\nline2\n' },
+ });
+ writeFileSync(join(projectDir, 'a.md'), 'LOCAL1\nline2\n', 'utf-8');
+
+ const resolved: string[][] = [];
+ const engine = makePullEngine({
+ onContentConflictsResolved: (files) => {
+ resolved.push([...files]);
+ },
+ });
+ try {
+ await engine.start();
+ await engine.trigger('pull');
+ expect(engine.getConflicts()).toHaveLength(1);
+
+ // What "Apply changes" sends: an arbitrary merged body.
+ await engine.resolveConflict('a.md', 'content', 'MERGED\nline2\n');
+
+ expect(readFileSync(join(projectDir, 'a.md'), 'utf-8')).toBe('MERGED\nline2\n');
+ expect(engine.getConflicts()).toEqual([]);
+ expect(resolved).toEqual([['a.md']]);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a merge-native resolve also fires the resolved callback', async () => {
+ // The callback is what clears `lifecycle.status`, and it used to fire only
+ // for working-tree conflicts — merge-native was left to the file-watcher's
+ // reconcile, which clears only for a loaded doc and only once the reconcile
+ // lands. When neither held, the flag stayed set with no conflict behind it
+ // and the conflict view sat on screen with nothing to show.
+ await cloneBehindOrigin({
+ seed: { 'a.md': 'line1\nline2\n' },
+ advance: { 'a.md': 'ORIGIN1\nline2\n' },
+ });
+ // Committed locally — this is what makes it merge-native rather than an
+ // uncommitted overlay.
+ writeFileSync(join(projectDir, 'a.md'), 'LOCAL1\nline2\n', 'utf-8');
+ const git = simpleGit(projectDir);
+ // Identity per-repo, not inherited: CI runners have no global git identity,
+ // so a bare commit here fails with "Author identity unknown" while passing
+ // on any developer machine. Every other committing test in this file does
+ // the same.
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ await git.add('a.md');
+ await git.commit('local edit');
+
+ const resolved: string[][] = [];
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir: projectDir,
+ contentFilter: stubContentFilter,
+ mode: 'auto',
+ onContentConflictsResolved: (files) => {
+ resolved.push([...files]);
+ },
+ });
+ try {
+ await engine.start();
+ await engine.trigger('sync');
+ expect(engine.getConflicts()).toHaveLength(1);
+
+ await engine.resolveConflict('a.md', 'content', 'MERGED\nline2\n');
+
+ expect(engine.getConflicts()).toEqual([]);
+ expect(resolved).toEqual([['a.md']]);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
test('resolving keep-mine leaves the overlay and clears the conflict without committing', async () => {
await cloneBehindOrigin({
seed: { 'a.md': 'line1\nline2\n' },
diff --git a/packages/server/src/sync-engine.ts b/packages/server/src/sync-engine.ts
index b6620142f..975c63059 100644
--- a/packages/server/src/sync-engine.ts
+++ b/packages/server/src/sync-engine.ts
@@ -2429,12 +2429,19 @@ export class SyncEngine {
throw e;
}
if (wasWorkingTree) {
- // The pull-only conflict lifecycle's terminal event: a user picked a
- // side in the resolver (`strategy` is bounded — mine/theirs/content/
- // delete). Merge-native resolutions are a separate lifecycle.
log.info({ choice: strategy }, '[sync] pull-only: conflict resolved by choice');
- await this.notifyContentConflictsResolved([file]);
}
+ // Fires for BOTH variants. Merge-native was previously left to the
+ // file-watcher's reconcile, which clears the lifecycle only for a doc
+ // that is loaded and only once the reconcile lands — so a resolve whose
+ // watcher event computed `noop`, or arrived while the doc was not open,
+ // left `lifecycle.status = 'conflict'` standing with no conflict behind
+ // it, which is what keeps the conflict view on screen with nothing to
+ // show. The clear is idempotent: `clearLifecycleConflict` returns early
+ // when the doc is not marked, and refuses while the engine still holds a
+ // standing conflict for it, so the redundant call on the paths the
+ // watcher already covers is a no-op rather than a race.
+ await this.notifyContentConflictsResolved([file]);
this.conflictCount = this.conflictStore.count();
// Ledger-keyed, not state-keyed: B1 leaves the engine at `idle` while its
// conflicts sit in the ledger, so gating on `state === 'conflict'` skips
diff --git a/patches/@pierre%[email protected] b/patches/@pierre%[email protected]
new file mode 100644
index 000000000..db57ddb54
--- /dev/null
+++ b/patches/@pierre%[email protected]
@@ -0,0 +1,13 @@
+diff --git a/dist/renderers/UnresolvedFileHunksRenderer.js b/dist/renderers/UnresolvedFileHunksRenderer.js
+index 2b11e3982015a6583f8ba1e5ce77b72634ba8ed9..1326707982dada290cc5fc42d4708bba4363d724 100644
+--- a/dist/renderers/UnresolvedFileHunksRenderer.js
++++ b/dist/renderers/UnresolvedFileHunksRenderer.js
+@@ -97,7 +97,7 @@ var UnresolvedFileHunksRenderer = class extends DiffHunksRenderer {
+ getOptionsWithDefaults() {
+ const options = super.getOptionsWithDefaults();
+ options.diffStyle = "unified";
+- options.lineDiffType = "none";
++ options.lineDiffType = this.options.lineDiffType ?? "none";
+ options.mergeConflictActionsType = this.options.mergeConflictActionsType ?? "default";
+ return options;
+ }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a196345d4..ff689b416 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,36 +6,14 @@ settings:
overrides:
'@babel/core@7': ~7.29.6
- '@hono/node-server@1': ~1.19.15
- '@opentelemetry/core@2': ~2.8.0
- brace-expansion@1: ~1.1.18
- brace-expansion@2: ~2.1.4
- builder-util-runtime@9: ~9.7.0
- dompurify@3: ~3.4.13
- fast-uri@3: ~3.1.5
- fast-xml-parser@5: ~5.10.1
- hono@4: ~4.12.34
- ip-address@10: ~10.3.1
- js-yaml@3: ~3.15.1
- js-yaml@4: ~4.3.1
- lodash-es@4: ~4.18.0
- mermaid@11: ~11.16.1
- nanoid@3: ~3.3.18
- nanoid@4: ~5.1.16
- nanoid@5: ~5.1.16
- next@16: ~16.2.11
- postcss@8: ~8.5.23
- tar@7: ~7.5.21
- undici@6: ~6.28.0
- undici@7: ~7.29.0
'@codemirror/state': 6.6.0
'@codemirror/view': 6.43.3
'@floating-ui/core': 1.7.5
'@floating-ui/dom': 1.7.6
'@floating-ui/react-dom': 2.1.8
'@floating-ui/utils': 0.2.11
+ '@hono/node-server@1': ~1.19.15
+ '@opentelemetry/core@2': ~2.8.0
'@radix-ui/number': 1.1.1
'@radix-ui/primitive': 1.1.4
'@radix-ui/react-accessible-icon': 1.1.7
@@ -135,13 +113,35 @@ overrides:
'@tiptap/starter-kit': 3.22.3
'@tiptap/suggestion': 3.22.3
'@types/node': ^24.7.0
+ brace-expansion@1: ~1.1.18
+ brace-expansion@2: ~2.1.4
+ builder-util-runtime@9: ~9.7.0
+ dompurify@3: ~3.4.13
+ fast-uri@3: ~3.1.5
+ fast-xml-parser@5: ~5.10.1
+ hono@4: ~4.12.34
+ ip-address@10: ~10.3.1
+ js-yaml@3: ~3.15.1
+ js-yaml@4: ~4.3.1
+ lodash-es@4: ~4.18.0
mdast-util-mdx-jsx: 3.2.0
+ mermaid@11: ~11.16.1
+ nanoid@3: ~3.3.18
+ nanoid@4: ~5.1.16
+ nanoid@5: ~5.1.16
+ next@16: ~16.2.11
+ postcss@8: ~8.5.23
prosemirror-model: 1.25.4
prosemirror-view: 1.41.8
radix-ui: 1.4.3
react: 19.2.5
react-dom: 19.2.5
react-lite-youtube-embed: 3.5.1
+ tar@7: ~7.5.21
+ undici@6: ~6.28.0
+ undici@7: ~7.29.0
patchedDependencies:
'@handlewithcare/[email protected]':
@@ -150,6 +150,9 @@ patchedDependencies:
'@lingui/[email protected]':
hash: 126db40cb2224e90abf5f063d3aa005eb1bc84796d77216d5a9e52d5cd28a656
path: patches/@lingui%[email protected]
+ '@pierre/[email protected]':
+ hash: c823ecf3ff76ff3c3e71f441f2a7286aa2aae8e91b4d5e5a10554d8441d6c739
+ path: patches/@pierre%[email protected]
'@pierre/[email protected]':
hash: 86ac804ac75d9f365ee9ef918460463a211ac5201ebc3cf04fc0534c5b3adf88
path: patches/@pierre%[email protected]
@@ -378,9 +381,6 @@ importers:
'@codemirror/lint':
specifier: ^6.9.7
version: 6.9.7
- '@codemirror/merge':
- specifier: ^6.12.1
- version: 6.12.2
'@codemirror/search':
specifier: ^6.6.0
version: 6.7.1
@@ -468,6 +468,9 @@ importers:
'@panzoom/panzoom':
specifier: ^4.6.2
version: 4.6.2
+ '@pierre/diffs':
+ specifier: 1.3.6
+ version: 1.3.6(patch_hash=c823ecf3ff76ff3c3e71f441f2a7286aa2aae8e91b4d5e5a10554d8441d6c739)(@shikijs/[email protected])([email protected]([email protected]))([email protected])
'@pierre/trees':
specifier: 1.0.0-beta.4
version: 1.0.0-beta.4(patch_hash=86ac804ac75d9f365ee9ef918460463a211ac5201ebc3cf04fc0534c5b3adf88)([email protected]([email protected]))([email protected])
@@ -477,9 +480,6 @@ importers:
'@shikijs/langs':
specifier: ^3.23.0
version: 3.23.0
- '@shikijs/themes':
- specifier: ^3.23.0
- version: 3.23.0
'@tanstack/react-query':
specifier: ^5.99.0
version: 5.101.2([email protected])
@@ -730,6 +730,9 @@ importers:
'@vitejs/plugin-react':
specifier: ^6.0.1
+ axe-core:
+ specifier: ~4.12.1
+ version: 4.12.1
babel-plugin-react-compiler:
specifier: 0.0.0-experimental-a8e64ef-20260402
version: 0.0.0-experimental-a8e64ef-20260402
@@ -1777,9 +1780,6 @@ packages:
'@codemirror/[email protected]':
resolution: {integrity: sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg==}
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-V8JvyAPjHbPupqP7BeMcsdsYCbyPij74jxIbaIJDORI+VZzW44zFmon8bF+oxGWvOKhcRmkiUMXd8MxHr3YA2w==}
-
'@codemirror/[email protected]':
resolution: {integrity: sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA==}
@@ -4181,6 +4181,36 @@ packages:
resolution: {integrity: sha512-ODOov0sGMJMf3jPonOkgGqPknTsu+DdQ7kD++gz8aI+aFMOMHFbWAA2taqXXVTdP+OTOQR/znGvSpmkeI0WTYQ==}
engines: {node: '>=14.18.0'}
+ '@pierre/[email protected]':
+ resolution: {integrity: sha512-a3woaW2QHy78JDxPJK0OJzwZUN4xoQLLIS/pceO8X6+L8gA5D682mP7/w3YxxEVRPXOaoe/p/RJ5Oj/3nrEzew==}
+ peerDependencies:
+ react: 19.2.5
+ react-dom: 19.2.5
+
+ '@pierre/[email protected]':
+ resolution: {integrity: sha512-yNDd9GYLQl1mEUJR8AneJ5e4ohLIHQd/wZLWr4fagt78vS2RwwZNW530vVgHqXFAyFVcFlRmGUD5ramXH46OXw==}
+ engines: {vscode: ^1.0.0}
+
+ '@pierre/[email protected]':
+ resolution: {integrity: sha512-WCI5Qd7iprDpISL9fBYOLe8RV53+b7mFNA3bPzl60/2CKCSrsKN8zEcep6Y3BAzvARlmca50zGjDodqPGiTUKA==}
+ peerDependencies:
+ '@pierre/theme': ^1.1.0 || ^2.0.0
+ '@shikijs/themes': ^3.0.0 || ^4.0.0
+ react: 19.2.5
+ react-dom: 19.2.5
+ shiki: ^3.0.0 || ^4.0.0
+ peerDependenciesMeta:
+ '@pierre/theme':
+ optional: true
+ '@shikijs/themes':
+ optional: true
+ react:
+ optional: true
+ react-dom:
+ optional: true
+ shiki:
+ optional: true
+
'@pierre/[email protected]':
resolution: {integrity: sha512-OfT1yk9ne8Te5+GB5zUY8yqE6B8BqjBHQJleH4lu8ltwNpoocZl4vXt1AzlEExpxI/pp+AFX5QG+lR3JjtTEag==}
peerDependencies:
@@ -7265,6 +7295,10 @@ packages:
resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==}
engines: {node: '>=0.3.1'}
+ resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==}
+ engines: {node: '>=0.3.1'}
+
resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
@@ -8860,6 +8894,9 @@ packages:
resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
engines: {node: '>=12'}
+ resolution: {integrity: sha512-I+lBvqMMFfqaV8CJCISjI3wbjmwVu/VyOoU7+qtu9d7ioW5klMgsTTiUOUp+DJvfTTzKXoPbyC6YfgkNcyPSOg==}
+
resolution: {integrity: sha512-HGGkdlPWQ0vTF8jJ5TdIqhQXZi6uh3LnNgfZ8MHiuxFfX3RZeA79r2MW2tHAZKlAVfoNE8esm3p+O6VkIvpj6w==}
peerDependencies:
@@ -12202,14 +12239,6 @@ snapshots:
'@codemirror/view': 6.43.3
crelt: 1.0.7
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/language': 6.12.4
- '@codemirror/state': 6.6.0
- '@codemirror/view': 6.43.3
- '@lezer/highlight': 1.2.3
- style-mod: 4.1.3
-
'@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.6.0
@@ -14522,6 +14551,30 @@ snapshots:
tslib: 2.8.1
webcrypto-core: 1.9.2
+ '@pierre/[email protected](patch_hash=c823ecf3ff76ff3c3e71f441f2a7286aa2aae8e91b4d5e5a10554d8441d6c739)(@shikijs/[email protected])([email protected]([email protected]))([email protected])':
+ dependencies:
+ '@pierre/theme': 2.0.0
+ '@shikijs/transformers': 3.23.0
+ diff: 9.0.0
+ hast-util-to-html: 9.0.5
+ lru_map: 0.4.1
+ react: 19.2.5
+ react-dom: 19.2.5([email protected])
+ shiki: 3.23.0
+ transitivePeerDependencies:
+ - '@shikijs/themes'
+
+ '@pierre/[email protected]': {}
+
+ optionalDependencies:
+ '@pierre/theme': 2.0.0
+ '@shikijs/themes': 3.23.0
+ react: 19.2.5
+ react-dom: 19.2.5([email protected])
+ shiki: 3.23.0
+
'@pierre/[email protected](patch_hash=86ac804ac75d9f365ee9ef918460463a211ac5201ebc3cf04fc0534c5b3adf88)([email protected]([email protected]))([email protected])':
dependencies:
preact: 11.0.0-beta.0
@@ -17569,6 +17622,8 @@ snapshots:
+
dependencies:
minimatch: 3.1.5
@@ -19512,6 +19567,8 @@ snapshots:
+
dependencies:
react: 19.2.5
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index bfb7b3274..a0cbd37db 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -238,6 +238,7 @@ overrides:
patchedDependencies:
'@handlewithcare/[email protected]': patches/@handlewithcare%[email protected]
'@lingui/[email protected]': patches/@lingui%[email protected]
+ '@pierre/[email protected]': patches/@pierre%[email protected]
'@pierre/[email protected]': patches/@pierre%[email protected]
'@tiptap/[email protected]': patches/@tiptap%[email protected]
'@tiptap/[email protected]': patches/@tiptap%[email protected]