npm - @openchamber/web - Versions diffs - 1.11.1 → 1.11.2 - Mend

@openchamber/web 1.11.1 → 1.11.2

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

package/dist/assets/{JsonTreeView-bLRkNPS9.js → JsonTreeView-9F0tH9yA.js} +1 -1
package/dist/assets/{MarkdownRendererImpl-FSTq-eVA.js → MarkdownRendererImpl-C3QofAGm.js} +1 -1
package/dist/assets/{MultiRunWindow-DezP_Pyy.js → MultiRunWindow-wnUGv0Dl.js} +1 -1
package/dist/assets/{OnboardingScreen-CeZMVgH8.js → OnboardingScreen-17dAs0NH.js} +2 -2
package/dist/assets/{SettingsWindow-Dlfk0yzA.js → SettingsWindow-BgyVY5gz.js} +1 -1
package/dist/assets/TerminalView-D11XIZuz.js +1 -0
package/dist/assets/{ToolOutputDialog-CePopKV7.js → ToolOutputDialog-DFG7ANVw.js} +6 -6
package/dist/assets/es-Chl2Hu6K.js +15 -0
package/dist/assets/index-0bVkxg-Z.css +1 -0
package/dist/assets/{index-CKlDk4Io.js → index-BV2XTsJJ.js} +1 -1
package/dist/assets/ko-BSrH3F9n.js +15 -0
package/dist/assets/{main-BvaFBcXN.js → main-BHkNwOz1.js} +2 -2
package/dist/assets/main-Bqf4fXgq.js +225 -0
package/dist/assets/miniChat-BmB-E5xo.js +2 -0
package/dist/assets/{modelPrefsAutoSave-HUPrH1r2.js → modelPrefsAutoSave-2uwW8uD9.js} +98 -96
package/dist/assets/pl-YlGvPmFg.js +15 -0
package/dist/assets/pt-BR-BonIMDN_.js +15 -0
package/dist/assets/{renderElectronMiniChatApp-EXGwfTjq.js → renderElectronMiniChatApp-B_qrXCU2.js} +2 -2
package/dist/assets/uk-lPqA3MHn.js +15 -0
package/dist/assets/{vendor-.bun-BFTPeDgG.js → vendor-.bun-Boz6Tqcq.js} +20 -20
package/dist/assets/zh-CN-C5nQQsUL.js +15 -0
package/dist/index.html +4 -4
package/dist/mini-chat.html +4 -4
package/package.json +1 -1
package/server/lib/git/DOCUMENTATION.md +1 -0
package/server/lib/git/routes.js +26 -0
package/server/lib/git/service.js +96 -10
package/server/lib/git/service.test.js +39 -0
package/server/lib/opencode/settings-helpers.js +10 -1
package/server/lib/opencode/settings-helpers.test.js +35 -0
package/server/lib/opencode/skill-routes.js +43 -49
package/server/lib/opencode/skills.js +78 -10
package/dist/assets/TerminalView-CdCfCaFq.js +0 -1
package/dist/assets/es-CyjenLd8.js +0 -15
package/dist/assets/index-NnYXwoao.css +0 -1
package/dist/assets/ko-Cs7yF9Jn.js +0 -15
package/dist/assets/main-DcpUnRRo.js +0 -225
package/dist/assets/miniChat-Dmzb8Mwv.js +0 -2
package/dist/assets/pl-XjTt7Hsk.js +0 -15
package/dist/assets/pt-BR-knvpJ94d.js +0 -15
package/dist/assets/uk-DUPvcQAj.js +0 -15
package/dist/assets/zh-CN-DWiTG93s.js +0 -15

package/dist/index.html CHANGED Viewed

@@ -532,10 +532,10 @@
         pointer-events: none;
       }
     </style>
