ccpanel 0.1.2 → 0.1.3

package/dist/{chunk-7ROXP6AO.js → chunk-SZFZF7CH.js}

@@ -50,6 +50,27 @@ var ConfigStore = class {
   }
 };
 
+// src/core/errors.ts
+import { stat } from "fs/promises";
+var ConflictError = class extends Error {
+  constructor(message = "\u6587\u4EF6\u5DF2\u88AB\u5916\u90E8\u4FEE\u6539\uFF0C\u8BF7\u91CD\u65B0\u52A0\u8F7D\u540E\u518D\u4FDD\u5B58") {
+    super(message);
+    this.name = "ConflictError";
+  }
+};
+async function currentMtime(file) {
+  try {
+    return (await stat(file)).mtimeMs;
+  } catch (err) {
+    if (err.code === "ENOENT") return null;
+    throw err;
+  }
+}
+async function assertNoConflict(file, baseMtime) {
+  if (baseMtime === void 0) return;
+  if (await currentMtime(file) !== baseMtime) throw new ConflictError();
+}
+
 // src/server/routes/mcp.ts
 import { Hono } from "hono";
 
@@ -110,10 +131,20 @@ var McpServerInputSchema = z.intersection(
   McpServerSchema
 );
 var SkillFrontmatterSchema = z.object({ name: z.string().min(1), description: z.string().min(1) }).passthrough();
-var SkillFileWriteSchema = z.object({ content: z.string() });
-var MemoryWriteSchema = z.object({ content: z.string() });
+var BaseMtimeSchema = z.number().nullable().optional();
+var SkillFileWriteSchema = z.object({
+  content: z.string(),
+  baseMtime: BaseMtimeSchema
+});
+var MemoryWriteSchema = z.object({
+  content: z.string(),
+  baseMtime: BaseMtimeSchema
+});
 var ConfigFileIdSchema = z.enum(["settings", "claude-json"]);
-var ConfigFileWriteSchema = z.object({ content: z.string() });
+var ConfigFileWriteSchema = z.object({
+  content: z.string(),
+  baseMtime: BaseMtimeSchema
+});
 var ScopeQuerySchema = z.object({
   scope: ScopeSchema,
   projectPath: z.string().optional()
@@ -205,13 +236,14 @@ function skillRoutes(deps) {
   });
   app.put("/:name/files/:filePath{.+}", async (c) => {
     const { q, paths } = ctx(c);
-    const { content } = SkillFileWriteSchema.parse(await c.req.json());
+    const { content, baseMtime } = SkillFileWriteSchema.parse(await c.req.json());
     await deps.skills.writeFileRaw(
       paths,
       q.scope,
       c.req.param("name"),
       c.req.param("filePath"),
-      content
+      content,
+      baseMtime
     );
     return c.json({ ok: true });
   });
@@ -275,8 +307,8 @@ function memoryRoutes(deps) {
   });
   app.put("/", async (c) => {
     const { q, paths } = ctx(c);
-    const { content } = MemoryWriteSchema.parse(await c.req.json());
-    await deps.memory.write(paths, q.scope, content);
+    const { content, baseMtime } = MemoryWriteSchema.parse(await c.req.json());
+    await deps.memory.write(paths, q.scope, content, baseMtime);
     return c.json({ ok: true });
   });
   return app;
@@ -380,8 +412,8 @@ function configFileRoutes(deps) {
   });
   app.put("/:file", async (c) => {
     const { fileId, q, paths } = ctx(c);
-    const { content } = ConfigFileWriteSchema.parse(await c.req.json());
-    await deps.configFiles.write(paths, fileId, q.scope, content);
+    const { content, baseMtime } = ConfigFileWriteSchema.parse(await c.req.json());
+    await deps.configFiles.write(paths, fileId, q.scope, content, baseMtime);
     return c.json({ ok: true });
   });
   return app;
