mnotes-cli 1.9.1 → 1.9.2

package/dist/commands/connect/__tests__/wizard.test.js

@@ -79,11 +79,11 @@ const DEFAULT_OPTS = {
         const skills = (0, skills_1.generateSkillTemplates)(DEFAULT_OPTS);
         (0, vitest_1.expect)(skills).toHaveLength(2);
     });
-    (0, vitest_1.it)("generates store and recall skills", () => {
+    (0, vitest_1.it)("generates store and recall skills as SKILL.md inside their own folder (AC-1)", () => {
         const skills = (0, skills_1.generateSkillTemplates)(DEFAULT_OPTS);
-        const filenames = skills.map((s) => s.filename);
-        (0, vitest_1.expect)(filenames).toContain("mnotes-store.md");
-        (0, vitest_1.expect)(filenames).toContain("mnotes-recall.md");
+        const paths = skills.map((s) => s.path);
+        (0, vitest_1.expect)(paths).toContain("mnotes-store/SKILL.md");
+        (0, vitest_1.expect)(paths).toContain("mnotes-recall/SKILL.md");
     });
     (0, vitest_1.it)("includes m-notes generated header (AC-8)", () => {
         const skills = (0, skills_1.generateSkillTemplates)(DEFAULT_OPTS);
@@ -97,12 +97,13 @@ const DEFAULT_OPTS = {
             (0, vitest_1.expect)(skill.content).toContain("ws-test-123");
         }
     });
-    (0, vitest_1.it)("includes frontmatter with name and trigger", () => {
+    (0, vitest_1.it)("includes frontmatter with name and description and omits non-standard fields", () => {
         const skills = (0, skills_1.generateSkillTemplates)(DEFAULT_OPTS);
         for (const skill of skills) {
             (0, vitest_1.expect)(skill.content).toContain("---");
             (0, vitest_1.expect)(skill.content).toContain("name:");
-            (0, vitest_1.expect)(skill.content).toContain("trigger:");
+            (0, vitest_1.expect)(skill.content).toContain("description:");
+            (0, vitest_1.expect)(skill.content).not.toMatch(/^trigger:/m);
         }
     });
 });
@@ -211,38 +212,38 @@ const DEFAULT_OPTS = {
     (0, vitest_1.afterEach)(() => {
         cleanTmpDir(tmpDir);
     });
-    (0, vitest_1.it)("creates skill files in .claude/skills/ (AC-4)", () => {
+    (0, vitest_1.it)("creates skill files as .claude/skills/<name>/SKILL.md (AC-4)", () => {
         const results = (0, wizard_1.scaffoldItems)(tmpDir, ["skills"], DEFAULT_OPTS);
         (0, vitest_1.expect)(results).toHaveLength(1);
         (0, vitest_1.expect)(results[0].item).toBe("skills");
         (0, vitest_1.expect)(results[0].filesWritten.length).toBeGreaterThan(0);
         const skillsDir = path.join(tmpDir, ".claude", "skills");
-        (0, vitest_1.expect)(fs.existsSync(path.join(skillsDir, "mnotes-store.md"))).toBe(true);
-        (0, vitest_1.expect)(fs.existsSync(path.join(skillsDir, "mnotes-recall.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(skillsDir, "mnotes-store", "SKILL.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(skillsDir, "mnotes-recall", "SKILL.md"))).toBe(true);
     });
     (0, vitest_1.it)("generated skill files include header (AC-8)", () => {
         (0, wizard_1.scaffoldItems)(tmpDir, ["skills"], DEFAULT_OPTS);
-        const storeContent = fs.readFileSync(path.join(tmpDir, ".claude", "skills", "mnotes-store.md"), "utf-8");
+        const storeContent = fs.readFileSync(path.join(tmpDir, ".claude", "skills", "mnotes-store", "SKILL.md"), "utf-8");
         (0, vitest_1.expect)(storeContent).toContain("Generated by m-notes CLI");
     });
     (0, vitest_1.it)("preserves user-created skill files (AC-5)", () => {
-        const skillsDir = path.join(tmpDir, ".claude", "skills");
-        fs.mkdirSync(skillsDir, { recursive: true });
-        // Write a user-created file with the same name
-        fs.writeFileSync(path.join(skillsDir, "mnotes-store.md"), "# My custom store skill\nCustom content here", "utf-8");
-        const results = (0, wizard_1.scaffoldItems)(tmpDir, ["skills"], DEFAULT_OPTS);
+        const storeDir = path.join(tmpDir, ".claude", "skills", "mnotes-store");
+        fs.mkdirSync(storeDir, { recursive: true });
+        // Write a user-created file at the same path
+        fs.writeFileSync(path.join(storeDir, "SKILL.md"), "# My custom store skill\nCustom content here", "utf-8");
+        (0, wizard_1.scaffoldItems)(tmpDir, ["skills"], DEFAULT_OPTS);
         // The user file should be preserved
-        const content = fs.readFileSync(path.join(skillsDir, "mnotes-store.md"), "utf-8");
+        const content = fs.readFileSync(path.join(storeDir, "SKILL.md"), "utf-8");
         (0, vitest_1.expect)(content).toContain("My custom store skill");
         (0, vitest_1.expect)(content).not.toContain("Generated by m-notes CLI");
         // The recall skill should still be written (new file)
-        (0, vitest_1.expect)(fs.existsSync(path.join(skillsDir, "mnotes-recall.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-recall", "SKILL.md"))).toBe(true);
     });
     (0, vitest_1.it)("overwrites m-notes generated skill files on re-run (AC-5)", () => {
         (0, wizard_1.scaffoldItems)(tmpDir, ["skills"], DEFAULT_OPTS);
         // Re-run with different workspaceId
         (0, wizard_1.scaffoldItems)(tmpDir, ["skills"], { url: "http://new-url.com", workspaceId: "ws-new" });
-        const content = fs.readFileSync(path.join(tmpDir, ".claude", "skills", "mnotes-store.md"), "utf-8");
+        const content = fs.readFileSync(path.join(tmpDir, ".claude", "skills", "mnotes-store", "SKILL.md"), "utf-8");
         (0, vitest_1.expect)(content).toContain("ws-new");
     });
 });
@@ -298,8 +299,8 @@ const DEFAULT_OPTS = {
         (0, vitest_1.expect)(items).toContain("agents");
         // Verify files exist
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "settings.json"))).toBe(true);
-        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-store.md"))).toBe(true);
-        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-recall.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-store", "SKILL.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-recall", "SKILL.md"))).toBe(true);
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "agents", "knowledge-manager.md"))).toBe(true);
     });
     (0, vitest_1.it)("scaffolds partial selection", () => {
@@ -386,8 +387,8 @@ const DEFAULT_OPTS = {
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, "CLAUDE.md"))).toBe(true);
         // All extras should exist
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "settings.json"))).toBe(true);
-        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-store.md"))).toBe(true);
-        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-recall.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-store", "SKILL.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-recall", "SKILL.md"))).toBe(true);
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "agents", "knowledge-manager.md"))).toBe(true);
         // Output should mention extras
         (0, vitest_1.expect)(output).toContain("Extras installed:");
