agentsmesh 0.18.0 → 0.18.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.18.1
+
+### Patch Changes
+
+- d7e3a19: Internal refactor of the skill-import dispatch path and watch-test determinism — no user-visible behavior change.
+
+  **`agentsmesh import` (Cline / Windsurf / Codex CLI)**
+
+  The per-target `readdir → readFileSafe(SKILL.md) → try recognizer → fall back to skill import` loops, which had drifted independently and kept causing the same class of bug (lessons L132), are consolidated behind one shared orchestrator: `importSkillsDirectory(sourceSkillsDirs, options, recognizers)` plus `projectedAgentRecognizer({ canonicalAgentsDir })` and `commandSkillRecognizer({ canonicalCommandsDir })` factories. Each adapter now collapses to a config object plus a recognizer list. A minor side-effect of the consolidation: Cline now performs the same stale-skill-dir cleanup on re-import that Windsurf and Codex already did, so previously orphaned `.agentsmesh/skills/am-agent-<name>/` directories from buggy earlier runs are removed when a Cline projected-agent skill is re-imported.
+
+  **`agentsmesh watch`**
+
+  `runWatch` now accepts an optional `onCycle({ featuresChanged })` callback fired once per completed generate cycle (initial + each debounced regen). This is a deterministic synchronization signal for tests/integrations that previously relied on scraping `'Regenerated.'` log lines. The unrelated, dead `_suppressAgentsmeshDirUntil` parameter is removed from `shouldIgnoreWatchPath`. Watch-test budget bumped from 45s → 60s base (×1.5 under coverage = 90s) to survive full-suite scheduler load on macOS FSEvents.
+
+  **Developer tooling**
+
+  New `pnpm flake:watch` script (`scripts/flake-check-watch.ts`) runs the watch unit suite N times under `COVERAGE=1` to validate stability whenever the watch loop or scheduler envelope changes.
+
+  **Internal**
+  - New file: `src/targets/import/shared/skill-import-pipeline.ts` gains `importSkillsDirectory`, `projectedAgentRecognizer`, `commandSkillRecognizer`, `SkillRecognizer`, `SkillRecognizerContext` exports. The dead `SkillImportOptions.sourceSkillsDir` field is removed; `sourceSkillsDirs` is now a required first argument to the orchestrator.
+  - Adapter migrations: `cline/skills-adapter.ts`, `windsurf/skills-adapter.ts`, `codex-cli/skills-adapter.ts` reduced to thin wrappers. `cursor/skills-adapter.ts` and `copilot/skills-adapter.ts` shed the now-dead option field.
+  - 17 new unit tests; touched-scope branch coverage at 100% (25/25).
+  - `runWatch` adds `RunWatchOptions` + `WatchCycleInfo` types. The new third parameter is optional and backwards-compatible.
+
 ## 0.18.0
 
 ### Minor Changes

package/dist/canonical.js

@@ -5890,55 +5890,117 @@ async function findDirectorySkills(skillsDir) {
   }
   return skills;
 }
