@yeaft/webchat-agent 1.0.85 → 1.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.85",
+  "version": "1.0.87",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/skills.js

@@ -31,20 +31,23 @@
  *   tier 1 (bundled): wherever yeaft-skills is installed on disk — typically
  *           ~/.claude/skills/yeaft-skills/skills/. Read-only — `save()` and
  *           `remove()` never target this tier.
- *   tier 2 (user-claude): ~/.claude/skills. User-level Claude Code assets,
- *           loaded read-only for cross-tool compatibility.
- *   tier 3 (user-codex): ~/.codex/skills. User-level Codex assets, loaded
- *           read-only for cross-tool compatibility.
- *   tier 4 (user):    <yeaftDir>/skills (e.g. ~/.yeaft/skills). User edits
+ *   tier 2 (user):    <yeaftDir>/skills (e.g. ~/.yeaft/skills). User edits
  *           land here. `save()` writes here. `init.js` seeds it from tier 1
- *           on first boot so users start with the full bundled set.
- *   tier 5 (project-claude): <workDir>/.claude/skills (if provided). Claude
+ *           on first boot so users start with the bundled Yeaft skills.
+ *
+ *   Note: user-level Claude/Codex skill roots (`~/.claude/skills`,
+ *   `~/.codex/skills`) are intentionally NOT scanned as default Yeaft skills.
+ *   They may contain unrelated plugins such as `trade` or
+ *   `yeaft-skills-write`. Yeaft borrows only the explicit bundled
+ *   `yeaft-skills` package plus project-local skill roots below.
+ *
+ *   tier 3 (project-claude): <workDir>/.claude/skills (if provided). Claude
  *           Code project assets, loaded so a Claude-Code-integrated project
  *           works out of the box. Higher than user (project-local beats
  *           user-global), lower than the yeaft-native project tier.
- *   tier 6 (project-codex): <workDir>/.agents/skills (if provided). Codex
+ *   tier 4 (project-codex): <workDir>/.agents/skills (if provided). Codex
  *           project assets, loaded with the same project-local precedence.
- *   tier 7 (project): <workDir>/.yeaft/skills (if provided). Highest
+ *   tier 5 (project): <workDir>/.yeaft/skills (if provided). Highest
  *           priority — a project can pin a skill version without affecting
  *           the user's other projects, and overrides a borrowed
  *           `.claude/skills` / `.agents/skills` skill of the same name.
@@ -732,17 +735,15 @@ export class SkillManager {
  * Tier order (lowest → highest priority):
  *   1. bundled        — the yeaft-skills package on disk, located via
  *      `bundledYeaftSkillsDir()` (typically ~/.claude/skills/yeaft-skills/skills/).
- *   2. user-claude    — `~/.claude/skills`, read-only borrowed Claude Code assets.
- *   3. user-codex     — `~/.codex/skills`, read-only borrowed Codex assets.
- *   4. user           — `<yeaftDir>/skills` (e.g. ~/.yeaft/skills). User edits + saves.
- *   5. project-claude — `<workDir>/.claude/skills` when a workDir is provided.
+ *   2. user           — `<yeaftDir>/skills` (e.g. ~/.yeaft/skills). User edits + saves.
+ *   3. project-claude — `<workDir>/.claude/skills` when a workDir is provided.
  *      Claude Code project assets, loaded so a project that integrates Claude
  *      Code works out of the box. Ranks above `user` (project-local beats
  *      user-global) but below the yeaft-native project tier.
- *   6. project-codex  — `<workDir>/.agents/skills` when a workDir is provided.
+ *   4. project-codex  — `<workDir>/.agents/skills` when a workDir is provided.
  *      Codex project assets, loaded so Codex-integrated repositories work out
  *      of the box. Same precedence band as project Claude Code assets.
- *   7. project        — `<workDir>/.yeaft/skills` when a workDir is provided.
+ *   5. project        — `<workDir>/.yeaft/skills` when a workDir is provided.
  *      Highest priority: a yeaft-native skill pinned in the project overrides
  *      a borrowed `.claude/skills` / `.agents/skills` skill of the same name.
  *
@@ -754,9 +755,6 @@ export class SkillManager {
  */
 export function createSkillManager(yeaftDir, workDir) {
   const bundled = bundledYeaftSkillsDir();
-  const home = homedir();
-  const claudeUserDir = home ? join(home, '.claude', 'skills') : null;
-  const codexUserDir = home ? join(home, '.codex', 'skills') : null;
   const userDir = join(yeaftDir, 'skills');
   const projectRoots = [...new Set(String(workDir || '')
     .split(delimiter)
@@ -766,24 +764,15 @@ export function createSkillManager(yeaftDir, workDir) {
   const codexProjectDirs = projectRoots.map(root => join(root, '.agents', 'skills'));
   const projectDirs = projectRoots.map(root => join(root, '.yeaft', 'skills'));
 
-  const dirs = [bundled, claudeUserDir, codexUserDir, userDir, ...claudeProjectDirs, ...codexProjectDirs, ...projectDirs].filter(Boolean);
+  const dirs = [bundled, userDir, ...claudeProjectDirs, ...codexProjectDirs, ...projectDirs].filter(Boolean);
   const tierByDir = {};
   if (bundled) tierByDir[bundled] = 'bundled';
-  if (claudeUserDir) tierByDir[claudeUserDir] = 'user-claude';
-  if (codexUserDir) tierByDir[codexUserDir] = 'user-codex';
   tierByDir[userDir] = 'user';
   for (const dir of claudeProjectDirs) tierByDir[dir] = 'project-claude';
   for (const dir of codexProjectDirs) tierByDir[dir] = 'project-codex';
   for (const dir of projectDirs) tierByDir[dir] = 'project';
 
-  const ignorePathsByDir = {};
-  if (claudeUserDir && bundled && pathIsInside(bundled, claudeUserDir)) {
-    // Borrowed ~/.claude/skills must not recurse into the Yeaft bundled plugin
-    // package; bundled skills have their own lower-priority tier/provenance.
-    ignorePathsByDir[claudeUserDir] = [join(claudeUserDir, 'yeaft-skills')];
-  }
-
-  const manager = new SkillManager(dirs, { userDir, tierByDir, ignorePathsByDir });
+  const manager = new SkillManager(dirs, { userDir, tierByDir });
   manager.load();
   return manager;
 }