Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
main reset: post-stable v0.68.0 (#4043)
inkeep-internal-ci[bot]4222caf11c62
diff --git a/.changeset/conflict-view-rebuild.md b/.changeset/conflict-view-rebuild.mddeleted file mode 100644index a217a8197..000000000--- a/.changeset/conflict-view-rebuild.md+++ /dev/null@@ -1,19 +0,0 @@-----"@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/.changeset/pre.json b/.changeset/pre.jsonindex feb649406..004de956a 100644--- a/.changeset/pre.json+++ b/.changeset/pre.json@@ -2,15 +2,15 @@"mode": "pre","tag": "beta","initialVersions": {- "@inkeep/open-knowledge-docs": "0.0.156",- "@inkeep/open-knowledge-app": "0.67.2",- "@inkeep/open-knowledge": "0.67.2",- "@inkeep/open-knowledge-core": "0.67.2",- "@inkeep/open-knowledge-desktop": "0.67.2",- "@inkeep/md-conformance": "0.0.164",+ "@inkeep/open-knowledge-docs": "0.0.157",+ "@inkeep/open-knowledge-app": "0.68.0",+ "@inkeep/open-knowledge": "0.68.0",+ "@inkeep/open-knowledge-core": "0.68.0",+ "@inkeep/open-knowledge-desktop": "0.68.0",+ "@inkeep/md-conformance": "0.0.165","@inkeep/open-knowledge-native-config": "0.0.0","@inkeep/open-knowledge-plugin": "0.3.1",- "@inkeep/open-knowledge-server": "0.67.2"+ "@inkeep/open-knowledge-server": "0.68.0"},"changesets": []}diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex f1c6e1922..0b7242371 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -1,5 +1,11 @@# @inkeep/open-knowledge-docs+## 0.0.157++### Patch Changes++- @inkeep/[email protected]+## 0.0.156### Patch Changesdiff --git a/docs/package.json b/docs/package.jsonindex 6308da96b..4b468b508 100644--- a/docs/package.json+++ b/docs/package.json@@ -1,6 +1,6 @@{"name": "@inkeep/open-knowledge-docs",- "version": "0.0.156",+ "version": "0.0.157","license": "GPL-3.0-or-later","private": true,"packageManager": "[email protected]",diff --git a/packages/app/package.json b/packages/app/package.jsonindex d4c1883f7..e6cbe11c6 100644--- a/packages/app/package.json+++ b/packages/app/package.json@@ -1,6 +1,6 @@{"name": "@inkeep/open-knowledge-app",- "version": "0.67.2",+ "version": "0.68.0","license": "GPL-3.0-or-later","private": true,"type": "module",diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 05cb9cc20..54cbacf1a 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -1,6 +1,6 @@{"name": "@inkeep/open-knowledge",- "version": "0.67.2",+ "version": "0.68.0","description": "Local-first, agent-friendly Markdown knowledge base with a cross-platform CLI and web editor","keywords": ["knowledge-base",diff --git a/packages/core/package.json b/packages/core/package.jsonindex 4684a5774..f0cb27131 100644--- a/packages/core/package.json+++ b/packages/core/package.json@@ -1,6 +1,6 @@{"name": "@inkeep/open-knowledge-core",- "version": "0.67.2",+ "version": "0.68.0","license": "GPL-3.0-or-later","private": true,"type": "module",diff --git a/packages/desktop/package.json b/packages/desktop/package.jsonindex d3e2debe0..3f80699a0 100644--- a/packages/desktop/package.json+++ b/packages/desktop/package.json@@ -1,7 +1,7 @@{"name": "@inkeep/open-knowledge-desktop","productName": "OpenKnowledge",- "version": "0.67.2",+ "version": "0.68.0","license": "GPL-3.0-or-later","homepage": "https://openknowledge.ai","author": {diff --git a/packages/server/package.json b/packages/server/package.jsonindex e5c0a7aff..de5d3385e 100644--- a/packages/server/package.json+++ b/packages/server/package.json@@ -1,6 +1,6 @@{"name": "@inkeep/open-knowledge-server",- "version": "0.67.2",+ "version": "0.68.0","license": "GPL-3.0-or-later","private": true,"type": "module",