npm - @openchamber/web - Versions diffs - 1.3.2 → 1.3.3 - Mend

@openchamber/web 1.3.2 → 1.3.3

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 (10) hide show

package/dist/assets/{ToolOutputDialog-DYy4uTNv.js → ToolOutputDialog-v89bayPj.js} +1 -1
package/dist/assets/{index-0wDVT6MK.js → index-BAp9MHgd.js} +2 -2
package/dist/assets/index-DST7Nr3C.css +1 -0
package/dist/assets/main-BGkJ2buW.js +118 -0
package/dist/index.html +2 -2
package/package.json +2 -2
package/server/index.js +240 -9
package/server/lib/git-service.js +63 -31
package/dist/assets/index-a7wSdHza.css +0 -1
package/dist/assets/main-K-504lt8.js +0 -118

package/dist/index.html CHANGED Viewed

@@ -160,10 +160,10 @@
         pointer-events: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-0wDVT6MK.js"></script>
+    <script type="module" crossorigin src="/assets/index-BAp9MHgd.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-.pnpm-CFPpXnpS.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor--B3aGWKBE.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-a7wSdHza.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DST7Nr3C.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.3.2",
+  "version": "1.3.3",
   "private": false,
   "type": "module",
   "main": "./server/index.js",
@@ -25,7 +25,7 @@
     "@fontsource/ibm-plex-mono": "^5.2.7",
     "@fontsource/ibm-plex-sans": "^5.1.1",
     "@ibm/plex": "^6.4.1",
-    "@opencode-ai/sdk": "^1.0.65",
+    "@opencode-ai/sdk": "^1.0.185",
     "@radix-ui/react-collapsible": "^1.1.12",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",

package/server/index.js CHANGED Viewed

@@ -37,6 +37,27 @@ const FILE_SEARCH_EXCLUDED_DIRS = new Set([
   'logs'
 ]);