+async function importSkillsDirectory(sourceSkillsDirs, options, recognizers = []) {
+  for (const sourceDir of sourceSkillsDirs) {
+    const absSkillsDir = join(options.projectRoot, sourceDir);
+    const directorySkills = await findDirectorySkills(absSkillsDir);
+    if (directorySkills.size === 0) continue;
+    let importedAny = false;
+    for (const [skillName, skillDir] of directorySkills) {
+      const skillMdPath = join(skillDir, "SKILL.md");
+      const rawContent = await readFileSafe(skillMdPath);
+      if (rawContent === null) continue;
+      importedAny = true;
+      const { frontmatter, body: rawBody } = parseFrontmatter(rawContent);
+      const ctx = {
+        skillName,
+        skillDir,
+        skillMdPath,
+        rawContent,
+        frontmatter,
+        rawBody,
+        options
+      };
+      let handled = false;
+      for (const recognizer of recognizers) {
+        const claimed = await recognizer.recognize(ctx);
+        if (claimed) {
+          handled = true;
+          break;
+        }
+      }
+      if (!handled) {
+        await importDirectorySkill(skillName, skillDir, options);
+      }
+    }
+    if (importedAny) return;
+  }
+}
+function projectedAgentRecognizer(config) {
+  return {
+    async recognize(ctx) {
+      const projectedAgent = parseProjectedAgentSkillFrontmatter(ctx.frontmatter, ctx.skillName);
+      if (!projectedAgent) return false;
+      const { options } = ctx;
+      await removePathIfExists(
+        join(options.projectRoot, options.destCanonicalSkillsDir, ctx.skillName)
+      );
+      const destAgentsDir = join(options.projectRoot, config.canonicalAgentsDir);
+      await mkdirp(destAgentsDir);
+      const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
+      const normalizedBody = options.normalize(ctx.rawBody, ctx.skillMdPath, agentPath);
+      await writeFileAtomic(agentPath, serializeImportedAgent(projectedAgent, normalizedBody));
+      options.results.push({
+        fromTool: options.targetName,
+        fromPath: ctx.skillMdPath,
+        toPath: `${config.canonicalAgentsDir}/${projectedAgent.name}.md`,
+        feature: "agents"
+      });
+      return true;
+    }
+  };
+}
+function commandSkillRecognizer(config) {
+  return {
+    async recognize(ctx) {
+      const command = parseCommandSkillFrontmatter(ctx.frontmatter, ctx.skillName);
+      if (!command) return false;
+      const { options } = ctx;
+      await removePathIfExists(
+        join(options.projectRoot, options.destCanonicalSkillsDir, ctx.skillName)
+      );
+      const destCommandsDir = join(options.projectRoot, config.canonicalCommandsDir);
+      await mkdirp(destCommandsDir);
+      const commandPath = join(destCommandsDir, `${command.name}.md`);
+      const normalizedBody = options.normalize(ctx.rawBody, ctx.skillMdPath, commandPath);
+      await writeFileAtomic(commandPath, serializeImportedCommand(command, normalizedBody));
+      options.results.push({
+        fromTool: options.targetName,
+        fromPath: ctx.skillMdPath,
+        toPath: `${config.canonicalCommandsDir}/${command.name}.md`,
+        feature: "commands"
+      });
+      return true;
+    }
+  };
+}
 var init_skill_import_pipeline = __esm({
   "src/targets/import/shared/skill-import-pipeline.ts"() {
     init_fs();
     init_markdown();
     init_import_metadata();
     init_reserved();
+    init_projected_agent_skill();
+    init_command_skill();
+    init_scoped_agents_import();
   }
 });
+
+// src/targets/cline/skills-adapter.ts
 async function importClineSkills(projectRoot, results, normalize, skillsRelDir = CLINE_SKILLS_DIR) {
-  const skillsDir = join(projectRoot, skillsRelDir);
-  const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsRelDir,
     destCanonicalSkillsDir: CLINE_CANONICAL_SKILLS_DIR,
     targetName: "cline",
     normalize,
     results
   };
