@fromsko/obsidian-mcp-server 1.1.7 → 1.1.8

package/dist/index.js

@@ -2,10 +2,27 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { exec } from "child_process";
 import * as fs from "fs/promises";
 import { glob } from "glob";
 import matter from "gray-matter";
 import * as path from "path";
+import { promisify } from "util";
+const execAsync = promisify(exec);
+// Git Commit 类型定义
+const COMMIT_TYPES = {
+    feat: { emoji: "✨", description: "新功能" },
+    fix: { emoji: "🐛", description: "Bug 修复" },
+    docs: { emoji: "📝", description: "文档更新" },
+    style: { emoji: "🎨", description: "代码格式" },
+    refactor: { emoji: "♻️", description: "重构" },
+    perf: { emoji: "⚡", description: "性能优化" },
+    test: { emoji: "✅", description: "测试" },
+    build: { emoji: "📦", description: "构建/依赖" },
+    ci: { emoji: "👷", description: "CI/CD" },
+    chore: { emoji: "🔧", description: "杂项" },
+    revert: { emoji: "⏪", description: "回滚" },
+};
 // 解析命令行参数
 function parseArgs() {
     const args = process.argv.slice(2);
@@ -18,7 +35,7 @@ function parseArgs() {
     }
     if (!vaultPath) {
         console.error("错误: 请使用 --vault 参数指定 Obsidian 笔记库路径");
-        console.error("用法: node dist/index.js --vault \"/path/to/your/vault\"");
+        console.error('用法: node dist/index.js --vault "/path/to/your/vault"');
         process.exit(1);
     }
     return { vaultPath };
@@ -103,13 +120,15 @@ async function listFolder(folderPath = "") {
 // 获取笔记库结构
 async function getNoteStructure() {
     const rootContent = await listFolder("");
-    const structure = { _notes: rootContent.notes.map(n => n.name) };
+    const structure = {
+        _notes: rootContent.notes.map((n) => n.name),
+    };
     for (const folder of rootContent.folders) {
         try {
             const subContent = await listFolder(folder);
             structure[folder] = {
                 folders: subContent.folders,
-                notes: subContent.notes.map(n => n.name),
+                notes: subContent.notes.map((n) => n.name),
             };
         }
         catch {
@@ -130,11 +149,11 @@ async function createNote(notePath, content) {
         throw new Error(`笔记已存在: ${notePath}`);
     }
     catch (err) {
-        if (err.code !== 'ENOENT')
+        if (err.code !== "ENOENT")
             throw err;
     }
     // 写入文件
-    await fs.writeFile(fullPath, content, 'utf-8');
+    await fs.writeFile(fullPath, content, "utf-8");
     return `笔记创建成功: ${notePath}`;
 }
 // 更新笔记
@@ -148,7 +167,7 @@ async function updateNote(notePath, content) {
         throw new Error(`笔记不存在: ${notePath}`);
     }
     // 写入文件
-    await fs.writeFile(fullPath, content, 'utf-8');
+    await fs.writeFile(fullPath, content, "utf-8");
     return `笔记更新成功: ${notePath}`;
 }
 // 创建文件夹
@@ -165,7 +184,7 @@ async function createFolder(folderPath) {
         }
     }
     catch (err) {
-        if (err.code !== 'ENOENT')
+        if (err.code !== "ENOENT")
             throw err;
     }
     // 创建文件夹
@@ -350,6 +369,60 @@ created: 2024-12-26
 `;
     return guide;
 }
+// Git 相关函数
+async function execGit(command, cwd) {
+    try {
+        return await execAsync(`git ${command}`, { cwd: cwd || VAULT_PATH });
+    }
+    catch (error) {
+        throw new Error(`Git 命令执行失败: ${error.message}`);
+    }
+}
+// Git 提交
+async function gitCommit(type, description, files, cwd) {
+    const workDir = cwd || VAULT_PATH;
+    // 验证提交类型
+    if (!COMMIT_TYPES[type]) {
+        const validTypes = Object.entries(COMMIT_TYPES)
+            .map(([k, v]) => `${v.emoji} ${k}: ${v.description}`)
+            .join("\n");
+        throw new Error(`无效的提交类型: ${type}\n\n可用类型:\n${validTypes}`);
+    }
+    const { emoji } = COMMIT_TYPES[type];
+    const commitMessage = `${emoji} ${type}: ${description}`;
+    // 添加文件
+    if (files && files.length > 0) {
+        for (const file of files) {
+            await execGit(`add "${file}"`, workDir);
+        }
+    }
+    else {
+        // 添加所有更改
+        await execGit("add -A", workDir);
+    }
+    // 检查是否有待提交的更改
+    const { stdout: status } = await execGit("status --porcelain", workDir);
+    if (!status.trim()) {
+        return "没有需要提交的更改";
+    }
+    // 执行提交
+    await execGit(`commit -m "${commitMessage}"`, workDir);
+    return `提交成功: ${commitMessage}`;
+}
+// 获取 Git 状态
+async function gitStatus(cwd) {
+    const { stdout } = await execGit("status --short", cwd || VAULT_PATH);
+    if (!stdout.trim()) {
+        return "工作区干净，没有待提交的更改";
+    }
+    return stdout;
+}
+// 获取提交类型列表
+function getCommitTypes() {
+    return Object.entries(COMMIT_TYPES)
+        .map(([type, { emoji, description }]) => `${emoji} ${type}: ${description}`)
+        .join("\n");
+}
 // 全文搜索
 async function fullTextSearch(keyword) {
     const files = await glob("**/*.md", {
@@ -395,9 +468,15 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             inputSchema: {
                 type: "object",
                 properties: {
-                    query: { type: "string", description: "搜索关键词（匹配笔记名称和摘要）" },
+                    query: {
+                        type: "string",
+                        description: "搜索关键词（匹配笔记名称和摘要）",
+                    },
                     tag: { type: "string", description: "按标签过滤" },
-                    category: { type: "string", description: "按分类过滤（如 hardware, ai, backend 等）" },
+                    category: {
+                        type: "string",
+                        description: "按分类过滤（如 hardware, ai, backend 等）",
+                    },
                 },
             },
         },
@@ -407,7 +486,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "笔记的相对路径（如 知识点/03-硬件学习/STM32系列选型速查.md）" },
+                    path: {
+                        type: "string",
+                        description: "笔记的相对路径（如 知识点/03-硬件学习/STM32系列选型速查.md）",
+                    },
                 },
                 required: ["path"],
             },
@@ -418,7 +500,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             inputSchema: {
                 type: "object",
                 properties: {
-                    folder: { type: "string", description: "文件夹路径（留空则列出根目录）" },
+                    folder: {
+                        type: "string",
+                        description: "文件夹路径（留空则列出根目录）",
+                    },
                 },
             },
         },
@@ -444,8 +529,14 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "笔记的相对路径（如 知识点/04-人工智能/MCP/自己制作的MCP/新笔记.md）" },
-                    content: { type: "string", description: "笔记内容（支持 Markdown 和 Frontmatter）" },
+                    path: {
+                        type: "string",
+                        description: "笔记的相对路径（如 知识点/04-人工智能/MCP/自己制作的MCP/新笔记.md）",
+                    },
+                    content: {
+                        type: "string",
+                        description: "笔记内容（支持 Markdown 和 Frontmatter）",
+                    },
                 },
                 required: ["path", "content"],
             },
@@ -479,7 +570,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             inputSchema: {
                 type: "object",
                 properties: {
-                    path: { type: "string", description: "文件夹的相对路径（如 知识点/04-人工智能/MCP/新文件夹）" },
+                    path: {
+                        type: "string",
+                        description: "文件夹的相对路径（如 知识点/04-人工智能/MCP/新文件夹）",
+                    },
                 },
                 required: ["path"],
             },
@@ -492,6 +586,67 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
                 properties: {},
             },
         },
+        {
+            name: "git_commit",
+            description: "按照规范格式提交 Git 更改。格式: <emoji> <type>: <description>",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    type: {
+                        type: "string",
+                        description: "提交类型: feat(新功能), fix(Bug修复), docs(文档), style(格式), refactor(重构), perf(性能), test(测试), build(构建), ci(CI/CD), chore(杂项), revert(回滚)",
+                        enum: [
+                            "feat",
+                            "fix",
+                            "docs",
+                            "style",
+                            "refactor",
+                            "perf",
+                            "test",
+                            "build",
+                            "ci",
+                            "chore",
+                            "revert",
+                        ],
+                    },
+                    description: {
+                        type: "string",
+                        description: "提交描述（简洁明了，使用祈使语气）",
+                    },
+                    files: {
+                        type: "array",
+                        items: { type: "string" },
+                        description: "要提交的文件列表（可选，留空则提交所有更改）",
+                    },
+                    cwd: {
+                        type: "string",
+                        description: "工作目录（可选，默认为笔记库路径）",
+                    },
+                },
+                required: ["type", "description"],
+            },
+        },
+        {
+            name: "git_status",
+            description: "获取 Git 工作区状态",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    cwd: {
+                        type: "string",
+                        description: "工作目录（可选，默认为笔记库路径）",
+                    },
+                },
+            },
+        },
+        {
+            name: "git_commit_types",
+            description: "获取所有可用的 Git 提交类型及其说明",
+            inputSchema: {
+                type: "object",
+                properties: {},
+            },
+        },
     ],
 }));
 // 处理工具调用
@@ -559,6 +714,24 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     content: [{ type: "text", text: guide }],
                 };
             }
+            case "git_commit": {
+                const result = await gitCommit(args?.type, args?.description, args?.files, args?.cwd);
+                return {
+                    content: [{ type: "text", text: result }],
+                };
+            }
+            case "git_status": {
+                const status = await gitStatus(args?.cwd);
+                return {
+                    content: [{ type: "text", text: status }],
+                };
+            }
+            case "git_commit_types": {
+                const types = getCommitTypes();
+                return {
+                    content: [{ type: "text", text: types }],
+                };
+            }
             default:
                 throw new Error(`未知工具: ${name}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fromsko/obsidian-mcp-server",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "MCP server for Obsidian notes - search and read your Obsidian vault",
   "type": "module",
   "main": "dist/index.js",