npm - claude-remote-cli - Versions diffs - 3.5.2 → 3.5.4 - Mend

claude-remote-cli 3.5.2 → 3.5.4

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

package/dist/frontend/assets/{index-D8zGa-Fd.css → index-CiwYPknn.css} +2 -2
package/dist/frontend/assets/{index-DnrS1YFL.js → index-QZrLSCSL.js} +21 -21
package/dist/frontend/index.html +2 -2
package/dist/server/config.js +22 -0
package/dist/server/index.js +16 -14
package/dist/server/workspaces.js +38 -8
package/dist/test/config.test.js +114 -1
package/package.json +1 -1

package/dist/frontend/index.html CHANGED Viewed

@@ -11,8 +11,8 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
   <meta name="theme-color" content="#1a1a1a" />
-  <script type="module" crossorigin src="/assets/index-DnrS1YFL.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-D8zGa-Fd.css">
+  <script type="module" crossorigin src="/assets/index-QZrLSCSL.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-CiwYPknn.css">
 </head>
 <body>
   <div id="app"></div>

package/dist/server/config.js CHANGED Viewed

@@ -74,6 +74,28 @@ export function getWorkspaceSettings(config, workspacePath) {
     // Per-workspace settings override global — only for defined keys
     return { ...globalDefaults, ...perWorkspace };
 }
+export function resolveSessionSettings(config, repoPath, overrides) {
+    const ws = getWorkspaceSettings(config, repoPath);
+    return {
+        agent: overrides.agent ?? ws.defaultAgent ?? 'claude',
+        yolo: overrides.yolo ?? ws.defaultYolo ?? false,
+        continue: overrides.continue ?? ws.defaultContinue ?? true,
+        useTmux: overrides.useTmux ?? ws.launchInTmux ?? false,
+        claudeArgs: overrides.claudeArgs ?? ws.claudeArgs ?? [],
+    };
+}
+export function deleteWorkspaceSettingKeys(configPath, config, workspacePath, keys) {
+    if (!config.workspaceSettings?.[workspacePath])
+        return;
+    for (const key of keys) {
+        delete config.workspaceSettings[workspacePath][key];
+    }
+    // Clean up empty workspace entries
+    if (Object.keys(config.workspaceSettings[workspacePath]).length === 0) {
+        delete config.workspaceSettings[workspacePath];
+    }
+    saveConfig(configPath, config);
+}
 export function setWorkspaceSettings(configPath, config, workspacePath, settings) {
     if (!config.workspaceSettings)
         config.workspaceSettings = {};

package/dist/server/index.js CHANGED Viewed

@@ -8,7 +8,7 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import express from 'express';
 import cookieParser from 'cookie-parser';
-import { loadConfig, saveConfig, DEFAULTS, readMeta, writeMeta, deleteMeta, ensureMetaDir } from './config.js';
+import { loadConfig, saveConfig, DEFAULTS, readMeta, writeMeta, deleteMeta, ensureMetaDir, resolveSessionSettings } from './config.js';
 import * as auth from './auth.js';
 import * as sessions from './sessions.js';
 import { AGENT_CONTINUE_ARGS, AGENT_YOLO_ARGS, serializeAll, restoreFromDisk, activeTmuxSessionNames, populateMetaCache } from './sessions.js';
@@ -542,12 +542,12 @@ async function main() {
         // Sanitize optional terminal dimensions
         const safeCols = typeof cols === 'number' && Number.isFinite(cols) && cols >= 1 && cols <= 500 ? Math.round(cols) : undefined;
         const safeRows = typeof rows === 'number' && Number.isFinite(rows) && rows >= 1 && rows <= 200 ? Math.round(rows) : undefined;
-        const resolvedAgent = agent || config.defaultAgent || 'claude';
+        const resolved = resolveSessionSettings(config, repoPath, { agent, yolo, useTmux, claudeArgs });
+        const resolvedAgent = resolved.agent;
         const name = repoName || repoPath.split('/').filter(Boolean).pop() || 'session';
         const baseArgs = [
-            ...(config.claudeArgs || []),
-            ...(yolo ? AGENT_YOLO_ARGS[resolvedAgent] : []),
-            ...(claudeArgs || []),
+            ...(resolved.claudeArgs),
+            ...(resolved.yolo ? AGENT_YOLO_ARGS[resolvedAgent] : []),
         ];
         // Compute root by matching repoPath against configured rootDirs
         const roots = config.rootDirs || [];
@@ -653,7 +653,7 @@ async function main() {
                                 root,
                                 displayName: name,
                                 args: baseArgs,
-                                useTmux: useTmux ?? config.launchInTmux,
+                                useTmux: resolved.useTmux,
                                 ...(safeCols != null && { cols: safeCols }),
                                 ...(safeRows != null && { rows: safeRows }),
                             });
@@ -679,7 +679,7 @@ async function main() {
                                 displayName: displayNameVal,
                                 args,
                                 configPath: CONFIG_PATH,
-                                useTmux: useTmux ?? config.launchInTmux,
+                                useTmux: resolved.useTmux,
                                 ...(safeCols != null && { cols: safeCols }),
                                 ...(safeRows != null && { rows: safeRows }),
                             });
