@openchamber/web 1.5.4 → 1.5.5

package/dist/index.html

@@ -191,7 +191,7 @@
         pointer-events: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-X4_48EOB.js"></script>
+    <script type="module" crossorigin src="/assets/index-DCvGkY6V.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-BrcdMJ39.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor--Jn2c0Clh.css">
     <link rel="stylesheet" crossorigin href="/assets/index-DMDb0aQz.css">

package/dist/sw.js

@@ -1 +1 @@
-(function(){"use strict";self.addEventListener("install",t=>{t.waitUntil(self.skipWaiting())}),self.addEventListener("activate",t=>{t.waitUntil(self.clients.claim())}),self.addEventListener("push",t=>{const i=t.data?.json()??null;if(!i)return;const n=i.title||"OpenChamber",a=i.body??"",o=i.icon??"/apple-touch-icon-180x180.png",s=i.badge??"/favicon-32.png";t.waitUntil(self.registration.showNotification(n,{body:a,icon:o,badge:s,tag:i.tag,data:i.data}))}),self.addEventListener("notificationclick",t=>{t.notification.close();const n=(t.notification.data??null)?.url??"/";t.waitUntil(self.clients.openWindow(n))})})();
+(function(){"use strict";self.addEventListener("install",t=>{t.waitUntil(self.skipWaiting())}),self.addEventListener("activate",t=>{t.waitUntil(self.clients.claim())}),self.addEventListener("push",t=>{t.waitUntil((async()=>{const i=t.data?.json()??null;if(!i||(await self.clients.matchAll({type:"window",includeUncontrolled:!0})).some(a=>a.visibilityState==="visible"||a.focused))return;const e=i.title||"OpenChamber",s=i.body??"",l=i.icon??"/apple-touch-icon-180x180.png",o=i.badge??"/favicon-32.png";await self.registration.showNotification(e,{body:s,icon:l,badge:o,tag:i.tag,data:i.data})})())}),self.addEventListener("notificationclick",t=>{t.notification.close();const n=(t.notification.data??null)?.url??"/";t.waitUntil(self.clients.openWindow(n))})})();

package/package.json

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

package/server/index.js

@@ -1009,10 +1009,7 @@ const getUiSessionTokenFromRequest = (req) => {
   return null;
 };
 
