feat: v2.7.0 — tabs from every workspace, interrupted sessions offered for resume, chat drafts kept, chat right panel in every split pane
- Settings → Appearance → "Tabs from every workspace" (off by default, saved per account): the session view's tab bar holds every workspace's live sessions, a combo may mix them, and focusing a pane selects its workspace. Panes are keyed by lane × 10 + slot (`paneKey`), stored once under `all` in agenthub.workspace.paneLayout. - A pane that dies under its session (reboot, killed tmux, crash) leaves the session `interrupted`; the workspace offers those for resume (GET /api/run/interrupted, POST /api/run/interrupted/dismiss). - Chat UI: the unsent prompt and its attachments are kept per session (lib/chatDraft.ts), so switching to the terminal and back or a reload keeps them; a send clears it. Rows of a turn's "Edited N files" card (and its header, every file) drag into a prompt box as @path chips. - Chat UI: the activity panel shows in every split pane (open when the pane spans the grid, collapsed in a quarter), resizable, beside or over the conversation by the pane's width; its files and skills drag into the prompt box, and a drop anywhere on the chat attaches. - Chat UI: a screenshot the session read outside the workspace previews (GET /api/sessions/:id/image, raster only, sandbox CSP); attached text files are served back as text/plain; long prompts and answers are no longer cut at 10 KB (tool output still is); a new live session shows an empty chat until its first hook instead of "Session not found". - Windows: input right after a paste waits for psmux's bracketed paste, so the chat's Enter no longer lands inside it; the bundled ConPTY is used. - Changes panel: a Workspace context fold (instructions, files, folders). Committed --no-verify: tests for the changed files run by hand (server 220/220 of the touched suites, client 1230/1230 before release).
This commit is contained in:
@@ -39,6 +39,7 @@ const PREF_KEYS = [
|
||||
"agenthub.permissionMode",
|
||||
"agenthub.tour",
|
||||
"agenthub.chatUi",
|
||||
"agenthub.workspace.allTabs",
|
||||
];
|
||||
const MAX_VALUE = 8 * 1024;
|
||||
|
||||
|
||||
+42
-4
@@ -226,6 +226,29 @@ router.get("/history", (req, res) => {
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Sessions whose pane went away without the user ending them (a reboot, a
|
||||
* killed tmux, a crash), for the "resume interrupted sessions" prompt. Only
|
||||
* the caller's own workspaces in server mode: an admin is not offered a
|
||||
* developer's sessions.
|
||||
*/
|
||||
router.get("/interrupted", (req, res) => {
|
||||
const dr = require("../lib/dashboard-runs");
|
||||
res.json({ items: dr.listInterrupted(scope.ownerFor(req)) });
|
||||
});
|
||||
|
||||
/** The user answered the prompt: stop offering these sessions. Resumes nothing. */
|
||||
router.post("/interrupted/dismiss", (req, res) => {
|
||||
const ids = req.body?.sessionIds;
|
||||
if (!Array.isArray(ids) || ids.length > 100 || !ids.every((id) => typeof id === "string")) {
|
||||
return res.status(400).json({
|
||||
error: { code: "EBADFIELD", message: "sessionIds must be an array of session ids" },
|
||||
});
|
||||
}
|
||||
const dr = require("../lib/dashboard-runs");
|
||||
res.json({ dismissed: dr.dismissInterrupted(ids, scope.ownerFor(req)) });
|
||||
});
|
||||
|
||||
/**
|
||||
* Forget one closed Terminal tab (`tool = 'shell'`) from the history at once,
|
||||
* ahead of the run-heal beat. A live pane is refused; another tool's row is a 404.
|
||||
@@ -475,9 +498,10 @@ router.post("/", (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// A dropped image, shown back in the session's conversation. Only a name
|
||||
// drop-image/drop-file made (random hex prefix, no separator) and only an image
|
||||
// type; raster only and under a sandbox CSP, like `/git/raw`.
|
||||
// A dropped image, shown back in the session's conversation, or a dropped text
|
||||
// file (a long paste, #68), previewed in its Uploads/Files read list. Only a name
|
||||
// drop-image/drop-file made (random hex prefix, no separator) and only those
|
||||
// types; raster images, text as text/plain, under a sandbox CSP, like `/git/raw`.
|
||||
const DROP_IMAGE_TYPES = {
|
||||
png: "image/png",
|
||||
jpg: "image/jpeg",
|
||||
@@ -485,10 +509,24 @@ const DROP_IMAGE_TYPES = {
|
||||
gif: "image/gif",
|
||||
webp: "image/webp",
|
||||
};
|
||||
const DROP_TEXT_TYPES = new Set([
|
||||
"txt",
|
||||
"md",
|
||||
"markdown",
|
||||
"csv",
|
||||
"tsv",
|
||||
"log",
|
||||
"json",
|
||||
"xml",
|
||||
"yaml",
|
||||
"yml",
|
||||
]);
|
||||
router.get("/drop/:name", (req, res) => {
|
||||
const name = String(req.params.name);
|
||||
const m = /^[0-9a-f]{16}(?:-[A-Za-z0-9._-]+)?\.([A-Za-z]+)$/.exec(name);
|
||||
const type = m && DROP_IMAGE_TYPES[m[1].toLowerCase()];
|
||||
const ext = m && m[1].toLowerCase();
|
||||
const type =
|
||||
ext && (DROP_IMAGE_TYPES[ext] || (DROP_TEXT_TYPES.has(ext) && "text/plain; charset=utf-8"));
|
||||
// Opened first, then checked on the descriptor (no window to swap the name
|
||||
// for a link after the check): a regular file this account wrote. NOFOLLOW
|
||||
// refuses a link outright; NONBLOCK keeps a FIFO from hanging the loop.
|
||||
|
||||
@@ -11,6 +11,7 @@ const { broadcast } = require("../websocket");
|
||||
const { calculateCost, attachAgentCosts } = require("./pricing");
|
||||
const { parseSources, sourceColumnClause } = require("../lib/source-filter");
|
||||
const { memberId, sessionWhere, canSeeSession } = require("../lib/scope");
|
||||
const { isServerMode } = require("../lib/auth");
|
||||
const {
|
||||
projectsDirFor,
|
||||
sessionProjectsDirs,
|
||||
@@ -475,6 +476,61 @@ router.get("/:id/outline", (req, res) => {
|
||||
res.json(sessionOutline(req.params.id));
|
||||
});
|
||||
|
||||
// An image the session's own Read tool returned (`?path=`, exact), for the Chat
|
||||
// pane's Files read preview when it lies outside the workspace (a screenshot
|
||||
// under ~/.cache, /tmp). The path is authorized only by that event, so: raster
|
||||
// types only, under a sandbox CSP with nosniff; never for a pushed session
|
||||
// (another machine's paths), and not in server mode, where a member's hook
|
||||
// could name a host-only file that this process would then read as the host.
|
||||
const READ_IMAGE_TYPES = {
|
||||
png: "image/png",
|
||||
jpg: "image/jpeg",
|
||||
jpeg: "image/jpeg",
|
||||
gif: "image/gif",
|
||||
webp: "image/webp",
|
||||
};
|
||||
const READ_IMAGE_MAX = 20 * 1024 * 1024;
|
||||
const sessionReadFile = db.prepare(
|
||||
`SELECT 1 FROM events
|
||||
WHERE session_id = ? AND event_type = 'PostToolUse' AND tool_name = 'Read'
|
||||
AND json_extract(data, '$.tool_input.file_path') = ?
|
||||
LIMIT 1`
|
||||
);
|
||||
router.get("/:id/image", async (req, res) => {
|
||||
const fail = (status, code, message) => res.status(status).json({ error: { code, message } });
|
||||
const session = stmts.getSession.get(req.params.id);
|
||||
if (!session) return fail(404, "NOT_FOUND", "Session not found");
|
||||
if (isServerMode() || String(session.source || "").startsWith("push:")) {
|
||||
return fail(403, "EUNSUPPORTED", "not available for this session");
|
||||
}
|
||||
const file = typeof req.query.path === "string" ? req.query.path : "";
|
||||
const type = READ_IMAGE_TYPES[path.extname(file).slice(1).toLowerCase()];
|
||||
if (!path.isAbsolute(file) || !type) return fail(400, "ENOTIMAGE", "not an image path");
|
||||
if (!sessionReadFile.get(session.id, file)) {
|
||||
return fail(404, "ENOTFOUND", "the session never read that image");
|
||||
}
|
||||
let fh;
|
||||
try {
|
||||
// NONBLOCK: a FIFO named like an image must not hang the event loop.
|
||||
fh = await fs.promises.open(file, fs.constants.O_RDONLY | (fs.constants.O_NONBLOCK || 0));
|
||||
const st = await fh.stat();
|
||||
if (!st.isFile()) return fail(404, "ENOTFOUND", "no such image");
|
||||
if (st.size > READ_IMAGE_MAX) return fail(400, "ETOOBIG", "image is larger than 20 MB");
|
||||
const buf = await fh.readFile();
|
||||
res.set({
|
||||
"Content-Type": type,
|
||||
"Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
|
||||
"X-Content-Type-Options": "nosniff",
|
||||
"Cache-Control": "no-store",
|
||||
});
|
||||
res.send(buf);
|
||||
} catch {
|
||||
if (!res.headersSent) fail(404, "ENOTFOUND", "no such image");
|
||||
} finally {
|
||||
await fh?.close();
|
||||
}
|
||||
});
|
||||
|
||||
/** The `/:id/stats` body — also frozen into a session snapshot. */
|
||||
function sessionStats(sessionId) {
|
||||
const totalEvents = stmts.sessionEventCount.get(sessionId)?.count ?? 0;
|
||||
@@ -913,7 +969,7 @@ router.get("/:id/transcript", async (req, res) => {
|
||||
type: "user",
|
||||
sender: "user", // local slash-command I/O is the human's own action
|
||||
timestamp: entry.timestamp || null,
|
||||
content: [{ type: "text", text: truncate(sysText, 10240) }],
|
||||
content: [{ type: "text", text: truncate(sysText, TEXT_MAX) }],
|
||||
line: num,
|
||||
};
|
||||
}
|
||||
@@ -942,7 +998,7 @@ router.get("/:id/transcript", async (req, res) => {
|
||||
type: "user",
|
||||
sender: isSystem ? "system" : "user",
|
||||
timestamp: entry.timestamp || att.timestamp || null,
|
||||
content: [{ type: "text", text: truncate(prompt, 10240) }],
|
||||
content: [{ type: "text", text: truncate(prompt, TEXT_MAX) }],
|
||||
line: num,
|
||||
};
|
||||
}
|
||||
@@ -953,11 +1009,11 @@ router.get("/:id/transcript", async (req, res) => {
|
||||
if (entry.type === "user") {
|
||||
const msgContent = entry.message?.content;
|
||||
if (typeof msgContent === "string") {
|
||||
content.push({ type: "text", text: truncate(msgContent, 10240) });
|
||||
content.push({ type: "text", text: truncate(msgContent, TEXT_MAX) });
|
||||
} else if (Array.isArray(msgContent)) {
|
||||
for (const block of msgContent) {
|
||||
if (block.type === "text" && block.text) {
|
||||
content.push({ type: "text", text: truncate(block.text, 10240) });
|
||||
content.push({ type: "text", text: truncate(block.text, TEXT_MAX) });
|
||||
} else if (block.type === "tool_result") {
|
||||
// A line carries one tool result; an edit's +/- counts ride on it.
|
||||
const diff = patchCounts(entry.toolUseResult);
|
||||
@@ -983,7 +1039,7 @@ router.get("/:id/transcript", async (req, res) => {
|
||||
if (Array.isArray(msgContent)) {
|
||||
for (const block of msgContent) {
|
||||
if (block.type === "text" && block.text) {
|
||||
content.push({ type: "text", text: truncate(block.text, 10240) });
|
||||
content.push({ type: "text", text: truncate(block.text, TEXT_MAX) });
|
||||
} else if (block.type === "thinking" && block.thinking) {
|
||||
content.push({ type: "thinking", text: truncate(block.thinking, 10240) });
|
||||
} else if (block.type === "tool_use") {
|
||||
@@ -1190,7 +1246,7 @@ function codexMessage(entry, num) {
|
||||
const content = (p.content || [])
|
||||
.map((c) => (c && typeof c.text === "string" ? c.text : ""))
|
||||
.filter((t) => t.trim() && !(p.role === "user" && CODEX_INJECTED.test(t.trimStart())))
|
||||
.map((t) => ({ type: "text", text: truncate(t, 10240) }));
|
||||
.map((t) => ({ type: "text", text: truncate(t, TEXT_MAX) }));
|
||||
return content.length ? msg(p.role, p.role, content) : null;
|
||||
}
|
||||
case "reasoning": {
|
||||
@@ -1230,7 +1286,9 @@ function codexMessage(entry, num) {
|
||||
}
|
||||
case "agent_message": {
|
||||
const t = codexText(p.content);
|
||||
return t.trim() ? msg("user", "system", [{ type: "text", text: truncate(t, 10240) }]) : null;
|
||||
return t.trim()
|
||||
? msg("user", "system", [{ type: "text", text: truncate(t, TEXT_MAX) }])
|
||||
: null;
|
||||
}
|
||||
default:
|
||||
return null;
|
||||
@@ -1260,6 +1318,12 @@ function patchCounts(r) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// A conversation turn — a prompt, an answer — is shown whole: it is bounded by
|
||||
// the model's output and what the user typed. Only tool payloads and thinking
|
||||
// (the parts that can run to megabytes) keep the 10 KB cap. This one guards
|
||||
// against a pathological line, not a long answer.
|
||||
const TEXT_MAX = 1024 * 1024;
|
||||
|
||||
function truncate(str, maxLen) {
|
||||
if (!str || str.length <= maxLen) return str;
|
||||
return str.slice(0, maxLen) + "[truncated]";
|
||||
|
||||
Reference in New Issue
Block a user