@@ -465,7 +466,7 @@ const DEFAULT_OPTS = {
         }
         // All extras should exist
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "settings.json"))).toBe(true);
-        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-store.md"))).toBe(true);
+        (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "skills", "mnotes-store", "SKILL.md"))).toBe(true);
         (0, vitest_1.expect)(fs.existsSync(path.join(tmpDir, ".claude", "agents", "knowledge-manager.md"))).toBe(true);
     });
 });

package/dist/commands/connect/wizard.js

@@ -170,8 +170,9 @@ function scaffoldSkills(dir, opts) {
     const skills = (0, index_1.generateSkillTemplates)(opts);
     const filesWritten = [];
     for (const skill of skills) {
-        const filePath = path.join(skillsDir, skill.filename);
+        const filePath = path.join(skillsDir, skill.path);
         if (shouldWriteGeneratedFile(filePath)) {
+            fs.mkdirSync(path.dirname(filePath), { recursive: true });
             fs.writeFileSync(filePath, skill.content, "utf-8");
             filesWritten.push(filePath);
         }

package/dist/templates/claude-code/skills.d.ts

@@ -1,6 +1,7 @@
 /**
  * Templates for Claude Code skills.
- * Written to `.claude/skills/` as markdown files.
+ * Written to `.claude/skills/<skill-name>/SKILL.md` — Claude Code's skill loader
+ * only discovers skills that live in their own folder as `SKILL.md`.
  * Generated by m-notes CLI — do not edit manually.
  */
 export interface SkillTemplateOpts {
@@ -8,11 +9,14 @@ export interface SkillTemplateOpts {
     workspaceId: string;
 }
 export interface SkillFile {
-    filename: string;
+    /** Relative path within `.claude/skills/`, e.g. `mnotes-store/SKILL.md`. */
+    path: string;
     content: string;
 }
 /**
  * Generates skill files for m-notes integration.
- * Returns an array of { filename, content } pairs.
+ * Returns an array of { path, content } pairs. `path` is relative to
+ * `.claude/skills/` and always ends in `SKILL.md` so Claude Code's loader
+ * discovers the skill.
  */
 export declare function generateSkillTemplates(opts: SkillTemplateOpts): SkillFile[];

package/dist/templates/claude-code/skills.js

@@ -1,7 +1,8 @@
 "use strict";
 /**
  * Templates for Claude Code skills.
- * Written to `.claude/skills/` as markdown files.
+ * Written to `.claude/skills/<skill-name>/SKILL.md` — Claude Code's skill loader
+ * only discovers skills that live in their own folder as `SKILL.md`.
  * Generated by m-notes CLI — do not edit manually.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -9,17 +10,18 @@ exports.generateSkillTemplates = generateSkillTemplates;
 const GENERATED_HEADER = "<!-- Generated by m-notes CLI. Do not edit manually. -->";
 /**
  * Generates skill files for m-notes integration.
- * Returns an array of { filename, content } pairs.
+ * Returns an array of { path, content } pairs. `path` is relative to
+ * `.claude/skills/` and always ends in `SKILL.md` so Claude Code's loader
+ * discovers the skill.
  */
 function generateSkillTemplates(opts) {
     return [
         {
-            filename: "mnotes-store.md",
+            path: "mnotes-store/SKILL.md",
             content: `${GENERATED_HEADER}
 ---
 name: mnotes-store
-description: Store a knowledge entry in m-notes
-trigger: When the user says /store or asks to save/store knowledge, decisions, patterns, or context
+description: Store a knowledge entry in m-notes. Use when the user says /store or asks to save/store knowledge, decisions, patterns, or context.
 ---
 
 # Store Knowledge in m-notes
@@ -44,12 +46,11 @@ Use the \`knowledge_store\` MCP tool to save knowledge.
 `,
         },
         {
-            filename: "mnotes-recall.md",
+            path: "mnotes-recall/SKILL.md",
             content: `${GENERATED_HEADER}
 ---
 name: mnotes-recall
-description: Recall knowledge from m-notes using semantic search
-trigger: When the user says /recall or asks to find/recall/search knowledge, or needs context about a topic
+description: Recall knowledge from m-notes using semantic search. Use when the user says /recall or asks to find/recall/search knowledge, or needs context about a topic.
 ---
 
 # Recall Knowledge from m-notes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnotes-cli",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "CLI for m-notes AI knowledge base — manage notes, search, and CRUD from the terminal",
   "bin": {
     "mnotes": "./dist/index.js"