@yeaft/webchat-agent 1.0.84 → 1.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "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;
 }

package/yeaft/web-bridge.js

@@ -91,6 +91,10 @@ let sessionLoadPromise = null;
 
 let threadClassifier = defaultClassifyThread;
 
+function liveConfigRoot() {
+  return session?.config?.dir || ctx.CONFIG?.yeaftDir || session?.yeaftDir;
+}
+
 function applyLiveLanguage(language) {
   if (!language || typeof language !== 'string') return;
   if (session?.config && typeof session.config === 'object') {
@@ -105,7 +109,7 @@ function applyLiveLanguage(language) {
 function refreshLiveSessionConfig() {
   if (!session) return;
   try {
-    const freshConfig = loadConfig({ dir: session.yeaftDir || ctx.CONFIG?.yeaftDir });
+    const freshConfig = loadConfig({ dir: liveConfigRoot() });
     const freshModels = Array.isArray(freshConfig.availableModels) ? freshConfig.availableModels : [];
     session.config.availableModels = freshModels;
     if (freshConfig.language) {
@@ -317,6 +321,8 @@ const vpInboxes = new Map();
 const vpDrivers = new Map();
 /** @type {Map<string, import('./engine.js').Engine>} */
 const vpEngines = new Map();
+/** @type {Map<string, string>} */
+const vpEngineConfigKeys = new Map();
 /** @type {Map<string, AbortController>} */
 const vpAborts = new Map();
 
@@ -404,6 +410,17 @@ function threadKey(sessionId, vpId, threadId) {
   return `${sessionId}::${vpId}::${threadId || 'main'}`;
 }
 
+function engineConfigKey(config) {
+  return JSON.stringify({
+    model: config?.model || '',
+    primaryModel: config?.primaryModel || '',
+    modelEffort: config?.modelEffort || '',
+    fastModel: config?.fastModel || '',
+    fastModelId: config?.fastModelId || '',
+    fallbackModel: config?.fallbackModel || '',
+  });
+}
+
 function normalizeSessionWorkDir(workDir) {
   return typeof workDir === 'string' && workDir.trim() ? workDir.trim() : '';
 }
@@ -1192,7 +1209,7 @@ export function __testGroupHistory(sessionId) {
 
 export function __testResolveVpEffectiveConfig(sessionId) {
   if (!session) return null;
-  const sessionConfigRoot = ctx.CONFIG?.yeaftDir || session.yeaftDir;
+  const sessionConfigRoot = liveConfigRoot();
   return resolveSessionConfig(session.config, loadSessionConfig(sessionConfigRoot, sessionId));
 }
 
@@ -1296,17 +1313,23 @@ function isPermissionErrorMsg(msg) {
  */
 function getOrCreateVpEngine(sessionId, vpId, threadId = 'main') {
   const key = threadKey(sessionId, vpId, threadId);
-  let eng = vpEngines.get(key);
-  if (eng) return eng;
   if (!session) throw new Error('getOrCreateVpEngine: session not loaded');
   // Per-session config overlay (v1: model only). Falls back to the
   // session's user-level config when no override is set. Prefer the agent-local
   // config root: sessionConfigPath() resolves registered workDir-backed
   // sessions from there, while still allowing a later agent-local session in
   // the same bridge runtime to read its own override after a workDir-first boot.
-  const sessionConfigRoot = ctx.CONFIG?.yeaftDir || session.yeaftDir;
+  const sessionConfigRoot = liveConfigRoot();
   const groupCfg = loadSessionConfig(sessionConfigRoot, sessionId);
   const effectiveConfig = resolveSessionConfig(session.config, groupCfg);
+  const configKey = engineConfigKey(effectiveConfig);
+  let eng = vpEngines.get(key);
+  if (eng && vpEngineConfigKeys.get(key) === configKey) return eng;
+  if (eng) {
+    try { eng.abort?.('config_changed'); } catch { /* best-effort */ }
+    vpEngines.delete(key);
+    vpEngineConfigKeys.delete(key);
+  }
   eng = new Engine({
     adapter: session.adapter,
     trace: session.trace,
@@ -1342,6 +1365,7 @@ function getOrCreateVpEngine(sessionId, vpId, threadId = 'main') {
     }
   } catch { /* coordinator is best-effort plumbing, never block engine creation */ }
   vpEngines.set(key, eng);
+  vpEngineConfigKeys.set(key, configKey);
   return eng;
 }
 
@@ -1845,6 +1869,7 @@ export async function __testResetVpState() {
   vpInboxes.clear();
   vpDrivers.clear();
   vpEngines.clear();
+  vpEngineConfigKeys.clear();
   asyncTaskOwners.clear();
   vpAborts.clear();
   sessionContexts.clear();
@@ -2573,7 +2598,10 @@ export function handleYeaftUpdateSessionConfig(msg) {
     // Drop cached engines so the next VP turn rebuilds with the new model.
     const prefix = `${sessionId}::`;
     for (const k of Array.from(vpEngines.keys())) {
-      if (k.startsWith(prefix)) vpEngines.delete(k);
+      if (k.startsWith(prefix)) {
+        vpEngines.delete(k);
+        vpEngineConfigKeys.delete(k);
+      }
     }
     invalidateGroupContext(sessionId);
     sendSessionCrudResult({ op: 'update_config', requestId, ok: true, sessionId, config: savedConfig });
@@ -2630,7 +2658,10 @@ export function handleYeaftDeleteSession(msg) {
     invalidateGroupContext(sessionId);
     const prefix = `${sessionId}::`;
     for (const k of Array.from(vpEngines.keys())) {
-      if (k.startsWith(prefix)) vpEngines.delete(k);
+      if (k.startsWith(prefix)) {
+        vpEngines.delete(k);
+        vpEngineConfigKeys.delete(k);
+      }
     }
     sendSessionCrudResult({
       op: 'delete',
@@ -2675,7 +2706,10 @@ export function handleYeaftSessionRemoveMember(msg) {
     // added back they should start with fresh per-thread state.
     const removedPrefix = `${sessionId}::${vpId}::`;
     for (const key of Array.from(vpEngines.keys())) {
-      if (key.startsWith(removedPrefix)) vpEngines.delete(key);
+      if (key.startsWith(removedPrefix)) {
+        vpEngines.delete(key);
+        vpEngineConfigKeys.delete(key);
+      }
     }
     sendSessionCrudResult({ op: 'remove_member', requestId, ok: true, session: group });
     sendSessionRosterChanged(group);
@@ -5487,6 +5521,7 @@ export function handleYeaftModelSwitch(msg) {
   // Engines would otherwise keep the old effective config and drop newly
   // selected effort values until process restart.
   vpEngines.clear();
+  vpEngineConfigKeys.clear();
   asyncTaskOwners.clear();
 
   sendSessionEvent({
@@ -5843,6 +5878,7 @@ export async function resetYeaftSession() {
   vpInboxes.clear();
   vpDrivers.clear();
   vpEngines.clear();
+  vpEngineConfigKeys.clear();
   asyncTaskOwners.clear();
   sessionContexts.clear();
   vpCurrentTodos.clear();