@@ -724,7 +724,7 @@ async function main() {
             displayName,
             args,
             configPath: CONFIG_PATH,
-            useTmux: useTmux ?? config.launchInTmux,
+            useTmux: resolved.useTmux,
             ...(safeCols != null && { cols: safeCols }),
             ...(safeRows != null && { rows: safeRows }),
             needsBranchRename: isMountainName || (needsBranchRename ?? false),
@@ -747,18 +747,20 @@ async function main() {
             res.status(400).json({ error: 'repoPath is required' });
             return;
         }
-        const resolvedAgent = agent || config.defaultAgent || 'claude';
+        const resolved = resolveSessionSettings(config, repoPath, {
+            agent, yolo, continue: continueSession, useTmux, claudeArgs,
+        });
+        const resolvedAgent = resolved.agent;
         // Sanitize optional terminal dimensions
         const safeCols = typeof cols === 'number' && Number.isFinite(cols) && cols >= 1 && cols <= 500 ? Math.round(cols) : undefined;
         const safeRows = typeof rows === 'number' && Number.isFinite(rows) && rows >= 1 && rows <= 200 ? Math.round(rows) : undefined;
         // Multiple sessions per repo allowed (multi-tab support)
         const name = repoName || repoPath.split('/').filter(Boolean).pop() || 'session';
         const baseArgs = [
-            ...(config.claudeArgs || []),
-            ...(yolo ? AGENT_YOLO_ARGS[resolvedAgent] : []),
-            ...(claudeArgs || []),
+            ...(resolved.claudeArgs),
+            ...(resolved.yolo ? AGENT_YOLO_ARGS[resolvedAgent] : []),
         ];
-        const args = continueSession ? [...AGENT_CONTINUE_ARGS[resolvedAgent], ...baseArgs] : [...baseArgs];
+        const args = resolved.continue ? [...AGENT_CONTINUE_ARGS[resolvedAgent], ...baseArgs] : [...baseArgs];
         const roots = config.rootDirs || [];
         const root = roots.find(function (r) { return repoPath.startsWith(r); }) || '';
         let branchName = '';
@@ -777,7 +779,7 @@ async function main() {
             displayName: name,
             args,
             branchName,
-            useTmux: useTmux ?? config.launchInTmux,
+            useTmux: resolved.useTmux,
             ...(safeCols != null && { cols: safeCols }),
             ...(safeRows != null && { rows: safeRows }),
         });

package/dist/server/workspaces.js CHANGED Viewed

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { Router } from 'express';
-import { loadConfig, saveConfig, getWorkspaceSettings, setWorkspaceSettings } from './config.js';
+import { loadConfig, saveConfig, getWorkspaceSettings, setWorkspaceSettings, deleteWorkspaceSettingKeys } from './config.js';
 import { listBranches, getActivityFeed, getCiStatus, getPrForBranch, getUnresolvedCommentCount, switchBranch, getCurrentBranch } from './git.js';
 import { MOUNTAIN_NAMES } from './types.js';
 const execFileAsync = promisify(execFile);