+const normalizeDirectoryPath = (value) => {
+  if (typeof value !== 'string') {
+    return value;
+  }
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return trimmed;
+  }
+  if (trimmed === '~') {
+    return os.homedir();
+  }
+  if (trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
+    return path.join(os.homedir(), trimmed.slice(2));
+  }
+  return trimmed;
+};
 const normalizeRelativeSearchPath = (rootPath, targetPath) => {
   const relative = path.relative(rootPath, targetPath) || path.basename(targetPath);
   return relative.split(path.sep).join('/') || targetPath;
@@ -677,6 +698,89 @@ function buildOpenCodeUrl(path, prefixOverride) {
   return `http://localhost:${openCodePort}${fullPath}`;
 }
+function parseSseDataPayload(block) {
+  if (!block || typeof block !== 'string') {
+    return null;
+  }
+  const dataLines = block
+    .split('\n')
+    .filter((line) => line.startsWith('data:'))
+    .map((line) => line.slice(5).replace(/^\s/, ''));
+  if (dataLines.length === 0) {
+    return null;
+  }
+  const payloadText = dataLines.join('\n').trim();
+  if (!payloadText) {
+    return null;
+  }
+  try {
+    return JSON.parse(payloadText);
+  } catch {
+    return null;
+  }
+}
+function deriveSessionActivity(payload) {
+  if (!payload || typeof payload !== 'object') {
+    return null;
+  }
+  if (payload.type === 'session.status') {
+    const status = payload.properties?.status;
+    const sessionId = payload.properties?.sessionID;
+    const statusType = status?.type;
+    if (typeof sessionId === 'string' && sessionId.length > 0 && typeof statusType === 'string') {
+      const phase = statusType === 'busy' || statusType === 'retry' ? 'busy' : 'idle';
+      return { sessionId, phase };
+    }
+  }
+  if (payload.type === 'message.updated') {
+    const info = payload.properties?.info;
+    const sessionId = info?.sessionID;
+    const role = info?.role;
+    const finish = info?.finish;
+    if (typeof sessionId === 'string' && sessionId.length > 0 && role === 'assistant' && finish === 'stop') {
+      return { sessionId, phase: 'cooldown' };
+    }
+  }
+  if (payload.type === 'message.part.updated') {
+    const info = payload.properties?.info;
+    const part = payload.properties?.part;
+    const sessionId = info?.sessionID ?? part?.sessionID ?? payload.properties?.sessionID;
+    const role = info?.role;
+    const partType = part?.type;
+    const reason = part?.reason;
+    if (
+      typeof sessionId === 'string' &&
+      sessionId.length > 0 &&
+      role === 'assistant' &&
+      partType === 'step-finish' &&
+      reason === 'stop'
+    ) {
+      return { sessionId, phase: 'cooldown' };
+    }
+  }
+  if (payload.type === 'session.idle') {
+    const sessionId = payload.properties?.sessionID;
+    if (typeof sessionId === 'string' && sessionId.length > 0) {
+      return { sessionId, phase: 'idle' };
+    }
+  }
+  return null;
+}
+function writeSseEvent(res, payload) {
+  res.write(`data: ${JSON.stringify(payload)}\n\n`);
+}
 function extractApiPrefixFromUrl(urlString, expectedSuffix) {
   if (!urlString) {
     return null;
@@ -1764,6 +1868,129 @@ async function main(options = {}) {
     }
   });
+  app.get('/api/event', async (req, res) => {
+    if (!openCodePort) {
+      return res.status(503).json({ error: 'OpenCode service unavailable' });
+    }
+    if (!openCodeApiPrefixDetected) {
+      try {
+        await detectOpenCodeApiPrefix();
+      } catch {
+        // ignore detection failures
+      }
+    }
+    let targetUrl;
+    try {
+      const prefix = openCodeApiPrefixDetected ? openCodeApiPrefix : '';
+      targetUrl = new URL(buildOpenCodeUrl('/event', prefix));
+    } catch (error) {
+      return res.status(503).json({ error: 'OpenCode service unavailable' });
+    }
+    const directoryParam = Array.isArray(req.query.directory)
+      ? req.query.directory[0]
+      : req.query.directory;
+    if (typeof directoryParam === 'string' && directoryParam.trim().length > 0) {
+      targetUrl.searchParams.set('directory', directoryParam.trim());
+    }
+    const headers = {
+      Accept: 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive'
+    };
+    const lastEventId = req.header('Last-Event-ID');
+    if (typeof lastEventId === 'string' && lastEventId.length > 0) {
+      headers['Last-Event-ID'] = lastEventId;
+    }
+    const controller = new AbortController();
+    const cleanup = () => {
+      if (!controller.signal.aborted) {
+        controller.abort();
+      }
+    };
+    req.on('close', cleanup);
+    req.on('error', cleanup);
+    let upstream;
+    try {
+      upstream = await fetch(targetUrl.toString(), {
+        headers,
+        signal: controller.signal,
+      });
+    } catch (error) {
+      return res.status(502).json({ error: 'Failed to connect to OpenCode event stream' });
+    }
+    if (!upstream.ok || !upstream.body) {
+      return res.status(502).json({ error: `OpenCode event stream unavailable (${upstream.status})` });
+    }
+    res.setHeader('Content-Type', 'text/event-stream');
+    res.setHeader('Cache-Control', 'no-cache');
+    res.setHeader('Connection', 'keep-alive');
+    res.setHeader('X-Accel-Buffering', 'no');
+    if (typeof res.flushHeaders === 'function') {
+      res.flushHeaders();
+    }
+    const decoder = new TextDecoder();
+    const reader = upstream.body.getReader();
+    let buffer = '';
+    const forwardBlock = (block) => {
+      if (!block) return;
+      res.write(`${block}\n\n`);
+      const payload = parseSseDataPayload(block);
+      const activity = deriveSessionActivity(payload);
+      if (activity) {
+        writeSseEvent(res, {
+          type: 'openchamber:session-activity',
+          properties: {
+            sessionId: activity.sessionId,
+            phase: activity.phase,
+          }
+        });
+      }
+    };
+    try {
+      while (true) {
+        const { value, done } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true }).replace(/\r\n/g, '\n');
+        let separatorIndex;
+        while ((separatorIndex = buffer.indexOf('\n\n')) !== -1) {
+          const block = buffer.slice(0, separatorIndex);
+          buffer = buffer.slice(separatorIndex + 2);
+          forwardBlock(block);
+        }
+      }
+      if (buffer.trim().length > 0) {
+        forwardBlock(buffer.trim());
+      }
+    } catch (error) {
+      if (!controller.signal.aborted) {
+        console.warn('SSE proxy stream error:', error);
+      }
+    } finally {
+      cleanup();
+      try {
+        res.end();
+      } catch {
+        // ignore
+      }
+    }
+  });
   app.get('/api/config/settings', async (_req, res) => {
     try {
       const settings = await readSettingsFromDisk();
@@ -2497,8 +2724,11 @@ async function main(options = {}) {
       const worktrees = await getWorktrees(directory);
       res.json(worktrees);
     } catch (error) {
-      console.error('Failed to get worktrees:', error);
-      res.status(500).json({ error: error.message || 'Failed to get worktrees' });
+      // Worktrees are an optional feature. Avoid repeated 500s (and repeated client retries)
+      // when the directory isn't a git repo or uses shell shorthand like "~/".
+      console.warn('Failed to get worktrees, returning empty list:', error?.message || error);
+      res.setHeader('X-OpenChamber-Warning', 'git worktrees unavailable');
+      res.json([]);
     }
   });
@@ -2637,15 +2867,16 @@ async function main(options = {}) {
         return res.status(400).json({ error: 'Path is required' });
       }
-      const normalizedPath = path.normalize(dirPath);
+      const expandedPath = normalizeDirectoryPath(dirPath);
+      const normalizedPath = path.normalize(expandedPath);
       if (normalizedPath.includes('..')) {
         return res.status(400).json({ error: 'Invalid path: path traversal not allowed' });
       }
-      fs.mkdirSync(dirPath, { recursive: true });
-      console.log(`Created directory: ${dirPath}`);
+      const resolvedPath = path.resolve(expandedPath);
+      fs.mkdirSync(resolvedPath, { recursive: true });
-      res.json({ success: true, path: dirPath });
+      res.json({ success: true, path: resolvedPath });
     } catch (error) {
       console.error('Failed to create directory:', error);
       res.status(500).json({ error: error.message || 'Failed to create directory' });
@@ -2659,7 +2890,7 @@ async function main(options = {}) {
         return res.status(400).json({ error: 'Path is required' });
       }
-      const resolvedPath = path.resolve(requestedPath);
+      const resolvedPath = path.resolve(normalizeDirectoryPath(requestedPath));
       let stats;
       try {
         stats = await fsPromises.stat(resolvedPath);
@@ -2705,7 +2936,7 @@ async function main(options = {}) {
       : os.homedir();
     try {
-      const resolvedPath = path.resolve(rawPath);
+      const resolvedPath = path.resolve(normalizeDirectoryPath(rawPath));
       const stats = await fsPromises.stat(resolvedPath);
       if (!stats.isDirectory()) {
@@ -2770,7 +3001,7 @@ async function main(options = {}) {
     const limit = Math.max(1, Math.min(parsedLimit, MAX_FILE_SEARCH_LIMIT));
     try {
-      const resolvedRoot = path.resolve(rawRoot);
+      const resolvedRoot = path.resolve(normalizeDirectoryPath(rawRoot));
       const stats = await fsPromises.stat(resolvedRoot);
       if (!stats.isDirectory()) {
         return res.status(400).json({ error: 'Specified root is not a directory' });

package/server/lib/git-service.js CHANGED Viewed

@@ -1,27 +1,51 @@
 import simpleGit from 'simple-git';
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import { execFile } from 'child_process';
 import { promisify } from 'util';
 const fsp = fs.promises;
 const execFileAsync = promisify(execFile);
+const normalizeDirectoryPath = (value) => {
+  if (typeof value !== 'string') {
+    return value;
+  }
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return trimmed;
+  }
+  if (trimmed === '~') {
+    return os.homedir();
+  }
+  if (trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
+    return path.join(os.homedir(), trimmed.slice(2));
+  }
+  return trimmed;
+};
 export async function isGitRepository(directory) {
-  if (!directory || !fs.existsSync(directory)) {
+  const directoryPath = normalizeDirectoryPath(directory);
+  if (!directoryPath || !fs.existsSync(directoryPath)) {
     return false;
   }
-  const gitDir = path.join(directory, '.git');
+  const gitDir = path.join(directoryPath, '.git');
   return fs.existsSync(gitDir);
 }
 export async function ensureOpenChamberIgnored(directory) {
-  if (!directory || !fs.existsSync(directory)) {
+  const directoryPath = normalizeDirectoryPath(directory);
+  if (!directoryPath || !fs.existsSync(directoryPath)) {
     return false;
   }
-  const gitDir = path.join(directory, '.git');
+  const gitDir = path.join(directoryPath, '.git');
   if (!fs.existsSync(gitDir)) {
     return false;
   }
@@ -78,7 +102,7 @@ export async function getGlobalIdentity() {
 }
 export async function getCurrentIdentity(directory) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
@@ -110,7 +134,7 @@ export async function getCurrentIdentity(directory) {
 }
 export async function setLocalIdentity(directory, profile) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
@@ -134,7 +158,8 @@ export async function setLocalIdentity(directory, profile) {
 }
 export async function getStatus(directory) {
-  const git = simpleGit(directory);
+  const directoryPath = normalizeDirectoryPath(directory);
+  const git = simpleGit(directoryPath);
   try {
     // Use -uall to show all untracked files individually, not just directories
@@ -194,7 +219,7 @@ export async function getStatus(directory) {
           return null;
         }
-        const absolutePath = path.join(directory, file.path);
+        const absolutePath = path.join(directoryPath, file.path);
         try {
           const stat = await fsp.stat(absolutePath);
@@ -266,7 +291,7 @@ export async function getStatus(directory) {
 }
 export async function getDiff(directory, { path, staged = false, contextLines = 3 } = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const args = ['diff', '--no-color'];
@@ -338,7 +363,8 @@ export async function getFileDiff(directory, { path: filePath, staged = false }
     throw new Error('directory and path are required for getFileDiff');
   }
-  const git = simpleGit(directory);
+  const directoryPath = normalizeDirectoryPath(directory);
+  const git = simpleGit(directoryPath);
   const isImage = isImageFile(filePath);
   const mimeType = isImage ? getImageMimeType(filePath) : null;
@@ -348,7 +374,7 @@ export async function getFileDiff(directory, { path: filePath, staged = false }
       // For images, use git show with raw output and convert to base64
       try {
         const { stdout } = await execFileAsync('git', ['show', `HEAD:${filePath}`], {
-          cwd: directory,
+          cwd: directoryPath,
           encoding: 'buffer',
           maxBuffer: 50 * 1024 * 1024, // 50MB max
         });
@@ -365,7 +391,7 @@ export async function getFileDiff(directory, { path: filePath, staged = false }
     original = '';
   }
-  const fullPath = path.join(directory, filePath);
+  const fullPath = path.join(directoryPath, filePath);
   let modified = '';
   try {
     const stat = await fsp.stat(fullPath);
@@ -395,8 +421,9 @@ export async function getFileDiff(directory, { path: filePath, staged = false }
 }
 export async function revertFile(directory, filePath) {
-  const git = simpleGit(directory);
-  const repoRoot = path.resolve(directory);
+  const directoryPath = normalizeDirectoryPath(directory);
+  const git = simpleGit(directoryPath);
+  const repoRoot = path.resolve(directoryPath);
   const absoluteTarget = path.resolve(repoRoot, filePath);
   if (!absoluteTarget.startsWith(repoRoot + path.sep) && absoluteTarget !== repoRoot) {
@@ -460,7 +487,7 @@ export async function collectDiffs(directory, files = []) {
 }
 export async function pull(directory, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const result = await git.pull(
@@ -483,7 +510,7 @@ export async function pull(directory, options = {}) {
 }
 export async function push(directory, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const result = await git.push(
@@ -510,7 +537,7 @@ export async function deleteRemoteBranch(directory, options = {}) {
     throw new Error('branch is required to delete remote branch');
   }
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   const targetBranch = branch.startsWith('refs/heads/')
     ? branch.substring('refs/heads/'.length)
     : branch;
@@ -526,7 +553,7 @@ export async function deleteRemoteBranch(directory, options = {}) {
 }
 export async function fetch(directory, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     await git.fetch(
@@ -543,7 +570,7 @@ export async function fetch(directory, options = {}) {
 }
 export async function commit(directory, message, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
@@ -573,7 +600,7 @@ export async function commit(directory, message, options = {}) {
 }
 export async function getBranches(directory) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const result = await git.branch();
@@ -627,7 +654,7 @@ async function filterActiveRemoteBranches(git, remoteBranches) {
 }
 export async function createBranch(directory, branchName, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     await git.checkoutBranch(branchName, options.startPoint || 'HEAD');
@@ -639,7 +666,7 @@ export async function createBranch(directory, branchName, options = {}) {
 }
 export async function checkoutBranch(directory, branchName) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     await git.checkout(branchName);
@@ -651,7 +678,12 @@ export async function checkoutBranch(directory, branchName) {
 }
 export async function getWorktrees(directory) {
-  const git = simpleGit(directory);
+  const directoryPath = normalizeDirectoryPath(directory);
+  if (!directoryPath || !fs.existsSync(directoryPath) || !fs.existsSync(path.join(directoryPath, '.git'))) {
+    return [];
+  }
+  const git = simpleGit(directoryPath);
   try {
     const result = await git.raw(['worktree', 'list', '--porcelain']);
@@ -684,13 +716,13 @@ export async function getWorktrees(directory) {
     return worktrees;
   } catch (error) {
-    console.error('Failed to list worktrees:', error);
-    throw error;
+    console.warn('Failed to list worktrees, returning empty list:', error?.message || error);
+    return [];
   }
 }
 export async function addWorktree(directory, worktreePath, branch, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const args = ['worktree', 'add'];
@@ -719,7 +751,7 @@ export async function addWorktree(directory, worktreePath, branch, options = {})
 }
 export async function removeWorktree(directory, worktreePath, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const args = ['worktree', 'remove', worktreePath];
@@ -738,7 +770,7 @@ export async function removeWorktree(directory, worktreePath, options = {}) {
 }
 export async function deleteBranch(directory, branch, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const branchName = branch.startsWith('refs/heads/')
@@ -754,7 +786,7 @@ export async function deleteBranch(directory, branch, options = {}) {
 }
 export async function getLog(directory, options = {}) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const maxCount = options.maxCount || 50;
@@ -852,7 +884,7 @@ export async function getLog(directory, options = {}) {
 }
 export async function isLinkedWorktree(directory) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {
     const [gitDir, gitCommonDir] = await Promise.all([
       git.raw(['rev-parse', '--git-dir']).then((output) => output.trim()),
@@ -866,7 +898,7 @@ export async function isLinkedWorktree(directory) {
 }
 export async function getCommitFiles(directory, commitHash) {
-  const git = simpleGit(directory);
+  const git = simpleGit(normalizeDirectoryPath(directory));
   try {