npm - @openchamber/web - Versions diffs - 1.7.0 → 1.7.1 - Mend

@openchamber/web 1.7.0 → 1.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/assets/{ToolOutputDialog-B0blBQQ2.js → ToolOutputDialog-BltFD_Q9.js} +1 -1
package/dist/assets/index-9lSEGPDM.css +1 -0
package/dist/assets/{index-hNdAvOl1.js → index-CHfHzhF4.js} +2 -2
package/dist/assets/main-BV1LQs35.js +294 -0
package/dist/index.html +2 -2
package/package.json +1 -1
package/server/index.js +195 -22
package/server/lib/opencode-config.js +258 -68
package/server/lib/skills-catalog/clawdhub/install.js +20 -5
package/server/lib/skills-catalog/install.js +19 -5
package/dist/assets/index-DWAk1auj.css +0 -1
package/dist/assets/main-K9J17_P4.js +0 -288

package/dist/index.html CHANGED Viewed

@@ -203,10 +203,10 @@
         pointer-events: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-hNdAvOl1.js"></script>
+    <script type="module" crossorigin src="/assets/index-CHfHzhF4.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-Dd1DA83-.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor--DbVqbJpV.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-DWAk1auj.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-9lSEGPDM.css">
   </head>
   <body class="h-full bg-background text-foreground">
     <div id="root" class="h-full">

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@openchamber/web",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "private": false,
   "type": "module",
   "main": "./server/index.js",

package/server/index.js CHANGED Viewed

@@ -6893,6 +6893,133 @@ async function main(options = {}) {
     SKILL_DIR,
   } = await import('./lib/opencode-config.js');
