* feat: Add workspace: confine agent tools to a folder Pick a server folder as the agent's workspace so its file/shell tools work there and don't touch files outside it. File tools are hard-confined; bash/ python run with cwd set to the folder. Includes a slash command: `/workspace` (alias `/ws`) — show / `set <path>` / `clear` / `pick` (open the directory browser). - routes/workspace_routes.py: GET /api/workspace/browse (admin-only). - src/tool_execution.py: hard path confinement for read_file/write_file; bash/python cwd. Threaded route → stream_agent_loop → execute_tool_block. - src/agent_loop.py: workspace note prepended to the system prompt. - static/: overflow menu item, input-bar pill, directory-browser modal, and the /workspace slash command. - tests/test_workspace_confine.py. * Wire workspace confinement into tools that landed after this PR edit_file (#1239) and grep/glob/ls (#1670) merged after workspace-confine was written, so they bypassed the workspace boundary. Thread the workspace through: - edit_file: _do_edit_file resolves via _resolve_tool_path_in_workspace - grep/glob/ls: _resolve_search_root confines to the workspace (root + paths) - bash/python/bg cwd: workspace or _AGENT_WORKDIR (keep the #2586 data-dir default when no workspace is set) Tests cover edit_file + grep/ls confinement (inside ok, outside rejected). * Workspace picker: editable path bar + modal style cohesion + cross-platform hardening - Make the current-folder strip an editable address bar: type/paste a full path and press Enter to navigate (also reaches other Windows drives and hidden dirs the up-only browser cannot). - Reuse shared modal CSS: drop bespoke .workspace-modal-content/.workspace-btn* in favour of base .modal-content/.modal-body and the .confirm-btn button family; separators/hover use var(--border). Net -31 CSS lines. - Fix the path field overflowing the modal right edge (flex stretch + margin vs an overflow:auto scrollbar-feedback loop): full-bleed, no h-margin. - Cross-platform confinement: normcase the workspace commonpath check so containment holds on case-insensitive filesystems (Windows/macOS). - Make tests OS-portable: sibling temp dirs instead of /etc, python os.getcwd() instead of pwd. 5 pass.
161 lines
6.8 KiB
JavaScript
161 lines
6.8 KiB
JavaScript
// static/js/workspace.js
|
|
//
|
|
// Workspace picker: browse server directories in a draggable modal, choose a
|
|
// folder, and show it as a removable pill in the chat input bar. While set, the
|
|
// chat request sends `workspace` so the agent's file/shell tools are confined
|
|
// to that folder (see routes/chat_routes.py + src/tool_execution.py).
|
|
|
|
import Storage, { KEYS } from './storage.js';
|
|
import uiModule from './ui.js';
|
|
import { makeWindowDraggable } from './windowDrag.js';
|
|
|
|
const API_BASE = window.location.origin;
|
|
// Same folder glyph as the overflow menu item + pill (not an emoji).
|
|
const _FOLDER_SVG = '<svg class="workspace-row-icon" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/></svg>';
|
|
let _modal = null;
|
|
let _curPath = '';
|
|
|
|
export function getWorkspace() {
|
|
return Storage.get(KEYS.WORKSPACE, '') || '';
|
|
}
|
|
|
|
function _basename(p) {
|
|
if (!p) return '';
|
|
// Handle both POSIX (/) and Windows (\) separators.
|
|
const parts = p.replace(/[\\/]+$/, '').split(/[\\/]/);
|
|
return parts[parts.length - 1] || p;
|
|
}
|
|
|
|
export function syncWorkspaceIndicator(path) {
|
|
const pill = document.getElementById('workspace-indicator-btn');
|
|
const name = document.getElementById('workspace-indicator-name');
|
|
const overflow = document.getElementById('overflow-workspace-btn');
|
|
if (pill) {
|
|
pill.style.display = path ? '' : 'none';
|
|
pill.classList.toggle('active', !!path);
|
|
if (path) pill.title = `Workspace: ${path} — click to clear`;
|
|
}
|
|
if (name) name.textContent = path ? _basename(path) : '';
|
|
if (overflow) overflow.classList.toggle('active', !!path);
|
|
// Recompute the "+" overflow dot (app.js owns updatePlusDot via this event).
|
|
try { document.dispatchEvent(new CustomEvent('overflow-state-change')); } catch (_) {}
|
|
}
|
|
|
|
export function setWorkspace(path) {
|
|
if (path) Storage.set(KEYS.WORKSPACE, path);
|
|
else Storage.remove(KEYS.WORKSPACE);
|
|
syncWorkspaceIndicator(path || '');
|
|
}
|
|
|
|
export function clearWorkspace() {
|
|
setWorkspace('');
|
|
if (uiModule && uiModule.showToast) uiModule.showToast('Workspace cleared');
|
|
}
|
|
|
|
async function _load(path) {
|
|
const url = `${API_BASE}/api/workspace/browse${path ? `?path=${encodeURIComponent(path)}` : ''}`;
|
|
const res = await fetch(url, { credentials: 'same-origin' });
|
|
if (!res.ok) throw new Error(`browse failed: ${res.status}`);
|
|
return res.json();
|
|
}
|
|
|
|
function _render(data) {
|
|
_curPath = data.path;
|
|
const body = _modal.querySelector('#workspace-body');
|
|
const pathEl = _modal.querySelector('#workspace-cur-path');
|
|
if (pathEl) {
|
|
// Reflect the resolved (realpath) location back into the editable field.
|
|
pathEl.value = data.path;
|
|
pathEl.title = data.path;
|
|
}
|
|
let rows = '';
|
|
if (data.parent) {
|
|
rows += `<div class="workspace-row workspace-up" data-path="${encodeURIComponent(data.parent)}">↑ ..</div>`;
|
|
}
|
|
for (const d of data.dirs) {
|
|
// Backend supplies the full child path (os.path.join → cross-platform).
|
|
rows += `<div class="workspace-row" data-path="${encodeURIComponent(d.path)}">${_FOLDER_SVG}<span>${uiModule.esc(d.name)}</span></div>`;
|
|
}
|
|
if (!data.dirs.length && !data.parent) rows = '<div class="workspace-empty">No subfolders</div>';
|
|
body.innerHTML = rows || '<div class="workspace-empty">No subfolders</div>';
|
|
body.querySelectorAll('.workspace-row').forEach((row) => {
|
|
row.addEventListener('click', () => _navigate(decodeURIComponent(row.dataset.path)));
|
|
});
|
|
}
|
|
|
|
async function _navigate(path) {
|
|
try {
|
|
_render(await _load(path));
|
|
} catch (e) {
|
|
if (uiModule && uiModule.showError) uiModule.showError('Could not open folder');
|
|
}
|
|
}
|
|
|
|
function _getModal() {
|
|
if (_modal) return _modal;
|
|
_modal = document.createElement('div');
|
|
_modal.id = 'workspace-modal';
|
|
_modal.className = 'modal';
|
|
_modal.style.display = 'none';
|
|
_modal.innerHTML = `
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<h4><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-2px;margin-right:6px"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/></svg>Select workspace</h4>
|
|
<button class="close-btn" id="workspace-close" aria-label="Close">✖</button>
|
|
</div>
|
|
<input type="text" class="styled-prompt-input workspace-cur" id="workspace-cur-path"
|
|
spellcheck="false" autocomplete="off" autocapitalize="off" autocorrect="off"
|
|
placeholder="Type or paste a folder path, then press Enter" />
|
|
<div class="modal-body workspace-body" id="workspace-body"></div>
|
|
<div class="modal-footer workspace-footer">
|
|
<button type="button" class="confirm-btn confirm-btn-secondary" id="workspace-cancel">Cancel</button>
|
|
<button type="button" class="confirm-btn confirm-btn-primary" id="workspace-use">Use this folder</button>
|
|
</div>
|
|
</div>`;
|
|
document.body.appendChild(_modal);
|
|
_modal.querySelector('#workspace-close').addEventListener('click', closeWorkspaceBrowser);
|
|
_modal.querySelector('#workspace-cancel').addEventListener('click', closeWorkspaceBrowser);
|
|
// Editable path bar: Enter navigates to a typed/pasted folder.
|
|
_modal.querySelector('#workspace-cur-path').addEventListener('keydown', (e) => {
|
|
if (e.key === 'Enter') {
|
|
e.preventDefault();
|
|
const v = e.target.value.trim();
|
|
if (v) _navigate(v);
|
|
}
|
|
});
|
|
_modal.querySelector('#workspace-use').addEventListener('click', () => {
|
|
setWorkspace(_curPath);
|
|
if (uiModule && uiModule.showToast) uiModule.showToast(`Workspace set: ${_basename(_curPath)}`);
|
|
closeWorkspaceBrowser();
|
|
});
|
|
const content = _modal.querySelector('.modal-content');
|
|
const header = _modal.querySelector('.modal-header');
|
|
if (content && header) makeWindowDraggable(_modal, { content, header });
|
|
return _modal;
|
|
}
|
|
|
|
export async function openWorkspaceBrowser() {
|
|
const modal = _getModal();
|
|
modal.style.display = 'flex';
|
|
try {
|
|
_render(await _load(getWorkspace() || ''));
|
|
} catch (e) {
|
|
if (uiModule && uiModule.showError) uiModule.showError('Could not browse folders');
|
|
}
|
|
}
|
|
|
|
export function closeWorkspaceBrowser() {
|
|
if (_modal) _modal.style.display = 'none';
|
|
}
|
|
|
|
export function initWorkspace() {
|
|
// Restore persisted workspace into the pill on load.
|
|
syncWorkspaceIndicator(getWorkspace());
|
|
const overflow = document.getElementById('overflow-workspace-btn');
|
|
if (overflow) overflow.addEventListener('click', openWorkspaceBrowser);
|
|
const pill = document.getElementById('workspace-indicator-btn');
|
|
if (pill) pill.addEventListener('click', clearWorkspace);
|
|
}
|
|
|
|
export default { initWorkspace, openWorkspaceBrowser, getWorkspace, setWorkspace, clearWorkspace, syncWorkspaceIndicator };
|