-    <script type="module" crossorigin src="/assets/main-BvaFBcXN.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/index-CKlDk4Io.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-BFTPeDgG.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-NnYXwoao.css">
+    <script type="module" crossorigin src="/assets/main-BHkNwOz1.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/index-BV2XTsJJ.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-Boz6Tqcq.js">
+    <link rel="stylesheet" crossorigin href="/assets/index-0bVkxg-Z.css">
     <link rel="stylesheet" crossorigin href="/assets/vendor--V65Sl9C2.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/dist/mini-chat.html CHANGED Viewed

@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
     <title>OpenChamber Mini Chat</title>
-    <script type="module" crossorigin src="/assets/miniChat-Dmzb8Mwv.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/index-CKlDk4Io.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-BFTPeDgG.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-NnYXwoao.css">
+    <script type="module" crossorigin src="/assets/miniChat-BmB-E5xo.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/index-BV2XTsJJ.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-Boz6Tqcq.js">
+    <link rel="stylesheet" crossorigin href="/assets/index-0bVkxg-Z.css">
     <link rel="stylesheet" crossorigin href="/assets/vendor--V65Sl9C2.css">
   </head>
   <body class="h-full bg-background text-foreground">

package/package.json CHANGED Viewed

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

package/server/lib/git/DOCUMENTATION.md CHANGED Viewed

@@ -58,6 +58,7 @@ The following functions are exported and used by the web server:
 ### Log Operations
 - `getLog(directory, options)`: Get commit history with stats (supports maxCount, from, to, file filters).
 - `getCommitFiles(directory, commitHash)`: Get file changes for a specific commit.
+- `getCommitFileDiff(directory, hash, filePath, isBinary)`: Get before/after content for a specific file in a commit. Returns `{ original, modified, isBinary }`. Runs `git show <hash>^:<path>` and `git show <hash>:<path>` in parallel; returns empty strings on failure (added/deleted/root-commit edge cases).
 ### Merge and Rebase Operations
 - `rebase(directory, options)`: Start a rebase onto a target branch.

package/server/lib/git/routes.js CHANGED Viewed

@@ -943,4 +943,30 @@ export function registerGitRoutes(app) {
     }
   });
+  app.get('/api/git/commit-file-diff', async (req, res) => {
+    const { getCommitFileDiff } = await getGitLibraries();
+    try {
+      const { directory, hash, path: filePath } = req.query;
+      if (!directory || typeof directory !== 'string') {
+        return res.status(400).json({ error: 'directory parameter is required' });
+      }
+      if (!hash || typeof hash !== 'string') {
+        return res.status(400).json({ error: 'hash parameter is required' });
+      }
+      if (!/^[0-9a-fA-F]{7,40}$/.test(hash)) {
+        return res.status(400).json({ error: 'hash must be a valid commit SHA' });
+      }
+      if (!filePath || typeof filePath !== 'string') {
+        return res.status(400).json({ error: 'path parameter is required' });
+      }
+      const isBinary = req.query.binary === 'true';
+      const result = await getCommitFileDiff(directory, hash, filePath, isBinary);
+      res.json(result);
+    } catch (error) {
+      console.error('Failed to get commit file diff:', error);
+      res.status(500).json({ error: error.message || 'Failed to get commit file diff' });
+    }
+  });
 }

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

@@ -1611,6 +1611,27 @@ const parseIsBinaryFromNumstat = (raw) => {
   return added === '-' || deleted === '-';
 };