+  const findWorktreeRootForSkills = (workingDirectory) => {
+    if (!workingDirectory) return null;
+    let current = path.resolve(workingDirectory);
+    while (true) {
+      if (fs.existsSync(path.join(current, '.git'))) {
+        return current;
+      }
+      const parent = path.dirname(current);
+      if (parent === current) {
+        return null;
+      }
+      current = parent;
+    }
+  };
+  const getSkillProjectAncestors = (workingDirectory) => {
+    if (!workingDirectory) return [];
+    const result = [];
+    let current = path.resolve(workingDirectory);
+    const stop = findWorktreeRootForSkills(workingDirectory) || current;
+    while (true) {
+      result.push(current);
+      if (current === stop) break;
+      const parent = path.dirname(current);
+      if (parent === current) break;
+      current = parent;
+    }
+    return result;
+  };
+  const isPathInside = (candidatePath, parentPath) => {
+    if (!candidatePath || !parentPath) return false;
+    const normalizedCandidate = path.resolve(candidatePath);
+    const normalizedParent = path.resolve(parentPath);
+    return normalizedCandidate === normalizedParent || normalizedCandidate.startsWith(`${normalizedParent}${path.sep}`);
+  };
+  const inferSkillScopeAndSourceFromPath = (skillPath, workingDirectory) => {
+    const resolvedPath = typeof skillPath === 'string' ? path.resolve(skillPath) : '';
+    const home = os.homedir();
+    const source = resolvedPath.includes(`${path.sep}.agents${path.sep}skills${path.sep}`)
+      ? 'agents'
+      : resolvedPath.includes(`${path.sep}.claude${path.sep}skills${path.sep}`)
+        ? 'claude'
+        : 'opencode';
+    const projectAncestors = getSkillProjectAncestors(workingDirectory);
+    const isProjectScoped = projectAncestors.some((ancestor) => {
+      const candidates = [
+        path.join(ancestor, '.opencode'),
+        path.join(ancestor, '.claude', 'skills'),
+        path.join(ancestor, '.agents', 'skills'),
+      ];
+      return candidates.some((candidate) => isPathInside(resolvedPath, candidate));
+    });
+    if (isProjectScoped) {
+      return { scope: SKILL_SCOPE.PROJECT, source };
+    }
+    const userRoots = [
+      path.join(home, '.config', 'opencode'),
+      path.join(home, '.opencode'),
+      path.join(home, '.claude', 'skills'),
+      path.join(home, '.agents', 'skills'),
+      process.env.OPENCODE_CONFIG_DIR ? path.resolve(process.env.OPENCODE_CONFIG_DIR) : null,
+    ].filter(Boolean);
+    if (userRoots.some((root) => isPathInside(resolvedPath, root))) {
+      return { scope: SKILL_SCOPE.USER, source };
+    }
+    return { scope: SKILL_SCOPE.USER, source };
+  };
+  const fetchOpenCodeDiscoveredSkills = async (workingDirectory) => {
+    if (!openCodePort) {
+      return null;
+    }
+    try {
+      const url = new URL(buildOpenCodeUrl('/skill', ''));
+      if (workingDirectory) {
+        url.searchParams.set('directory', workingDirectory);
+      }
+      const response = await fetch(url.toString(), {
+        method: 'GET',
+        headers: {
+          Accept: 'application/json',
+          ...getOpenCodeAuthHeaders(),
+        },
+        signal: AbortSignal.timeout(8_000),
+      });
+      if (!response.ok) {
+        return null;
+      }
+      const payload = await response.json();
+      if (!Array.isArray(payload)) {
+        return null;
+      }
+      return payload
+        .map((item) => {
+          const name = typeof item?.name === 'string' ? item.name.trim() : '';
+          const location = typeof item?.location === 'string' ? item.location : '';
+          const description = typeof item?.description === 'string' ? item.description : '';
+          if (!name || !location) {
+            return null;
+          }
+          const inferred = inferSkillScopeAndSourceFromPath(location, workingDirectory);
+          return {
+            name,
+            path: location,
+            scope: inferred.scope,
+            source: inferred.source,
+            description,
+          };
+        })
+        .filter(Boolean);
+    } catch {
+      return null;
+    }
+  };
   // List all discovered skills
   app.get('/api/config/skills', async (req, res) => {
     try {
@@ -6900,11 +7027,11 @@ async function main(options = {}) {
       if (!directory) {
         return res.status(400).json({ error });
       }
-      const skills = discoverSkills(directory);
+      const skills = (await fetchOpenCodeDiscoveredSkills(directory)) || discoverSkills(directory);
       // Enrich with full sources info
       const enrichedSkills = skills.map(skill => {
-        const sources = getSkillSources(skill.name, directory);
+        const sources = getSkillSources(skill.name, directory, skill);
         return {
           ...skill,
           sources
@@ -7018,7 +7145,9 @@ async function main(options = {}) {
         return res.status(404).json({ ok: false, error: { kind: 'invalidSource', message: 'Unknown source' } });
       }
-      const discovered = directory ? discoverSkills(directory) : [];
+      const discovered = directory
+        ? ((await fetchOpenCodeDiscoveredSkills(directory)) || discoverSkills(directory))
+        : [];
       const installedByName = new Map(discovered.map((s) => [s.name, s]));
       if (src.sourceType === 'clawdhub' || isClawdHubSource(src.source)) {
@@ -7033,7 +7162,7 @@ async function main(options = {}) {
             ...item,
             sourceId: src.id,
             installed: installed
-              ? { isInstalled: true, scope: installed.scope }
+              ? { isInstalled: true, scope: installed.scope, source: installed.source }
               : { isInstalled: false },
           };
         });
@@ -7077,7 +7206,7 @@ async function main(options = {}) {
           ...item,
           gitIdentityId: src.gitIdentityId,
           installed: installed
-            ? { isInstalled: true, scope: installed.scope }
+            ? { isInstalled: true, scope: installed.scope, source: installed.source }
             : { isInstalled: false },
         };
       });
@@ -7131,6 +7260,7 @@ async function main(options = {}) {
         subpath,
         gitIdentityId,
         scope,
+        targetSource,
         selections,
         conflictPolicy,
         conflictDecisions,
@@ -7152,6 +7282,7 @@ async function main(options = {}) {
       if (isClawdHubSource(source)) {
         const result = await installSkillsFromClawdHub({
           scope,
+          targetSource,
           workingDirectory,
           userSkillDir: SKILL_DIR,
           selections,
@@ -7166,7 +7297,22 @@ async function main(options = {}) {
           return res.status(400).json({ ok: false, error: result.error });
         }
-        return res.json({ ok: true, installed: result.installed || [], skipped: result.skipped || [] });
+        const installed = result.installed || [];
+        const skipped = result.skipped || [];
+        const requiresReload = installed.length > 0;
+        if (requiresReload) {
+          await refreshOpenCodeAfterConfigChange('skills install');
+        }
+        return res.json({
+          ok: true,
+          installed,
+          skipped,
+          requiresReload,
+          message: requiresReload ? 'Skills installed successfully. Reloading interface…' : 'No skills were installed',
+          reloadDelayMs: requiresReload ? CLIENT_RELOAD_DELAY_MS : undefined,
+        });
       }
       // Handle GitHub sources (git clone based)
@@ -7177,6 +7323,7 @@ async function main(options = {}) {
         subpath,
         identity,
         scope,
+        targetSource,
         workingDirectory,
         userSkillDir: SKILL_DIR,
         selections,
@@ -7202,7 +7349,22 @@ async function main(options = {}) {
         return res.status(400).json({ ok: false, error: result.error });
       }
-      res.json({ ok: true, installed: result.installed || [], skipped: result.skipped || [] });
+      const installed = result.installed || [];
+      const skipped = result.skipped || [];
+      const requiresReload = installed.length > 0;
+      if (requiresReload) {
+        await refreshOpenCodeAfterConfigChange('skills install');
+      }
+      res.json({
+        ok: true,
+        installed,
+        skipped,
+        requiresReload,
+        message: requiresReload ? 'Skills installed successfully. Reloading interface…' : 'No skills were installed',
+        reloadDelayMs: requiresReload ? CLIENT_RELOAD_DELAY_MS : undefined,
+      });
     } catch (error) {
       console.error('Failed to install skills:', error);
       res.status(500).json({ ok: false, error: { kind: 'unknown', message: error.message || 'Failed to install skills' } });
@@ -7217,7 +7379,9 @@ async function main(options = {}) {
       if (!directory) {
         return res.status(400).json({ error });
       }
-      const sources = getSkillSources(skillName, directory);
+      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(directory)) || [])
+        .find((skill) => skill.name === skillName) || null;
+      const sources = getSkillSources(skillName, directory, discoveredSkill);
       res.json({
         name: skillName,
@@ -7242,7 +7406,9 @@ async function main(options = {}) {
         return res.status(400).json({ error });
       }
-      const sources = getSkillSources(skillName, directory);
+        const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(directory)) || [])
+          .find((skill) => skill.name === skillName) || null;
+        const sources = getSkillSources(skillName, directory, discoveredSkill);
       if (!sources.md.exists || !sources.md.dir) {
         return res.status(404).json({ error: 'Skill not found' });
       }
@@ -7263,7 +7429,7 @@ async function main(options = {}) {
   app.post('/api/config/skills/:name', async (req, res) => {
     try {
       const skillName = req.params.name;
-      const { scope, ...config } = req.body;
+      const { scope, source: skillSource, ...config } = req.body;
       const { directory, error } = await resolveProjectDirectory(req);
       if (!directory) {
         return res.status(400).json({ error });
@@ -7272,13 +7438,14 @@ async function main(options = {}) {
       console.log('[Server] Creating skill:', skillName);
       console.log('[Server] Scope:', scope, 'Working directory:', directory);
-      createSkill(skillName, config, directory, scope);
-      // Skills are just files - OpenCode loads them on-demand, no restart needed
+      createSkill(skillName, { ...config, source: skillSource }, directory, scope);
+      await refreshOpenCodeAfterConfigChange('skill creation');
       res.json({
         success: true,
-        requiresReload: false,
-        message: `Skill ${skillName} created successfully`,
+        requiresReload: true,
+        message: `Skill ${skillName} created successfully. Reloading interface…`,
+        reloadDelayMs: CLIENT_RELOAD_DELAY_MS,
       });
     } catch (error) {
       console.error('Failed to create skill:', error);
@@ -7300,12 +7467,13 @@ async function main(options = {}) {
       console.log('[Server] Working directory:', directory);
       updateSkill(skillName, updates, directory);
-      // Skills are just files - OpenCode loads them on-demand, no restart needed
+      await refreshOpenCodeAfterConfigChange('skill update');
       res.json({
         success: true,
-        requiresReload: false,
-        message: `Skill ${skillName} updated successfully`,
+        requiresReload: true,
+        message: `Skill ${skillName} updated successfully. Reloading interface…`,
+        reloadDelayMs: CLIENT_RELOAD_DELAY_MS,
       });
     } catch (error) {
       console.error('[Server] Failed to update skill:', error);
@@ -7324,7 +7492,9 @@ async function main(options = {}) {
         return res.status(400).json({ error });
       }
-      const sources = getSkillSources(skillName, directory);
+      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(directory)) || [])
+        .find((skill) => skill.name === skillName) || null;
+      const sources = getSkillSources(skillName, directory, discoveredSkill);
       if (!sources.md.exists || !sources.md.dir) {
         return res.status(404).json({ error: 'Skill not found' });
       }
@@ -7351,7 +7521,9 @@ async function main(options = {}) {
         return res.status(400).json({ error });
       }
-      const sources = getSkillSources(skillName, directory);
+      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(directory)) || [])
+        .find((skill) => skill.name === skillName) || null;
+      const sources = getSkillSources(skillName, directory, discoveredSkill);
       if (!sources.md.exists || !sources.md.dir) {
         return res.status(404).json({ error: 'Skill not found' });
       }
@@ -7378,12 +7550,13 @@ async function main(options = {}) {
       }
       deleteSkill(skillName, directory);
-      // Skills are just files - OpenCode loads them on-demand, no restart needed
+      await refreshOpenCodeAfterConfigChange('skill deletion');
       res.json({
         success: true,
-        requiresReload: false,
-        message: `Skill ${skillName} deleted successfully`,
+        requiresReload: true,
+        message: `Skill ${skillName} deleted successfully. Reloading interface…`,
+        reloadDelayMs: CLIENT_RELOAD_DELAY_MS,
       });
     } catch (error) {
       console.error('Failed to delete skill:', error);