-  for (const [skillName, skillDir] of directorySkills) {
-    const skillMdPath = join(skillDir, "SKILL.md");
-    const content = await readFileSafe(skillMdPath);
-    if (!content) continue;
-    const rawParsed = parseFrontmatter(content);
-    const projectedAgent = parseProjectedAgentSkillFrontmatter(rawParsed.frontmatter, skillName);
-    if (projectedAgent) {
-      const destAgentsDir = join(projectRoot, CLINE_CANONICAL_AGENTS_DIR);
-      await mkdirp(destAgentsDir);
-      const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
-      await writeFileAtomic(
-        agentPath,
-        serializeImportedAgent(projectedAgent, normalize(rawParsed.body, skillMdPath, agentPath))
-      );
-      results.push({
-        fromTool: "cline",
-        fromPath: skillMdPath,
-        toPath: `${CLINE_CANONICAL_AGENTS_DIR}/${projectedAgent.name}.md`,
-        feature: "agents"
-      });
-      continue;
-    }
-    await importDirectorySkill(skillName, skillDir, options);
-  }
+  await importSkillsDirectory([skillsRelDir], options, [
+    projectedAgentRecognizer({ canonicalAgentsDir: CLINE_CANONICAL_AGENTS_DIR })
+  ]);
 }
 var init_skills_adapter = __esm({
   "src/targets/cline/skills-adapter.ts"() {
-    init_fs();
-    init_markdown();
-    init_projected_agent_skill();
     init_skill_import_pipeline();
     init_constants8();
   }
@@ -6601,82 +6663,23 @@ var init_mcp_helpers = __esm({
     init_constants28();
   }
 });
+
+// src/targets/codex-cli/skills-adapter.ts
 async function importSkills(projectRoot, results, normalize) {
   const options = {
     projectRoot,
-    sourceSkillsDir: CODEX_SKILLS_DIR,
     destCanonicalSkillsDir: CODEX_CANONICAL_SKILLS_DIR,
     targetName: CODEX_TARGET,
     normalize,
     results
   };
-  for (const skillsRoot of [CODEX_SKILLS_DIR, CODEX_SKILLS_FALLBACK_DIR]) {
-    const skillsDir = join(projectRoot, skillsRoot);
-    const entries = await readdir(skillsDir, {
-      encoding: "utf8",
-      withFileTypes: true
-    }).catch(() => null);
-    if (entries === null) continue;
-    let importedAny = false;
-    for (const ent of entries) {
-      if (!ent.isDirectory() && !ent.isSymbolicLink()) continue;
-      const skillPath = join(skillsDir, ent.name);
-      const skillMdPath = join(skillPath, "SKILL.md");
-      const skillMdContent = await readFileSafe(skillMdPath);
-      if (!skillMdContent) continue;
-      importedAny = true;
-      const skillName = ent.name;
-      const destSkillPath = join(projectRoot, CODEX_CANONICAL_SKILLS_DIR, skillName, "SKILL.md");
-      const normalized = normalize(skillMdContent, skillMdPath, destSkillPath);
-      const { frontmatter, body } = parseFrontmatter(normalized);
-      const command = parseCommandSkillFrontmatter(frontmatter, ent.name);
-      if (command) {
-        await removePathIfExists(join(projectRoot, CODEX_CANONICAL_SKILLS_DIR, skillName));
-        const destCommandsDir = join(projectRoot, CODEX_CANONICAL_COMMANDS_DIR);
-        await mkdirp(destCommandsDir);
-        const commandPath = join(destCommandsDir, `${command.name}.md`);
-        await writeFileAtomic(
-          commandPath,
-          serializeImportedCommand(command, normalize(body, skillMdPath, commandPath))
-        );
-        results.push({
-          fromTool: CODEX_TARGET,
-          fromPath: skillMdPath,
-          toPath: `${CODEX_CANONICAL_COMMANDS_DIR}/${command.name}.md`,
-          feature: "commands"
-        });
-        continue;
-      }
-      const projectedAgent = parseProjectedAgentSkillFrontmatter(frontmatter, ent.name);
-      if (projectedAgent) {
-        await removePathIfExists(join(projectRoot, CODEX_CANONICAL_SKILLS_DIR, skillName));
-        const destAgentsDir = join(projectRoot, CODEX_CANONICAL_AGENTS_DIR);
-        await mkdirp(destAgentsDir);
-        const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
-        await writeFileAtomic(
-          agentPath,
-          serializeImportedAgent(projectedAgent, normalize(body, skillMdPath, agentPath))
-        );
-        results.push({
-          fromTool: CODEX_TARGET,
-          fromPath: skillMdPath,
-          toPath: `${CODEX_CANONICAL_AGENTS_DIR}/${projectedAgent.name}.md`,
-          feature: "agents"
-        });
-        continue;
-      }
-      await importDirectorySkill(skillName, skillPath, options);
-    }
-    if (importedAny) return;
-  }
+  await importSkillsDirectory([CODEX_SKILLS_DIR, CODEX_SKILLS_FALLBACK_DIR], options, [
+    commandSkillRecognizer({ canonicalCommandsDir: CODEX_CANONICAL_COMMANDS_DIR }),
+    projectedAgentRecognizer({ canonicalAgentsDir: CODEX_CANONICAL_AGENTS_DIR })
+  ]);
 }
 var init_skills_adapter2 = __esm({
   "src/targets/codex-cli/skills-adapter.ts"() {
-    init_fs();
-    init_markdown();
-    init_command_skill();
-    init_projected_agent_skill();
-    init_scoped_agents_import();
     init_skill_import_pipeline();
     init_constants28();
   }
@@ -8030,7 +8033,6 @@ async function importSkills2(projectRoot, results, normalize, skillsDirRel = COP
   const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsDirRel,
     destCanonicalSkillsDir: COPILOT_CANONICAL_SKILLS_DIR,
     targetName: COPILOT_TARGET,
     normalize,
@@ -9549,7 +9551,6 @@ async function importSkills3(projectRoot, results, normalize, skillsRelDir = CUR
   const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsRelDir,
     destCanonicalSkillsDir: CURSOR_CANONICAL_SKILLS_DIR,
     targetName: "cursor",
     normalize,
@@ -16484,49 +16485,22 @@ var init_importer_workflows = __esm({
     init_constants31();
   }
 });
+
+// src/targets/windsurf/skills-adapter.ts
 async function importSkills4(projectRoot, results, normalize, skillsRelDir = WINDSURF_SKILLS_DIR) {
-  const skillsDir = join(projectRoot, skillsRelDir);
-  const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsRelDir,
     destCanonicalSkillsDir: WINDSURF_CANONICAL_SKILLS_DIR,
     targetName: "windsurf",
     normalize,
     results
   };
-  for (const [skillName, skillDir] of directorySkills) {
-    const skillMdPath = join(skillDir, "SKILL.md");
-    const content = await readFileSafe(skillMdPath);
-    if (!content) continue;
-    const rawParsed = parseFrontmatter(content);
-    const projectedAgent = parseProjectedAgentSkillFrontmatter(rawParsed.frontmatter, skillName);
-    if (projectedAgent) {
-      await removePathIfExists(join(projectRoot, WINDSURF_CANONICAL_SKILLS_DIR, skillName));
-      const destAgentsDir = join(projectRoot, WINDSURF_CANONICAL_AGENTS_DIR);
-      await mkdirp(destAgentsDir);
-      const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
-      await writeFileAtomic(
-        agentPath,
-        serializeImportedAgent(projectedAgent, normalize(rawParsed.body, skillMdPath, agentPath))
-      );
-      results.push({
-        fromTool: "windsurf",
-        fromPath: skillMdPath,
-        toPath: `${WINDSURF_CANONICAL_AGENTS_DIR}/${projectedAgent.name}.md`,
-        feature: "agents"
-      });
-      continue;
-    }
-    await importDirectorySkill(skillName, skillDir, options);
-  }
+  await importSkillsDirectory([skillsRelDir], options, [
+    projectedAgentRecognizer({ canonicalAgentsDir: WINDSURF_CANONICAL_AGENTS_DIR })
+  ]);
 }
 var init_skills_adapter5 = __esm({
   "src/targets/windsurf/skills-adapter.ts"() {
-    init_fs();
-    init_markdown();
-    init_projected_agent_skill();
-    init_scoped_agents_import();
     init_skill_import_pipeline();
     init_constants31();
   }