resolving conflicts

docs/Siyuan/README.md

@@ -0,0 +1,50 @@
+# README
+
+‍
+
+​![image](assets/image-20250122162731-7wkftbw.png)​
+
+---
+
+SiYuan is a privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync.
+
+Fuse blocks, outlines, and bidirectional links to refactor your thinking.
+
+‍
+
+## STEP1.
+
+Apply a token from [deepseek open platform](https://platform.deepseek.com/)
+
+‍
+
+## STEP 2
+
+Enter the Settings interface
+
+​![image](assets/image-20250122163007-hkuruoe.png)​
+
+‍
+
+## STEP 3
+
+Navigate to the "AI" tab in Settings and configure the following:
+
+* Enter your DeepSeek API key in the text field
+* Configure the endpoint URL and model details:
+
+  * URI: `https://api.deepseek.com/v1/`​
+  * Model: `deepseek-chat`​
+  * Temperature: 1.3
+
+​![image](assets/image-20250122162241-32a4oma.png)​
+
+‍
+
+how to use:
+
+‍
+
+​![image](assets/image-20250122162425-wlsgw0u.png)​
+
+‍

docs/Siyuan/README_cn.md

@@ -0,0 +1,36 @@
+# README_cn
+
+​![image](assets/image-20250122162731-7wkftbw.png)​
+
+---
+
+思源笔记是一款注重隐私的个人知识管理系统，支持完全离线使用，并提供端到端加密的数据同步功能。通过融合块、大纲和双向链接，重构你的思维方式。
+
+## 第一步
+
+从[深度求索开放平台](https://platform.deepseek.com/)申请一个令牌。
+
+## 第二步
+
+进入设置界面
+
+​![image](assets/image-20250122163007-hkuruoe.png)​
+
+## 第三步
+
+在设置中导航到“AI”选项卡并进行以下配置：
+
+* 在文本框中输入你的DeepSeek API密钥
+* 配置端点URL和模型详细信息：
+
+  * URI: `https://api.deepseek.com/v1/`​
+  * 模型: `deepseek-chat`​
+  * 温度: 1.3
+
+​![image](assets/image-20250122162241-32a4oma.png)​
+
+如何使用：
+
+​![image](assets/image-20250122162425-wlsgw0u.png)​
+
+‍

docs/codecompanion.nvim/README.md

@@ -0,0 +1,97 @@
+# [codecompanion.nvim](https://github.com/olimorris/codecompanion.nvim)
+
+> AI-powered coding, seamlessly in Neovim
+
+**codecompanion.nvim** is a productivity tool which streamlines how you develop with LLMs, in Neovim.
+
+## Features
+
+- :speech_balloon: [Copilot Chat](https://github.com/features/copilot) meets [Zed AI](https://zed.dev/blog/zed-ai), in Neovim
+- :electric_plug: Support for Anthropic, Copilot, Gemini, Ollama, OpenAI, Azure OpenAI, HuggingFace and xAI LLMs (or bring your own!)
+- :rocket: Inline transformations, code creation and refactoring
+- :robot: Variables, Slash Commands, Agents/Tools and Workflows to improve LLM output
+- :sparkles: Built in prompt library for common tasks like advice on LSP errors and code explanations
+- :building_construction: Create your own custom prompts, Variables and Slash Commands
+- :books: Have multiple chats open at the same time
+- :muscle: Async execution for fast performance
+
+## Installation
+
+First, Navigate to the nvim configuration folder (default on Linux is `~/.config/nvim`)
+
+### Install via `lazy.nvim`
+
+Then to the `lua/plugins` folder. Create a file named `init.lua` and add the following content:
+
+```lua
+return {
+  "olimorris/codecompanion.nvim",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  config = function()
+    require("codecompanion").setup({
+      adapters = {
+        deepseek = function()
+          return require("codecompanion.adapters").extend("openai_compatible", {
+            env = {
+              url = "https://api.deepseek.com",
+              api_key = "YOUR_API_KEY",
+            },
+          })
+        end,
+      },
+      strategies = {
+        chat = { adapter = "deepseek", },
+        inline = { adapter = "deepseek" },
+        agent = { adapter = "deepseek" },
+      },
+    })
+  end
+}
+```
+Restart nvim, and `lazy.nvim` should automatically download and install the codecompanion.nvim plugin and its dependencies based on the above file.
+
+### Install via `mini.deps`
+
+Add the following content to your `init.lua`:
+
+```lua
+local add, later = MiniDeps.add, MiniDeps.later
+
+later(function()
+  add({
+    source = "olimorris/codecompanion.nvim",
+    depends = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+    },
+  })
+  require("codecompanion").setup({
+    adapters = {
+      deepseek = function()
+        return require("codecompanion.adapters").extend("openai_compatible", {
+          env = {
+            url = "https://api.deepseek.com",
+              api_key = "YOUR_API_KEY",
+          },
+        })
+      end,
+    },
+    strategies = {
+      chat = { adapter = "deepseek", },
+      inline = { adapter = "deepseek" },
+      agent = { adapter = "deepseek" },
+    },
+  })
+end)
+```
+Restart nvim, and `mini.deps` should also automatically download and install the codecompanion.nvim plugin.
+
+
+### Other Installation Methods
+https://codecompanion.olimorris.dev/installation.html
+
+## Usage
+https://codecompanion.olimorris.dev/usage/introduction.html

docs/codecompanion.nvim/README_cn.md

@@ -0,0 +1,98 @@
+# [codecompanion.nvim](https://github.com/olimorris/codecompanion.nvim)
+
+> AI 驱动的编码，在 Neovim 中无缝集成
+
+**codecompanion.nvim** 是一个提高生产力的工具，它简化了在 Neovim 中使用大型语言模型（LLM）进行开发的方式。
+
+## 特性
+
+- :speech_balloon: 在 Neovim 中，[Copilot Chat](https://github.com/features/copilot) 与 [Zed AI](https://zed.dev/blog/zed-ai) 的结合
+- :electric_plug: 支持 Anthropic、Copilot、Gemini、Ollama、OpenAI、Azure OpenAI、HuggingFace 和 xAI LLM（或自定义 LLM！）
+- :rocket: 内联变换、代码生成与重构
+- :robot: 通过变量、斜杠命令、代理/工具和工作流改善 LLM 输出
+- :sparkles: 内置常用任务的提示词，例如 LSP 错误的建议和代码解释
+- :building_construction: 创建自定义提示、变量和斜杠命令
+- :books: 同时打开多个对话
+- :muscle: 异步执行，提供快速的性能
+
+## 安装
+
+首先，导航到 Neovim 配置文件夹（默认情况下，Linux 上的路径是 `~/.config/nvim`）。
+
+### 通过 `lazy.nvim` 安装
+
+然后进入 `lua/plugins` 文件夹。创建一个名为 `init.lua` 的文件，并添加以下内容：
+
+```lua
+return {
+  "olimorris/codecompanion.nvim",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  config = function()
+    require("codecompanion").setup({
+      adapters = {
+        deepseek = function()
+          return require("codecompanion.adapters").extend("openai_compatible", {
+            env = {
+              url = "https://api.deepseek.com",
+              api_key = "YOUR_API_KEY",
+            },
+          })
+        end,
+      },
+      strategies = {
+        chat = { adapter = "deepseek", },
+        inline = { adapter = "deepseek" },
+        agent = { adapter = "deepseek" },
+      },
+    })
+  end
+}
+```
+重新启动 Neovim，`lazy.nvim` 应该会自动下载并安装 `codecompanion.nvim` 插件及其依赖项。
+
+### 通过 `mini.deps` 安装
+
+将以下内容添加到你的 `init.lua` 中
+
+```lua
+local add, later = MiniDeps.add, MiniDeps.later
+
+later(function()
+  add({
+    source = "olimorris/codecompanion.nvim",
+    depends = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+    },
+  })
+  require("codecompanion").setup({
+    adapters = {
+      deepseek = function()
+        return require("codecompanion.adapters").extend("openai_compatible", {
+          env = {
+            url = "https://api.deepseek.com",
+              api_key = "YOUR_API_KEY",
+          },
+        })
+      end,
+    },
+    strategies = {
+      chat = { adapter = "deepseek", },
+      inline = { adapter = "deepseek" },
+      agent = { adapter = "deepseek" },
+    },
+  })
+end)
+```
+
+重新启动 Neovim，`mini.deps` 应该会自动下载并安装 `codecompanion.nvim` 插件。
+
+
+### 其他安装方法
+https://codecompanion.olimorris.dev/installation.html
+
+## 使用
+https://codecompanion.olimorris.dev/usage/introduction.html

docs/llm.nvim/README.md

@@ -23,7 +23,7 @@ return {
   {
     "Kurama622/llm.nvim",
     dependencies = { "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim" },
-    cmd = { "LLMSesionToggle", "LLMSelectedTextHandler", "LLMAppHandler" },
+    cmd = { "LLMSessionToggle", "LLMSelectedTextHandler", "LLMAppHandler" },
     config = function()
       require("llm").setup({
         url = "https://api.deepseek.com/chat/completions",

docs/llm.nvim/README_cn.md

@@ -23,7 +23,7 @@ return {
   {
     "Kurama622/llm.nvim",
     dependencies = { "nvim-lua/plenary.nvim", "MunifTanjim/nui.nvim" },
-    cmd = { "LLMSesionToggle", "LLMSelectedTextHandler", "LLMAppHandler" },
+    cmd = { "LLMSessionToggle", "LLMSelectedTextHandler", "LLMAppHandler" },
     config = function()
       require("llm").setup({
         url = "https://api.deepseek.com/chat/completions",