' +
+ html += '
' +
'' + escHtml(g.name) + '' +
'' + g.items.length + '
';
- g.items.forEach(function (x) {
- html += '
' +
- escHtml(_wsPaneLabel(x.pane)) + '
';
+ g.items.forEach(function (a) {
+ var waiting = a.status === 'waiting';
+ html += '
' +
+ escHtml(_wsToolLabel(a.kind)) + '
';
});
});
el.innerHTML = html;
el.style.display = '';
}
+// Safely embed a JS string literal inside a double-quoted inline onclick=""
+// attribute: JS-escape backslash/quote, then HTML-escape the attribute-breaking
+// characters so an odd path (spaces, &, quotes) can't break out of either layer.
+function _wsJsStr(s) {
+ var js = "'" + String(s == null ? '' : s).replace(/\\/g, '\\\\').replace(/'/g, "\\'") + "'";
+ return js.replace(/&/g, '&').replace(/"/g, '"').replace(//g, '>');
+}
+
// Jump from a status chip to that pane: show Workspace, activate its tab, focus it.
function jumpToWorkspacePane(tabId, paneId) {
if (typeof setView === 'function') setView('workspace');
@@ -813,14 +864,23 @@ function _wsLoadLayouts() {
.catch(function () { _wsSavedLayouts = []; });
}
-// Snapshot the current workspace into the { tabs:[{name,panes:[{cmd}]}] } shape
-// the server expects. A pane with no launched command is stored as cmd:''.
+// Snapshot the current workspace into the { tabs:[{name,panes}] } shape the
+// server expects. Each pane records its launched command (cmd), any typed-but-
+// not-run command (prefill, e.g. a resume line from a session card) and the
+// folder it opened in (cwd) — so restoring the layout reopens every pane in the
+// same project and re-issues the same command. A blank pane is stored as cmd:''.
function _wsCaptureLayout() {
return {
tabs: _wsTabs.map(function (t) {
return {
name: t.name,
- panes: t.panes.map(function (p) { return { cmd: p.cmd || '' }; }),
+ panes: t.panes.map(function (p) {
+ return {
+ cmd: p.cmd || '',
+ prefill: p.prefill || '',
+ cwd: p.cwd || p.wantCwd || '',
+ };
+ }),
};
}),
};
@@ -883,7 +943,14 @@ function applyWorkspaceLayout(id) {
_wsTabs = layout.tabs.map(function (t, ti) {
var panes = (t.panes && t.panes.length ? t.panes : [{ cmd: '' }])
.slice(0, MAX_WS_PANES)
- .map(function (p) { return { id: 'p' + (++_wsPaneSeq), cmd: (p && p.cmd) || null }; });
+ .map(function (p) {
+ return {
+ id: 'p' + (++_wsPaneSeq),
+ cmd: (p && p.cmd) || null,
+ prefill: (p && p.prefill) || null,
+ wantCwd: (p && p.cwd) || null,
+ };
+ });
return { id: 't' + (++_wsTabSeq), name: t.name || ('Tab ' + (ti + 1)), panes: panes };
});
_wsActiveTabId = _wsTabs[0].id;
diff --git a/src/workspace-layouts.js b/src/workspace-layouts.js
index 64aec78..3134629 100644
--- a/src/workspace-layouts.js
+++ b/src/workspace-layouts.js
@@ -34,14 +34,28 @@ function ensureDir(d) {
if (!fs.existsSync(d)) fs.mkdirSync(d, { recursive: true });
}
-// A pane is { cmd }. cmd may be '' (a blank pane, no auto-launch). Non-empty
+// A pane is { cmd, prefill, cwd }. cmd may be '' (a blank pane, no auto-launch).
+// `prefill` is a command typed into the pane but NOT auto-executed (e.g. a
+// resume command from a session card); `cwd` is the folder the pane opened in,
+// so a restored layout reopens each pane in the same project. Non-empty
// commands are validated like saved commands (no newlines / control chars).
+// cwd is validated the same way (a path with a control char is rejected); the
+// pty spawn re-gates it through isSafeLaunchPath, so this is belt-and-braces.
function sanitizePane(p) {
const raw = p && typeof p === 'object' ? p.cmd : p;
- let cmd = typeof raw === 'string' ? raw.trim() : '';
+ const cmd = typeof raw === 'string' ? raw.trim() : '';
if (cmd.length > MAX_COMMAND) return null;
if (cmd && CONTROL_CHARS.test(cmd)) return null;
- return { cmd };
+ const prefillRaw = p && typeof p === 'object' && typeof p.prefill === 'string' ? p.prefill.trim() : '';
+ if (prefillRaw.length > MAX_COMMAND) return null;
+ if (prefillRaw && CONTROL_CHARS.test(prefillRaw)) return null;
+ const cwdRaw = p && typeof p === 'object' && typeof p.cwd === 'string' ? p.cwd.trim() : '';
+ if (cwdRaw.length > MAX_COMMAND) return null;
+ if (cwdRaw && CONTROL_CHARS.test(cwdRaw)) return null;
+ const out = { cmd };
+ if (prefillRaw) out.prefill = prefillRaw;
+ if (cwdRaw) out.cwd = cwdRaw;
+ return out;
}
function sanitizeTab(t, i) {
diff --git a/test/workspace-layouts.test.js b/test/workspace-layouts.test.js
index ef89a5c..7488d89 100644
--- a/test/workspace-layouts.test.js
+++ b/test/workspace-layouts.test.js
@@ -31,6 +31,35 @@ test('sanitizeLayout accepts a multi-tab, multi-pane layout', () => {
assert.equal(l.tabs[1].panes[0].cmd, '');
});
+test('sanitizeLayout preserves per-pane prefill and cwd', () => {
+ const { m } = freshModule();
+ const l = m.sanitizeLayout({
+ name: 'resume setup',
+ tabs: [{ name: 'work', panes: [{ cmd: '', prefill: 'claude --resume abc', cwd: '/Users/me/proj' }] }],
+ });
+ assert.ok(l);
+ const p = l.tabs[0].panes[0];
+ assert.equal(p.cmd, '');
+ assert.equal(p.prefill, 'claude --resume abc');
+ assert.equal(p.cwd, '/Users/me/proj');
+});
+
+test('sanitizeLayout omits empty prefill/cwd and rejects control chars in them', () => {
+ const { m } = freshModule();
+ const clean = m.sanitizeLayout({ name: 'x', tabs: [{ name: 't', panes: [{ cmd: 'claude' }] }] });
+ assert.equal('prefill' in clean.tabs[0].panes[0], false);
+ assert.equal('cwd' in clean.tabs[0].panes[0], false);
+ // a newline in prefill or cwd rejects the whole tab (→ whole layout)
+ assert.equal(
+ m.sanitizeLayout({ name: 'x', tabs: [{ name: 't', panes: [{ cmd: '', prefill: 'a\nb' }] }] }),
+ null,
+ );
+ assert.equal(
+ m.sanitizeLayout({ name: 'x', tabs: [{ name: 't', panes: [{ cmd: '', cwd: '/a\n/b' }] }] }),
+ null,
+ );
+});
+
test('sanitizeLayout rejects no-name, no-tabs, and newline injection', () => {
const { m } = freshModule();
assert.equal(m.sanitizeLayout({ name: '', tabs: SAMPLE_TABS }), null);