@@ -341,14 +341,27 @@ export function createWorkspaceRouter(deps) {
     // -------------------------------------------------------------------------
     router.get('/settings', async (req, res) => {
         const workspacePath = typeof req.query.path === 'string' ? req.query.path : undefined;
+        const merged = req.query.merged === 'true';
         if (!workspacePath) {
             res.status(400).json({ error: 'path query parameter is required' });
             return;
         }
         const config = getConfig();
         const resolved = path.resolve(workspacePath);
-        const settings = config.workspaceSettings?.[resolved] ?? {};
-        res.json(settings);
+        if (merged) {
+            const wsOverrides = config.workspaceSettings?.[resolved] ?? {};
+            const effective = getWorkspaceSettings(config, resolved);
+            const overridden = [];
+            for (const key of ['defaultAgent', 'defaultContinue', 'defaultYolo', 'launchInTmux']) {
+                if (wsOverrides[key] !== undefined)
+                    overridden.push(key);
+            }
+            res.json({ settings: effective, overridden });
+        }
+        else {
+            const settings = config.workspaceSettings?.[resolved] ?? {};
+            res.json(settings);
+        }
     });
     // -------------------------------------------------------------------------
     // PATCH /workspaces/settings — update per-workspace settings
@@ -362,11 +375,28 @@ export function createWorkspaceRouter(deps) {
         const resolved = path.resolve(workspacePath);
         const updates = req.body;
         const config = getConfig();
-        const current = config.workspaceSettings?.[resolved] ?? {};
-        const merged = { ...current, ...updates };
-        config.workspaceSettings = { ...config.workspaceSettings, [resolved]: merged };
-        saveConfig(configPath, config);
-        res.json(merged);
+        // Separate null values (deletions) from actual updates
+        const keysToDelete = [];
+        const keysToUpdate = {};
+        for (const [key, value] of Object.entries(updates)) {
+            if (value === null) {
+                keysToDelete.push(key);
+            }
+            else {
+                keysToUpdate[key] = value;
+            }
+        }
+        // Apply deletions first
+        if (keysToDelete.length > 0) {
+            deleteWorkspaceSettingKeys(configPath, config, resolved, keysToDelete);
+        }
+        // Apply updates
+        if (Object.keys(keysToUpdate).length > 0) {
+            setWorkspaceSettings(configPath, config, resolved, keysToUpdate);
+        }
+        // Return the current raw workspace settings
+        const final = config.workspaceSettings?.[resolved] ?? {};
+        res.json(final);
     });
     // -------------------------------------------------------------------------
     // GET /workspaces/pr — PR info for a specific branch

package/dist/test/config.test.js CHANGED Viewed

@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { DEFAULTS, loadConfig, saveConfig, ensureMetaDir, readMeta, writeMeta, deleteMeta } from '../server/config.js';
+import { DEFAULTS, loadConfig, saveConfig, ensureMetaDir, readMeta, writeMeta, deleteMeta, resolveSessionSettings, deleteWorkspaceSettingKeys } from '../server/config.js';
 let tmpDir;
 before(() => {
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'claude-remote-cli-config-test-'));
@@ -110,3 +110,116 @@ test('deleteMeta is a no-op for non-existent metadata', () => {
     const configPath = path.join(tmpDir, 'config.json');
     assert.doesNotThrow(() => deleteMeta(configPath, '/no/such/path'));
 });