-const getPushSubscriptionsForUiSession = async (uiSessionToken) => {
-  if (!uiSessionToken) return [];
-  const store = await readPushSubscriptionsFromDisk();
-  const record = store.subscriptionsBySession?.[uiSessionToken];
+const normalizePushSubscriptions = (record) => {
   if (!Array.isArray(record)) return [];
   return record
     .map((entry) => {
@@ -1033,6 +1030,13 @@ const getPushSubscriptionsForUiSession = async (uiSessionToken) => {
     .filter(Boolean);
 };
 
+const getPushSubscriptionsForUiSession = async (uiSessionToken) => {
+  if (!uiSessionToken) return [];
+  const store = await readPushSubscriptionsFromDisk();
+  const record = store.subscriptionsBySession?.[uiSessionToken];
+  return normalizePushSubscriptions(record);
+};
+
 const addOrUpdatePushSubscription = async (uiSessionToken, subscription, userAgent) => {
   if (!uiSessionToken) {
     return;
@@ -1108,71 +1112,75 @@ const buildSessionDeepLinkUrl = (sessionId) => {
   return `/?session=${encodeURIComponent(sessionId)}`;
 };
 
-const sendPushToUiSession = async (uiSessionToken, payload) => {
+const sendPushToSubscription = async (sub, payload) => {
   await ensurePushInitialized();
-
-  const subscriptions = await getPushSubscriptionsForUiSession(uiSessionToken);
-  if (subscriptions.length === 0) {
-    return;
-  }
-
   const body = JSON.stringify(payload);
 
-  await Promise.all(subscriptions.map(async (sub) => {
-    const pushSubscription = {
-      endpoint: sub.endpoint,
-      keys: {
-        p256dh: sub.p256dh,
-        auth: sub.auth,
-      }
-    };
+  const pushSubscription = {
+    endpoint: sub.endpoint,
+    keys: {
+      p256dh: sub.p256dh,
+      auth: sub.auth,
+    }
+  };
 
-    try {
-      await webPush.sendNotification(pushSubscription, body);
-    } catch (error) {
-      const statusCode = typeof error?.statusCode === 'number' ? error.statusCode : null;
-      if (statusCode === 410 || statusCode === 404) {
-        await removePushSubscriptionFromAllSessions(sub.endpoint);
-        return;
-      }
-      console.warn('[Push] Failed to send notification:', error);
+  try {
+    await webPush.sendNotification(pushSubscription, body);
+  } catch (error) {
+    const statusCode = typeof error?.statusCode === 'number' ? error.statusCode : null;
+    if (statusCode === 410 || statusCode === 404) {
+      await removePushSubscriptionFromAllSessions(sub.endpoint);
+      return;
     }
-  }));
+    console.warn('[Push] Failed to send notification:', error);
+  }
 };
 
 const sendPushToAllUiSessions = async (payload, options = {}) => {
   const requireNoSse = options.requireNoSse === true;
   const store = await readPushSubscriptionsFromDisk();
-  const tokens = Object.keys(store.subscriptionsBySession || {});
+  const sessions = store.subscriptionsBySession || {};
+  const subscriptionsByEndpoint = new Map();
+
+  for (const [token, record] of Object.entries(sessions)) {
+    const subscriptions = normalizePushSubscriptions(record);
+    if (subscriptions.length === 0) continue;
+
+    for (const sub of subscriptions) {
+      if (!subscriptionsByEndpoint.has(sub.endpoint)) {
+        subscriptionsByEndpoint.set(sub.endpoint, sub);
+      }
+    }
+  }
 
-  await Promise.all(tokens.map(async (token) => {
-    if (requireNoSse && isUiVisible(token)) {
+  await Promise.all(Array.from(subscriptionsByEndpoint.entries()).map(async ([endpoint, sub]) => {
+    if (requireNoSse && isAnyUiVisible()) {
       return;
     }
-    await sendPushToUiSession(token, payload);
+    await sendPushToSubscription(sub, payload);
   }));
 };
 
 let pushInitialized = false;
-const activeUiSseConnections = new Set();
 
 
 
-const VISIBILITY_TTL_MS = 30000;
 const uiVisibilityByToken = new Map();
+let globalVisibilityState = false;
 
 const updateUiVisibility = (token, visible) => {
   if (!token) return;
-  uiVisibilityByToken.set(token, { visible: Boolean(visible), updatedAt: Date.now() });
-};
+  const now = Date.now();
+  const nextVisible = Boolean(visible);
+  uiVisibilityByToken.set(token, { visible: nextVisible, updatedAt: now });
+  globalVisibilityState = nextVisible;
 
-const isUiVisible = (token) => {
-  const entry = uiVisibilityByToken.get(token);
-  if (!entry) return false;
-  if (Date.now() - entry.updatedAt > VISIBILITY_TTL_MS) return false;
-  return entry.visible === true;
 };
 
+const isAnyUiVisible = () => globalVisibilityState === true;
+
+const isUiVisible = (token) => uiVisibilityByToken.get(token)?.visible === true;
+
 const resolveVapidSubject = async () => {
   const configured = process.env.OPENCHAMBER_VAPID_SUBJECT;
   if (typeof configured === 'string' && configured.trim().length > 0) {
@@ -2808,15 +2816,6 @@ async function main(options = {}) {
   });
 
   app.get('/api/global/event', async (req, res) => {
-    const uiToken = getUiSessionTokenFromRequest(req);
-    if (uiToken) {
-      activeUiSseConnections.add(uiToken);
-      const cleanupUiToken = () => {
-        activeUiSseConnections.delete(uiToken);
-      };
-      req.on('close', cleanupUiToken);
-      req.on('error', cleanupUiToken);
-    }
     let targetUrl;
     try {
       targetUrl = new URL(buildOpenCodeUrl('/global/event', ''));
@@ -2928,15 +2927,6 @@ async function main(options = {}) {
   });
 
   app.get('/api/event', async (req, res) => {
-    const uiToken = getUiSessionTokenFromRequest(req);
-    if (uiToken) {
-      activeUiSseConnections.add(uiToken);
-      const cleanupUiToken = () => {
-        activeUiSseConnections.delete(uiToken);
-      };
-      req.on('close', cleanupUiToken);
-      req.on('error', cleanupUiToken);
-    }
     let targetUrl;
     try {
       targetUrl = new URL(buildOpenCodeUrl('/event', ''));

package/server/lib/opencode-config.js

@@ -5,9 +5,9 @@ import yaml from 'yaml';
 import { parse as parseJsonc } from 'jsonc-parser';
 
 const OPENCODE_CONFIG_DIR = path.join(os.homedir(), '.config', 'opencode');
-const AGENT_DIR = path.join(OPENCODE_CONFIG_DIR, 'agent');
-const COMMAND_DIR = path.join(OPENCODE_CONFIG_DIR, 'command');
-const SKILL_DIR = path.join(OPENCODE_CONFIG_DIR, 'skill');
+const AGENT_DIR = path.join(OPENCODE_CONFIG_DIR, 'agents');
+const COMMAND_DIR = path.join(OPENCODE_CONFIG_DIR, 'commands');
+const SKILL_DIR = path.join(OPENCODE_CONFIG_DIR, 'skills');
 const CONFIG_FILE = path.join(OPENCODE_CONFIG_DIR, 'opencode.json');
 const CUSTOM_CONFIG_FILE = process.env.OPENCODE_CONFIG
   ? path.resolve(process.env.OPENCODE_CONFIG)
@@ -51,10 +51,14 @@ function ensureDirs() {
  * Ensure project-level agent directory exists
  */
 function ensureProjectAgentDir(workingDirectory) {
-  const projectAgentDir = path.join(workingDirectory, '.opencode', 'agent');
+  const projectAgentDir = path.join(workingDirectory, '.opencode', 'agents');
   if (!fs.existsSync(projectAgentDir)) {
     fs.mkdirSync(projectAgentDir, { recursive: true });
   }
+  const legacyProjectAgentDir = path.join(workingDirectory, '.opencode', 'agent');
+  if (!fs.existsSync(legacyProjectAgentDir)) {
+    fs.mkdirSync(legacyProjectAgentDir, { recursive: true });
+  }
   return projectAgentDir;
 }
 
@@ -62,14 +66,20 @@ function ensureProjectAgentDir(workingDirectory) {
  * Get project-level agent path
  */
 function getProjectAgentPath(workingDirectory, agentName) {
-  return path.join(workingDirectory, '.opencode', 'agent', `${agentName}.md`);
+  const pluralPath = path.join(workingDirectory, '.opencode', 'agents', `${agentName}.md`);
+  const legacyPath = path.join(workingDirectory, '.opencode', 'agent', `${agentName}.md`);
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
  * Get user-level agent path
  */
 function getUserAgentPath(agentName) {
-  return path.join(AGENT_DIR, `${agentName}.md`);
+  const pluralPath = path.join(AGENT_DIR, `${agentName}.md`);
+  const legacyPath = path.join(OPENCODE_CONFIG_DIR, 'agent', `${agentName}.md`);
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
@@ -173,10 +183,14 @@ function getAgentPermissionSource(agentName, workingDirectory) {
  * Ensure project-level command directory exists
  */
 function ensureProjectCommandDir(workingDirectory) {
-  const projectCommandDir = path.join(workingDirectory, '.opencode', 'command');
+  const projectCommandDir = path.join(workingDirectory, '.opencode', 'commands');
   if (!fs.existsSync(projectCommandDir)) {
     fs.mkdirSync(projectCommandDir, { recursive: true });
   }
+  const legacyProjectCommandDir = path.join(workingDirectory, '.opencode', 'command');
+  if (!fs.existsSync(legacyProjectCommandDir)) {
+    fs.mkdirSync(legacyProjectCommandDir, { recursive: true });
+  }
   return projectCommandDir;
 }
 
@@ -184,14 +198,20 @@ function ensureProjectCommandDir(workingDirectory) {
  * Get project-level command path
  */
 function getProjectCommandPath(workingDirectory, commandName) {
-  return path.join(workingDirectory, '.opencode', 'command', `${commandName}.md`);
+  const pluralPath = path.join(workingDirectory, '.opencode', 'commands', `${commandName}.md`);
+  const legacyPath = path.join(workingDirectory, '.opencode', 'command', `${commandName}.md`);
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
  * Get user-level command path
  */
 function getUserCommandPath(commandName) {
-  return path.join(COMMAND_DIR, `${commandName}.md`);
+  const pluralPath = path.join(COMMAND_DIR, `${commandName}.md`);
+  const legacyPath = path.join(OPENCODE_CONFIG_DIR, 'command', `${commandName}.md`);
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
@@ -245,10 +265,14 @@ function getCommandWritePath(commandName, workingDirectory, requestedScope) {
  * Ensure project-level skill directory exists
  */
 function ensureProjectSkillDir(workingDirectory) {
-  const projectSkillDir = path.join(workingDirectory, '.opencode', 'skill');
+  const projectSkillDir = path.join(workingDirectory, '.opencode', 'skills');
   if (!fs.existsSync(projectSkillDir)) {
     fs.mkdirSync(projectSkillDir, { recursive: true });
   }
+  const legacyProjectSkillDir = path.join(workingDirectory, '.opencode', 'skill');
+  if (!fs.existsSync(legacyProjectSkillDir)) {
+    fs.mkdirSync(legacyProjectSkillDir, { recursive: true });
+  }
   return projectSkillDir;
 }
 
@@ -256,28 +280,40 @@ function ensureProjectSkillDir(workingDirectory) {
  * Get project-level skill directory path (.opencode/skill/{name}/)
  */
 function getProjectSkillDir(workingDirectory, skillName) {
-  return path.join(workingDirectory, '.opencode', 'skill', skillName);
+  const pluralPath = path.join(workingDirectory, '.opencode', 'skills', skillName);
+  const legacyPath = path.join(workingDirectory, '.opencode', 'skill', skillName);
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
  * Get project-level skill SKILL.md path
  */
 function getProjectSkillPath(workingDirectory, skillName) {
-  return path.join(getProjectSkillDir(workingDirectory, skillName), 'SKILL.md');
+  const pluralPath = path.join(workingDirectory, '.opencode', 'skills', skillName, 'SKILL.md');
+  const legacyPath = path.join(workingDirectory, '.opencode', 'skill', skillName, 'SKILL.md');
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
  * Get user-level skill directory path
  */
 function getUserSkillDir(skillName) {
-  return path.join(SKILL_DIR, skillName);
+  const pluralPath = path.join(SKILL_DIR, skillName);
+  const legacyPath = path.join(OPENCODE_CONFIG_DIR, 'skill', skillName);
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
  * Get user-level skill SKILL.md path
  */
 function getUserSkillPath(skillName) {
-  return path.join(getUserSkillDir(skillName), 'SKILL.md');
+  const pluralPath = path.join(SKILL_DIR, skillName, 'SKILL.md');
+  const legacyPath = path.join(OPENCODE_CONFIG_DIR, 'skill', skillName, 'SKILL.md');
+  if (fs.existsSync(legacyPath) && !fs.existsSync(pluralPath)) return legacyPath;
+  return pluralPath;
 }
 
 /**
@@ -1463,9 +1499,9 @@ function discoverSkills(workingDirectory) {
     }
   };
   
-  // 1. Project level .opencode/skill/ (highest priority)
+  // 1. Project level .opencode/skills/ (highest priority)
   if (workingDirectory) {
-    const projectSkillDir = path.join(workingDirectory, '.opencode', 'skill');
+    const projectSkillDir = path.join(workingDirectory, '.opencode', 'skills');
     if (fs.existsSync(projectSkillDir)) {
       const entries = fs.readdirSync(projectSkillDir, { withFileTypes: true });
       for (const entry of entries) {
@@ -1477,6 +1513,19 @@ function discoverSkills(workingDirectory) {
         }
       }
     }
+
+    const legacyProjectSkillDir = path.join(workingDirectory, '.opencode', 'skill');
+    if (fs.existsSync(legacyProjectSkillDir)) {
+      const entries = fs.readdirSync(legacyProjectSkillDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory()) {
+          const skillMdPath = path.join(legacyProjectSkillDir, entry.name, 'SKILL.md');
+          if (fs.existsSync(skillMdPath)) {
+            addSkill(entry.name, skillMdPath, SKILL_SCOPE.PROJECT, 'opencode');
+          }
+        }
+      }
+    }
     
     // 2. Claude-compatible .claude/skills/
     const claudeSkillDir = path.join(workingDirectory, '.claude', 'skills');
@@ -1493,7 +1542,7 @@ function discoverSkills(workingDirectory) {
     }
   }
   
-  // 3. User level ~/.config/opencode/skill/
+  // 3. User level ~/.config/opencode/skills/
   if (fs.existsSync(SKILL_DIR)) {
     const entries = fs.readdirSync(SKILL_DIR, { withFileTypes: true });
     for (const entry of entries) {
@@ -1505,6 +1554,19 @@ function discoverSkills(workingDirectory) {
       }
     }
   }
+
+  const legacyUserSkillDir = path.join(OPENCODE_CONFIG_DIR, 'skill');
+  if (fs.existsSync(legacyUserSkillDir)) {
+    const entries = fs.readdirSync(legacyUserSkillDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        const skillMdPath = path.join(legacyUserSkillDir, entry.name, 'SKILL.md');
+        if (fs.existsSync(skillMdPath)) {
+          addSkill(entry.name, skillMdPath, SKILL_SCOPE.USER, 'opencode');
+        }
+      }
+    }
+  }
   
   return Array.from(skills.values());
 }

package/server/lib/skills-catalog/clawdhub/install.js

@@ -14,6 +14,17 @@ import { downloadClawdHubSkill, fetchClawdHubSkillInfo } from './api.js';
 
 const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/;
 
+function normalizeUserSkillDir(userSkillDir) {
+  if (!userSkillDir) return null;
+  const legacySkillDir = path.join(os.homedir(), '.config', 'opencode', 'skill');
+  const pluralSkillDir = path.join(os.homedir(), '.config', 'opencode', 'skills');
+  if (userSkillDir === legacySkillDir) {
+    if (fs.existsSync(legacySkillDir) && !fs.existsSync(pluralSkillDir)) return legacySkillDir;
+    return pluralSkillDir;
+  }
+  return userSkillDir;
+}
+
 function validateSkillName(skillName) {
   if (typeof skillName !== 'string') return false;
   if (skillName.length < 1 || skillName.length > 64) return false;
@@ -41,7 +52,7 @@ function getTargetSkillDir({ scope, workingDirectory, userSkillDir, skillName })
     throw new Error('workingDirectory is required for project installs');
   }
 
-  return path.join(workingDirectory, '.opencode', 'skill', skillName);
+  return path.join(workingDirectory, '.opencode', 'skills', skillName);
 }
 
 /**
@@ -71,6 +82,11 @@ export async function installSkillsFromClawdHub({
     return { ok: false, error: { kind: 'unknown', message: 'userSkillDir is required' } };
   }
 
+  const normalizedUserSkillDir = normalizeUserSkillDir(userSkillDir);
+  if (normalizedUserSkillDir) {
+    userSkillDir = normalizedUserSkillDir;
+  }
+
   if (scope === 'project' && !workingDirectory) {
     return { ok: false, error: { kind: 'invalidSource', message: 'Project installs require a directory parameter' } };
   }

package/server/lib/skills-catalog/install.js

@@ -7,6 +7,17 @@ import { parseSkillRepoSource } from './source.js';
 
 const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/;
 
+function normalizeUserSkillDir(userSkillDir) {
+  if (!userSkillDir) return null;
+  const legacySkillDir = path.join(os.homedir(), '.config', 'opencode', 'skill');
+  const pluralSkillDir = path.join(os.homedir(), '.config', 'opencode', 'skills');
+  if (userSkillDir === legacySkillDir) {
+    if (fs.existsSync(legacySkillDir) && !fs.existsSync(pluralSkillDir)) return legacySkillDir;
+    return pluralSkillDir;
+  }
+  return userSkillDir;
+}
+
 function validateSkillName(skillName) {
   if (typeof skillName !== 'string') return false;
   if (skillName.length < 1 || skillName.length > 64) return false;
@@ -103,7 +114,7 @@ function getTargetSkillDir({ scope, workingDirectory, userSkillDir, skillName })
     throw new Error('workingDirectory is required for project installs');
   }
 
-  return path.join(workingDirectory, '.opencode', 'skill', skillName);
+  return path.join(workingDirectory, '.opencode', 'skills', skillName);
 }
 
 export async function installSkillsFromRepository({
@@ -123,14 +134,19 @@ export async function installSkillsFromRepository({
     return { ok: false, error: gitCheck.error };
   }
 
-  if (scope !== 'user' && scope !== 'project') {
-    return { ok: false, error: { kind: 'invalidSource', message: 'Invalid scope' } };
+  const normalizedUserSkillDir = normalizeUserSkillDir(userSkillDir);
+  if (normalizedUserSkillDir) {
+    userSkillDir = normalizedUserSkillDir;
   }
 
   if (!userSkillDir) {
     return { ok: false, error: { kind: 'unknown', message: 'userSkillDir is required' } };
   }
 
+  if (scope !== 'user' && scope !== 'project') {
+    return { ok: false, error: { kind: 'invalidSource', message: 'Invalid scope' } };
+  }
+
   if (scope === 'project' && !workingDirectory) {
     return { ok: false, error: { kind: 'invalidSource', message: 'Project installs require a directory parameter' } };
   }