+const extractGitStatusPath = (status, pathPart) => {
+  if ((status === 'R' || status === 'C') && pathPart.includes('\t')) {
+    return pathPart.split('\t').pop() || pathPart;
+  }
+  return pathPart;
+};
+const extractGitNumstatDestinationPath = (filePath) => {
+  if (!filePath.includes(' => ')) {
+    return filePath;
+  }
+  const braceMatch = filePath.match(/^(.*)\{([^{}]*)\s=>\s([^{}]*)\}(.*)$/);
+  if (braceMatch) {
+    const [, prefix, , destination, suffix] = braceMatch;
+    return `${prefix}${destination}${suffix}`.replace(/\/+/g, '/');
+  }
+  return filePath.split(' => ').pop()?.trim() || filePath;
+};
 const looksBinaryBySniff = async (absolutePath) => {
   try {
     const handle = await fsp.open(absolutePath, 'r');
@@ -2683,14 +2704,52 @@ export async function deleteBranch(directory, branch, options = {}) {
   }
 }
+/**
+ * Resolve a log base ref using local-first semantics.
+ *
+ * - If `from` is falsy / whitespace → return undefined.
+ * - If the local ref resolves → return it unchanged (caller's intent preserved).
+ * - If the local ref is absent but `origin/<from>` exists → return `origin/<from>`
+ *   (common when the user has never checked out the base branch locally).
+ * - If neither resolves → return `from` unchanged so git surfaces a meaningful error.
+ *
+ * @param {string | undefined} from   - The raw `from` option value.
+ * @param {(ref: string) => Promise<boolean>} checkRef - Returns true when the ref resolves.
+ * @returns {Promise<string | undefined>}
+ */
+export async function resolveBaseRefForLog(from, checkRef) {
+  const normalized = typeof from === 'string' ? from.trim() : undefined;
+  if (!normalized) return undefined;
+  if (await checkRef(normalized)) return normalized;
+  const originRef = `refs/remotes/origin/${normalized}`;
+  if (await checkRef(originRef)) return `origin/${normalized}`;
+  return normalized;
+}
 export async function getLog(directory, options = {}) {
   const git = await createGit(directory);
   try {
     const maxCount = options.maxCount || 50;
+    // Prefer the local ref; fall back to origin/<from> only when the local ref
+    // cannot be resolved (e.g. user has never checked out the base branch).
+    const checkRef = async (ref) => {
+      try {
+        const out = await git.raw(['rev-parse', '--verify', ref]);
+        return Boolean(out && out.trim());
+      } catch {
+        return false;
+      }
+    };
+    const resolvedFrom = await resolveBaseRefForLog(options.from, checkRef);
     const baseLog = await git.log({
       maxCount,
-      from: options.from,
+      from: resolvedFrom,
       to: options.to,
       file: options.file
     });
@@ -2703,10 +2762,10 @@ export async function getLog(directory, options = {}) {
       '--shortstat'
     ];
-    if (options.from && options.to) {
-      logArgs.push(`${options.from}..${options.to}`);
-    } else if (options.from) {
-      logArgs.push(`${options.from}..HEAD`);
+    if (resolvedFrom && options.to) {
+      logArgs.push(`${resolvedFrom}..${options.to}`);
+    } else if (resolvedFrom) {
+      logArgs.push(`${resolvedFrom}..HEAD`);
     } else if (options.to) {
       logArgs.push(options.to);
     }
@@ -2990,15 +3049,13 @@ export async function getCommitFiles(directory, commitHash) {
     for (const line of statusLines) {
       const match = line.match(/^([AMDRC])\d*\t(.+)$/);
       if (match) {
-        const [, status, path] = match;
-        statusMap.set(path, status);
+        const [, status, pathPart] = match;
+        statusMap.set(extractGitStatusPath(status, pathPart), status);
       }
     }
     for (const file of files) {
-      const basePath = file.path.includes(' => ')
-        ? file.path.split(' => ').pop()?.replace(/[{}]/g, '') || file.path
-        : file.path;
+      const basePath = extractGitNumstatDestinationPath(file.path);
       const status = statusMap.get(basePath) || statusMap.get(file.path);
       if (status) {
@@ -3072,6 +3129,9 @@ export async function getRemotes(directory) {
       pushUrl: remote.refs.push
     }));
   } catch (error) {
+    if (isNotGitRepositoryError(error)) {
+      return [];
+    }
     console.error('Failed to get remotes:', error);
     throw error;
   }
@@ -3341,3 +3401,29 @@ export async function getConflictDetails(directory) {
     throw error;
   }
 }
+export async function getCommitFileDiff(directory, hash, filePath, isBinary) {
+  if (!directory || !hash || !filePath) {
+    throw new Error('directory, hash, and path are required for getCommitFileDiff');
+  }
+  if (isBinary) {
+    return { original: '', modified: '', isBinary: true };
+  }
+  const directoryPath = normalizeDirectoryPath(directory);
+  const [originalResult, modifiedResult] = await Promise.all([
+    runGitCommand(directoryPath, ['show', `${hash}^:${filePath}`]),
+    runGitCommand(directoryPath, ['show', `${hash}:${filePath}`]),
+  ]);
+  const original = originalResult.success ? originalResult.stdout : '';
+  const modified = modifiedResult.success ? modifiedResult.stdout : '';
+  if (!originalResult.success && !modifiedResult.success) {
+    throw new Error(`Failed to read file content at commit ${hash}: ${originalResult.stderr || modifiedResult.stderr}`);
+  }
+  return { original, modified, isBinary: false };
+}

package/server/lib/git/service.test.js ADDED Viewed

@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+import { resolveBaseRefForLog } from './service.js';
+describe('resolveBaseRefForLog', () => {
+  it('returns the local ref unchanged when it exists, even if origin also exists', async () => {
+    // Both local 'main' and 'refs/remotes/origin/main' are present.
+    // The local ref takes precedence — callers that ask for 'main' get 'main'.
+    const checkRef = async (ref) => ref === 'main' || ref === 'refs/remotes/origin/main';
+    expect(await resolveBaseRefForLog('main', checkRef)).toBe('main');
+  });
+  it('falls back to origin/<from> when local ref cannot be resolved but origin can', async () => {
+    // Local 'main' is absent (e.g. user never checked it out), but origin/main exists.
+    const checkRef = async (ref) => ref === 'refs/remotes/origin/main';
+    expect(await resolveBaseRefForLog('main', checkRef)).toBe('origin/main');
+  });
+  it('returns the original ref when neither local nor origin ref can be resolved', async () => {
+    // Neither ref exists; return as-is so git surfaces a meaningful error.
+    const checkRef = async () => false;
+    expect(await resolveBaseRefForLog('nonexistent-branch', checkRef)).toBe('nonexistent-branch');
+  });
+  it('returns undefined when from is undefined', async () => {
+    const checkRef = async () => true;
+    expect(await resolveBaseRefForLog(undefined, checkRef)).toBeUndefined();
+  });
+  it('returns undefined when from is an empty string', async () => {
+    const checkRef = async () => true;
+    expect(await resolveBaseRefForLog('', checkRef)).toBeUndefined();
+  });
+  it('returns undefined when from is a whitespace-only string', async () => {
+    const checkRef = async () => true;
+    expect(await resolveBaseRefForLog('   ', checkRef)).toBeUndefined();
+  });
+});

package/server/lib/opencode/settings-helpers.js CHANGED Viewed

@@ -168,6 +168,9 @@ export const createSettingsHelpers = (dependencies) => {
     if (typeof candidate.showReasoningTraces === 'boolean') {
       result.showReasoningTraces = candidate.showReasoningTraces;
     }
+    if (typeof candidate.collapsibleThinkingBlocks === 'boolean') {
+      result.collapsibleThinkingBlocks = candidate.collapsibleThinkingBlocks;
+    }
     if (typeof candidate.showTextJustificationActivity === 'boolean') {
       result.showTextJustificationActivity = candidate.showTextJustificationActivity;
     }
@@ -728,7 +731,13 @@ export const createSettingsHelpers = (dependencies) => {
           ? settings.showReasoningTraces
           : typeof sanitized.showReasoningTraces === 'boolean'
             ? sanitized.showReasoningTraces
-            : false
+            : false,
+      collapsibleThinkingBlocks:
+        typeof settings.collapsibleThinkingBlocks === 'boolean'
+          ? settings.collapsibleThinkingBlocks
+          : typeof sanitized.collapsibleThinkingBlocks === 'boolean'
+            ? sanitized.collapsibleThinkingBlocks
+            : true,
     };
   };

package/server/lib/opencode/settings-helpers.test.js CHANGED Viewed

@@ -71,4 +71,39 @@ describe('settings helpers', () => {
     expect(helpers.sanitizeSettingsUpdate({ mobileKeyboardMode: 'fixed-layout' })).toEqual({});
   });
+  it('accepts collapsibleThinkingBlocks as a persisted shared setting', () => {
+    const helpers = createTestHelpers();
+    expect(helpers.sanitizeSettingsUpdate({ collapsibleThinkingBlocks: true })).toEqual({
+      collapsibleThinkingBlocks: true,
+    });
+    expect(helpers.sanitizeSettingsUpdate({ collapsibleThinkingBlocks: false })).toEqual({
+      collapsibleThinkingBlocks: false,
+    });
+  });
+  it('rejects non-boolean collapsibleThinkingBlocks values', () => {
+    const helpers = createTestHelpers();
+    expect(helpers.sanitizeSettingsUpdate({ collapsibleThinkingBlocks: 'true' })).toEqual({});
+    expect(helpers.sanitizeSettingsUpdate({ collapsibleThinkingBlocks: 1 })).toEqual({});
+  });
+  it('includes collapsibleThinkingBlocks in formatSettingsResponse', () => {
+    const helpers = createTestHelpers();
+    const response = helpers.formatSettingsResponse({ collapsibleThinkingBlocks: false });
+    expect(response.collapsibleThinkingBlocks).toBe(false);
+    const responseTrue = helpers.formatSettingsResponse({ collapsibleThinkingBlocks: true });
+    expect(responseTrue.collapsibleThinkingBlocks).toBe(true);
+  });
+  it('defaults collapsibleThinkingBlocks to true in formatSettingsResponse when absent', () => {
+    const helpers = createTestHelpers();
+    const response = helpers.formatSettingsResponse({});
+    expect(response.collapsibleThinkingBlocks).toBe(true);
+  });
 });

package/server/lib/opencode/skill-routes.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { createOpencodeClient } from '@opencode-ai/sdk/v2';
 export const registerSkillRoutes = (app, dependencies) => {
   const {
     fs,
@@ -14,7 +16,6 @@ export const registerSkillRoutes = (app, dependencies) => {
     getOpenCodeAuthHeaders,
     getOpenCodePort,
     getSkillSources,
-    discoverSkills,
     createSkill,
     updateSkill,
     deleteSkill,
@@ -114,31 +115,23 @@ export const registerSkillRoutes = (app, dependencies) => {
   const fetchOpenCodeDiscoveredSkills = async (workingDirectory) => {
     if (!getOpenCodePort()) {
-      return null;
+      return [];
     }
     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),
+      const client = createOpencodeClient({
+        baseUrl: buildOpenCodeUrl('/', '').replace(/\/$/, ''),
+        directory: workingDirectory || undefined,
+        headers: getOpenCodeAuthHeaders(),
+        fetch: (request) => fetch(request, { signal: AbortSignal.timeout(8_000) }),
       });
-      if (!response.ok) {
-        return null;
-      }
-      const payload = await response.json();
+      const response = await client.app.skills(
+        workingDirectory ? { directory: workingDirectory } : undefined,
+      );
+      const payload = response?.data;
       if (!Array.isArray(payload)) {
-        return null;
+        return [];
       }
       return payload
@@ -146,7 +139,7 @@ export const registerSkillRoutes = (app, dependencies) => {
           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) {
+          if (!name || !location || location === '<built-in>') {
             return null;
           }
           const inferred = inferSkillScopeAndSourceFromPath(location, workingDirectory);
@@ -159,8 +152,9 @@ export const registerSkillRoutes = (app, dependencies) => {
           };
         })
         .filter(Boolean);
-    } catch {
-      return null;
+    } catch (error) {
+      console.error('Failed to list OpenCode skills:', error);
+      return [];
     }
   };
@@ -191,11 +185,11 @@ export const registerSkillRoutes = (app, dependencies) => {
   app.get('/api/config/skills', async (req, res) => {
     try {
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }
-      const skills = (await fetchOpenCodeDiscoveredSkills(directory)) || discoverSkills(directory);
+      const skills = await fetchOpenCodeDiscoveredSkills(directory);
       const enrichedSkills = skills.map((skill) => {
         const sources = getSkillSources(skill.name, directory, skill);
@@ -277,9 +271,7 @@ export const registerSkillRoutes = (app, dependencies) => {
         return res.status(404).json({ ok: false, error: { kind: 'invalidSource', message: 'Unknown source' } });
       }
-      const discovered = directory
-        ? ((await fetchOpenCodeDiscoveredSkills(directory)) || discoverSkills(directory))
-        : [];
+      const discovered = await fetchOpenCodeDiscoveredSkills(directory);
       const installedByName = new Map(discovered.map((s) => [s.name, s]));
       if (src.sourceType === 'clawdhub' || isClawdHubSource(src.source)) {
@@ -504,11 +496,11 @@ export const registerSkillRoutes = (app, dependencies) => {
   app.get('/api/config/skills/:name', async (req, res) => {
     try {
       const skillName = req.params.name;
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }
-      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(directory)) || [])
+      const discoveredSkill = (await fetchOpenCodeDiscoveredSkills(directory))
         .find((skill) => skill.name === skillName) || null;
       const sources = getSkillSources(skillName, directory, discoveredSkill);
@@ -532,12 +524,12 @@ export const registerSkillRoutes = (app, dependencies) => {
       if (isUnsafeSkillRelativePath(filePath)) {
         return res.status(400).json({ error: 'Invalid file path' });
       }
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }
-      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(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) {
@@ -563,9 +555,11 @@ export const registerSkillRoutes = (app, dependencies) => {
     try {
       const skillName = req.params.name;
       const { scope, source: skillSource, ...config } = req.body;
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
-        return res.status(400).json({ error });
+      const { directory, error } = scope === SKILL_SCOPE.PROJECT
+        ? await resolveProjectDirectory(req)
+        : await resolveOptionalProjectDirectory(req);
+      if (error || (scope === SKILL_SCOPE.PROJECT && !directory)) {
+        return res.status(400).json({ error: error || 'Project skill creation requires a directory' });
       }
       console.log('[Server] Creating skill:', skillName);
@@ -590,15 +584,15 @@ export const registerSkillRoutes = (app, dependencies) => {
     try {
       const skillName = req.params.name;
       const updates = req.body;
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }
       console.log(`[Server] Updating skill: ${skillName}`);
       console.log('[Server] Working directory:', directory);
-      updateSkill(skillName, updates, directory);
+      updateSkill(skillName, updates, directory, updates?.targetPath);
       await refreshOpenCodeAfterConfigChange('skill update');
       res.json({
@@ -621,12 +615,12 @@ export const registerSkillRoutes = (app, dependencies) => {
         return res.status(400).json({ error: 'Invalid file path' });
       }
       const { content } = req.body;
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }
-      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(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) {
@@ -655,12 +649,12 @@ export const registerSkillRoutes = (app, dependencies) => {
       if (isUnsafeSkillRelativePath(filePath)) {
         return res.status(400).json({ error: 'Invalid file path' });
       }
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }
-      const discoveredSkill = ((await fetchOpenCodeDiscoveredSkills(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) {
@@ -685,8 +679,8 @@ export const registerSkillRoutes = (app, dependencies) => {
   app.delete('/api/config/skills/:name', async (req, res) => {
     try {
       const skillName = req.params.name;
-      const { directory, error } = await resolveProjectDirectory(req);
-      if (!directory) {
+      const { directory, error } = await resolveOptionalProjectDirectory(req);
+      if (error) {
         return res.status(400).json({ error });
       }