+test('resolveSessionSettings returns global defaults when no workspace or overrides', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    fs.writeFileSync(configPath, JSON.stringify({
+        defaultAgent: 'claude',
+        defaultContinue: true,
+        defaultYolo: false,
+        launchInTmux: false,
+        claudeArgs: [],
+    }), 'utf8');
+    const config = loadConfig(configPath);
+    const result = resolveSessionSettings(config, '/some/repo', {});
+    assert.equal(result.agent, 'claude');
+    assert.equal(result.yolo, false);
+    assert.equal(result.continue, true);
+    assert.equal(result.useTmux, false);
+    assert.deepEqual(result.claudeArgs, []);
+});
+test('resolveSessionSettings applies workspace overrides over globals', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    fs.writeFileSync(configPath, JSON.stringify({
+        defaultAgent: 'claude',
+        defaultYolo: false,
+        defaultContinue: true,
+        launchInTmux: false,
+        claudeArgs: [],
+        workspaceSettings: {
+            '/my/repo': { defaultYolo: true, defaultAgent: 'codex' },
+        },
+    }), 'utf8');
+    const config = loadConfig(configPath);
+    const result = resolveSessionSettings(config, '/my/repo', {});
+    assert.equal(result.agent, 'codex');
+    assert.equal(result.yolo, true);
+    assert.equal(result.continue, true);
+});
+test('resolveSessionSettings explicit overrides beat workspace settings', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    fs.writeFileSync(configPath, JSON.stringify({
+        defaultAgent: 'claude',
+        defaultYolo: true,
+        defaultContinue: true,
+        launchInTmux: false,
+        claudeArgs: [],
+        workspaceSettings: {
+            '/my/repo': { defaultYolo: true },
+        },
+    }), 'utf8');
+    const config = loadConfig(configPath);
+    const result = resolveSessionSettings(config, '/my/repo', { yolo: false });
+    assert.equal(result.yolo, false);
+});
+test('resolveSessionSettings uses override claudeArgs, not global', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    fs.writeFileSync(configPath, JSON.stringify({
+        defaultAgent: 'claude',
+        defaultYolo: false,
+        defaultContinue: true,
+        launchInTmux: false,
+        claudeArgs: ['--global-arg'],
+    }), 'utf8');
+    const config = loadConfig(configPath);
+    const result = resolveSessionSettings(config, '/some/repo', { claudeArgs: ['--custom'] });
+    assert.deepEqual(result.claudeArgs, ['--custom']);
+});
+test('resolveSessionSettings falls through to globals when no workspace exists', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    fs.writeFileSync(configPath, JSON.stringify({
+        defaultAgent: 'codex',
+        defaultYolo: true,
+        defaultContinue: false,
+        launchInTmux: true,
+        claudeArgs: ['--verbose'],
+    }), 'utf8');
+    const config = loadConfig(configPath);
+    const result = resolveSessionSettings(config, '/nonexistent/repo', {});
+    assert.equal(result.agent, 'codex');
+    assert.equal(result.yolo, true);
+    assert.equal(result.continue, false);
+    assert.equal(result.useTmux, true);
+    assert.deepEqual(result.claudeArgs, ['--verbose']);
+});
+test('deleteWorkspaceSettingKeys removes specified keys', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    const config = {
+        ...DEFAULTS,
+        workspaceSettings: {
+            '/my/repo': { defaultYolo: true, defaultAgent: 'codex', branchPrefix: 'dy/' },
+        },
+    };
+    fs.writeFileSync(configPath, JSON.stringify(config), 'utf8');
+    deleteWorkspaceSettingKeys(configPath, config, '/my/repo', ['defaultYolo', 'defaultAgent']);
+    assert.equal(config.workspaceSettings['/my/repo'].defaultYolo, undefined);
+    assert.equal(config.workspaceSettings['/my/repo'].defaultAgent, undefined);
+    assert.equal(config.workspaceSettings['/my/repo'].branchPrefix, 'dy/');
+});
+test('deleteWorkspaceSettingKeys removes entire workspace entry when empty', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    const config = {
+        ...DEFAULTS,
+        workspaceSettings: {
+            '/my/repo': { defaultYolo: true },
+        },
+    };
+    fs.writeFileSync(configPath, JSON.stringify(config), 'utf8');
+    deleteWorkspaceSettingKeys(configPath, config, '/my/repo', ['defaultYolo']);
+    assert.equal(config.workspaceSettings['/my/repo'], undefined);
+});
+test('deleteWorkspaceSettingKeys is no-op for nonexistent workspace', () => {
+    const configPath = path.join(tmpDir, 'config.json');
+    const config = { ...DEFAULTS };
+    fs.writeFileSync(configPath, JSON.stringify(config), 'utf8');
+    assert.doesNotThrow(() => deleteWorkspaceSettingKeys(configPath, config, '/no/such/repo', ['defaultYolo']));
+});

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote-cli",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "description": "Remote web interface for Claude Code CLI sessions",
   "type": "module",
   "main": "dist/server/index.js",