@@ -391,7 +423,10 @@ function configFileRoutes(deps) {
 import { Hono as Hono9 } from "hono";
 import { z as z7 } from "zod";
 var CreateSchema = z7.object({ name: z7.string().min(1), content: z7.string() });
-var WriteSchema = z7.object({ content: z7.string() });
+var WriteSchema = z7.object({
+  content: z7.string(),
+  baseMtime: z7.number().nullable().optional()
+});
 function agentCommandRoutes(deps, kind) {
   const app = new Hono9();
   const ctx = (c) => {
@@ -417,8 +452,8 @@ function agentCommandRoutes(deps, kind) {
   });
   app.put("/:name", async (c) => {
     const { q, paths } = ctx(c);
-    const { content } = WriteSchema.parse(await c.req.json());
-    await deps.agentCommands.write(paths, kind, q.scope, c.req.param("name"), content);
+    const { content, baseMtime } = WriteSchema.parse(await c.req.json());
+    await deps.agentCommands.write(paths, kind, q.scope, c.req.param("name"), content, baseMtime);
     return c.json({ ok: true });
   });
   app.delete("/:name", async (c) => {
@@ -442,6 +477,9 @@ function createApp(deps) {
     if (err instanceof InvalidJsonError) {
       return c.json({ error: err.message }, 400);
     }
+    if (err instanceof ConflictError) {
+      return c.json({ error: err.message, code: "conflict" }, 409);
+    }
     return c.json({ error: err.message }, 500);
   });
   app.route("/api/mcp", mcpRoutes(deps));
@@ -461,6 +499,8 @@ function createApp(deps) {
 export {
   InvalidJsonError,
   ConfigStore,
+  currentMtime,
+  assertNoConflict,
   SkillFrontmatterSchema,
   createApp
 };

package/dist/cli.js

@@ -3,8 +3,10 @@ import {
   ConfigStore,
   InvalidJsonError,
   SkillFrontmatterSchema,
-  createApp
-} from "./chunk-7ROXP6AO.js";
+  assertNoConflict,
+  createApp,
+  currentMtime
+} from "./chunk-SZFZF7CH.js";
 
 // src/cli.ts
 import { homedir, networkInterfaces } from "os";
@@ -196,17 +198,19 @@ var SkillService = class {
           continue;
         }
       }
+      const mtime = await currentMtime(join(path, "SKILL.md")) ?? await currentMtime(path) ?? 0;
       try {
         const raw = await readFile(join(path, "SKILL.md"), "utf8");
         const fm = SkillFrontmatterSchema.parse(matter(raw).data);
-        out.push({ name: e.name, description: fm.description, enabled, path, linkTarget });
+        out.push({ name: e.name, description: fm.description, enabled, path, linkTarget, mtime });
       } catch {
         out.push({
           name: e.name,
           description: "(SKILL.md \u7F3A\u5931\u6216\u65E0\u6548)",
           enabled,
           path,
-          linkTarget
+          linkTarget,
+          mtime
         });
       }
     }
@@ -284,11 +288,12 @@ var SkillService = class {
     const full = this.resolveWithin(root, relPath);
     const buf = await readFile(full);
     if (isBinary(buf)) throw new Error(`\u4E8C\u8FDB\u5236\u6587\u4EF6\u65E0\u6CD5\u7F16\u8F91\uFF1A${relPath}`);
-    return { content: buf.toString("utf8") };
+    return { content: buf.toString("utf8"), mtime: await currentMtime(full) };
   }
-  async writeFileRaw(paths, scope, name, relPath, content) {
+  async writeFileRaw(paths, scope, name, relPath, content, baseMtime) {
     const root = await this.resolveSkillDir(paths, scope, name);
     const full = this.resolveWithin(root, relPath);
+    await assertNoConflict(full, baseMtime);
     await mkdir(dirname(full), { recursive: true });
     await writeFile(full, content, "utf8");
   }
@@ -376,17 +381,20 @@ var MemoryService = class {
     if (!f) throw new Error("\u7F3A\u5C11\u9879\u76EE CLAUDE.md \u8DEF\u5F84");
     return f;
   }
-  // 文件不存在视为「尚未创建」，返回空串。
+  // 文件不存在视为「尚未创建」，返回空串与 null mtime。
   async read(paths, scope) {
+    const f = this.file(paths, scope);
     try {
-      return { content: await readFile2(this.file(paths, scope), "utf8") };
+      return { content: await readFile2(f, "utf8"), mtime: await currentMtime(f) };
     } catch (err) {
-      if (err.code === "ENOENT") return { content: "" };
+      if (err.code === "ENOENT")
+        return { content: "", mtime: null };
       throw err;
     }
   }
-  async write(paths, scope, content) {
+  async write(paths, scope, content, baseMtime) {
     const f = this.file(paths, scope);
+    await assertNoConflict(f, baseMtime);
     await mkdir2(dirname2(f), { recursive: true });
     await writeFile2(f, content, "utf8");
   }
@@ -920,17 +928,19 @@ var ConfigFileService = class {
     }
     return f;
   }
-  // 文件不存在视为「尚未创建」，返回空串（与 MemoryService 一致）。
+  // 文件不存在视为「尚未创建」，返回空串与 null mtime（与 MemoryService 一致）。
   async read(paths, fileId, scope) {
+    const file = this.file(paths, fileId, scope);
     try {
-      return { content: await readFile6(this.file(paths, fileId, scope), "utf8") };
+      return { content: await readFile6(file, "utf8"), mtime: await currentMtime(file) };
     } catch (err) {
-      if (err.code === "ENOENT") return { content: "" };
+      if (err.code === "ENOENT")
+        return { content: "", mtime: null };
       throw err;
     }
   }
   // 校验合法 JSON 后整文件写回；非法内容抛 InvalidJsonError，不触碰磁盘原文件。
-  async write(paths, fileId, scope, content) {
+  async write(paths, fileId, scope, content, baseMtime) {
     const file = this.file(paths, fileId, scope);
     let parsed;
     try {
@@ -938,6 +948,7 @@ var ConfigFileService = class {
     } catch {
       throw new InvalidJsonError();
     }
+    await assertNoConflict(file, baseMtime);
     await this.store.writeJson(file, parsed);
   }
 };
@@ -989,13 +1000,14 @@ var AgentCommandService = class {
   async read(paths, kind, scope, name) {
     const file = this.fileFor(paths, kind, scope, name);
     try {
-      return { content: await readFile7(file, "utf8") };
+      return { content: await readFile7(file, "utf8"), mtime: await currentMtime(file) };
     } catch {
       throw new Error(`\u672A\u627E\u5230 ${kind}\u300C${name}\u300D\uFF08scope: ${scope}\uFF09`);
     }
   }
-  async write(paths, kind, scope, name, content) {
+  async write(paths, kind, scope, name, content, baseMtime) {
     const file = this.fileFor(paths, kind, scope, name);
+    await assertNoConflict(file, baseMtime);
     await mkdir3(dirname3(file), { recursive: true });
     await writeFile3(file, content, "utf8");
   }

package/dist/server/app.js

@@ -1,6 +1,6 @@
 import {
   createApp
-} from "../chunk-7ROXP6AO.js";
+} from "../chunk-SZFZF7CH.js";
 export {
   createApp
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccpanel",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "本地图形化管理 Claude Code 配置：MCP、Skills、子 Agent、Commands、配置文件、Memory、Sessions、Plugins",
   "type": "module",
   "repository": { "type": "git", "url": "git+https://gitee.com/jerry123456789099/ccpanel.git" },
@@ -9,6 +9,7 @@
   "bin": { "ccpanel": "dist/cli.js" },
   "files": ["dist", "web/dist"],
   "engines": { "node": ">=20" },
+  "publishConfig": { "registry": "https://registry.npmjs.org/" },
   "scripts": {
     "test": "vitest run",
     "test:watch": "vitest",