@edspencer/paddock 0.66.1 → 0.66.2

package/packages/server/dist/routes/meta.js

@@ -1,6 +1,6 @@
 import { resolveAttachmentsConfig, maxFileBytes, isTypeAllowed, } from "../attachments-config.js";
 import { inferAttachmentKind } from "../attachments-hint.js";
-import { buildInstanceConfig, writeInstanceConfig, validatePatch, instanceConfigPath, InstanceConfigError, } from "../instance-config.js";
+import { buildInstanceConfig, writeInstanceConfig, validatePatch, instanceConfigPath, instanceConfigVersion, InstanceConfigError, } from "../instance-config.js";
 import { TranscriptionError } from "../transcribe.js";
 import { resolveModels, resolveDefaultModel } from "../models.js";
 import { sendProjectError } from "../route-errors.js";
@@ -134,7 +134,7 @@ export function registerMetaRoutes(app, ctx) {
         schema: {
             tags: ["System"],
             summary: "Read instance-wide config",
-            description: "Reports every surfaced instance-config field (value / default / editable / sensitive / env-shadow) for the top-level admin screen. Returns a JSON object keyed by field.",
+            description: "Reports every surfaced instance-config field for the top-level admin screen: `value` (effective in the running, boot-frozen process), `pendingValue` (what a restart would resolve, read from paddock.config.yaml on every request), `pendingRestart`, plus default / editable / sensitive / env-shadow flags. Top level carries `restartRequired` (any field diverges), `configPath`, and `configVersion` — a fingerprint of the file to echo back as `expectedVersion` on the PUT.",
             response: {
                 200: {
                     description: "Instance config snapshot.",
@@ -148,13 +148,16 @@ export function registerMetaRoutes(app, ctx) {
         schema: {
             tags: ["System"],
             summary: "Write instance-wide config",
-            description: "Writes the editable subset of the instance config to paddock.config.yaml (comment-preserving, atomic). Writes DO NOT hot-apply — the config is frozen at boot — so a successful write returns `{ restartRequired: true, configPath }` and the process keeps its current config until it restarts. Returns 400 on a malformed patch or invalid field, 500 on write failure.",
+            description: "Writes the editable subset of the instance config to paddock.config.yaml (comment-preserving, atomic). Writes DO NOT hot-apply — the config is frozen at boot — so a successful write returns `{ restartRequired: true, configPath, configVersion }` and the process keeps its current config until it restarts. A `null` value clears that key (the built-in default applies again). Pass `expectedVersion` (the `configVersion` from the GET you were editing) to make the write conditional: 409 if the file changed underneath you, instead of silently overwriting another editor. Returns 400 on a malformed patch, an invalid/read-only/env-shadowed field, 500 on write failure.",
             body: {
                 // Documentation-only (no validation/coercion): accept any/empty body.
                 type: ["object", "null"],
                 additionalProperties: true,
                 properties: {
                     patch: { description: "Map of config field name to new value to write." },
+                    expectedVersion: {
+                        description: "Optional. The `configVersion` this patch was composed against; the write is refused with 409 if the file no longer matches.",
+                    },
                 },
             },
             response: {
@@ -163,6 +166,11 @@ export function registerMetaRoutes(app, ctx) {
                     type: "object",
                     additionalProperties: true,
                 },
+                409: {
+                    description: "`expectedVersion` no longer matches the file — another writer got there first. Nothing was written.",
+                    type: "object",
+                    additionalProperties: true,
+                },
             },
         },
     }, async (req, reply) => {
@@ -180,14 +188,33 @@ export function registerMetaRoutes(app, ctx) {
             }
             throw err;
         }
+        const configPath = instanceConfigPath(cfg);
+        // Optimistic concurrency (#722). Opt-in — a client that sends no
+        // `expectedVersion` (curl, a script) writes unconditionally, as before —
+        // but the UI always sends one, so two tabs editing the same file now
+        // collide loudly instead of the second silently erasing the first.
+        if (Object.prototype.hasOwnProperty.call(req.body ?? {}, "expectedVersion")) {
+            const current = instanceConfigVersion(configPath);
+            if (current !== (req.body?.expectedVersion ?? null)) {
+                return reply.code(409).send({
+                    error: "The config file changed on disk since this page loaded (another tab, or an editor). Nothing was written — reload the settings and apply your changes again.",
+                    code: "config_conflict",
+                    configVersion: current,
+                });
+            }
+        }
         try {
-            writeInstanceConfig(instanceConfigPath(cfg), pairs);
+            writeInstanceConfig(configPath, pairs);
         }
         catch (err) {
             return reply.code(500).send({ error: `failed to write config file: ${err.message}` });
         }
         // The write lands in the file but NOT in the running (frozen) config.
-        return { restartRequired: true, configPath: instanceConfigPath(cfg) };
+        return {
+            restartRequired: true,
+            configPath,
+            configVersion: instanceConfigVersion(configPath),
+        };
     });
     // Selectable models + the keeper/sweeper defaults (CONTRACT-v3 §3). The offered
     // models are the instance ALLOW-LIST (issue #457 Step 2): the built-in catalog

package/packages/server/dist/routes/projects.js

@@ -13,7 +13,14 @@ import { quiesceProject, turnRunningError } from "../turn-interlock.js";
  * (#553): the badge's semantics are "whatever this function returns", and there
  * is no second implementation for the root to drift from. The completed-turn
  * side comes from the cheap job-record scan (grouped by keeper agent), so this
- * costs no `listSessions` fan-out and no transcript parse.
+ * costs no transcript parse; `live` adds one cached session listing per
+ * workspace (see {@link liveSessionIds}).
+ *
+ * Two things are pruned OUT of the raw job-record fold, and the invariant they
+ * add up to is: **the badge counts exactly what the Home Unread feed counts.**
+ * A chat that no longer exists, and a chat the user archived. #488 made read
+ * state server-authoritative so surfaces could not diverge; a badge counting
+ * chats `/chats/attention` does not is that divergence one layer up.
  *
  * `key` is a WORKSPACE key, so `""` (the root) is a perfectly ordinary argument:
  * `turnsByProject` is already keyed that way (`lastTurnCompletedAtByProject`
@@ -21,12 +28,27 @@ import { quiesceProject, turnRunningError } from "../turn-interlock.js";
  * `keeperAgentName("")` encodes to `keeper-_root`. Nothing here may test `key`
  * for truthiness.
  */
-async function buildChatTurns(key, turnsByProject, user, readState, unread) {
+async function buildChatTurns(key, turnsByProject, live, user, readState, unread, archive) {
     const bySession = turnsByProject.get(key);
     if (!bySession)
         return [];
     const keeper = keeperAgentName(key);
-    return Promise.all([...bySession].map(async ([sessionId, lastTurnCompletedAt]) => {
+    const rows = await Promise.all([...bySession].map(async ([sessionId, lastTurnCompletedAt]) => {
+        // #732, prune 1 — a chat that no longer exists. The job records this fold
+        // reads are removed with the chat now, but that cannot heal a badge
+        // already stuck, and a transcript can leave by routes that are not a
+        // delete at all (an adoption undone, a JSONL removed by hand). `live` is
+        // `null` when the listing FAILED, which is not the same as empty: an
+        // unreadable chat store must leave the badge alone, not silently zero it.
+        if (live && !live.has(sessionId))
+            return null;
+        // #732, prune 2 — archiving is the user saying "stop bothering me about
+        // this one", and `/chats/attention` has always honoured that. The badge
+        // did not, so the sidebar could read 3 while the Home Unread feed showed
+        // nothing. One rule, both surfaces: archived is silent. It is silenced,
+        // not consumed — unarchiving brings the chat back to both.
+        if (await archive.isArchived(keeper, sessionId).catch(() => false))
+            return null;
         const lastSeen = await readState.getLastSeen(user, keeper, sessionId).catch(() => 0);
         // Manual unread override (#458): carry it so the sidebar's workspace
         // unread badge counts a manually-flagged chat, staying in step with
@@ -39,14 +61,42 @@ async function buildChatTurns(key, turnsByProject, user, readState, unread) {
             ...(isUnread ? { unread: true } : {}),
         };
     }));
+    return rows.filter((r) => r !== null);
+}
+/**
+ * The session ids a workspace actually still has, for {@link buildChatTurns}'s
+ * prune — or `null` if we could not find out.
+ *
+ * That distinction is the whole point: a failed listing must NOT be read as "no
+ * chats", or a transient discovery error would empty the badge instead of
+ * leaving it alone. `listSessions` is a superset of the keeper chats the fold
+ * covers (it also returns hook-agent chats), which is the safe direction — it
+ * can only fail to prune, never over-prune.
+ *
+ * This costs one session listing per workspace on `GET /api/projects`, which
+ * #529 was careful to keep off this route. It is affordable because it is not
+ * the expensive half: the listing is a cached directory read (core's discovery
+ * cache is mtime-keyed with a TTL), whereas the 61%-of-CPU problem #529 fixed
+ * was YAML-parsing every job record. `/chats/attention` already does exactly
+ * this listing across the whole fleet on the Home tab.
+ */
+async function liveSessionIds(herdctl, project) {
+    if (!project)
+        return null;
+    try {
+        return new Set((await herdctl.listSessions(project)).map((s) => s.sessionId));
+    }
+    catch {
+        return null;
+    }
 }
 export function registerProjectRoutes(app, ctx) {
-    const { projects, herdctl, git, readState, unread, readStateUser } = ctx;
+    const { projects, herdctl, git, readState, unread, archive, readStateUser } = ctx;
     app.get("/api/projects", {
         schema: {
             tags: ["Projects"],
             summary: "List projects",
-            description: "Returns `{ projects, root }`. `projects` is an array of the root workspace's CHILDREN; each entry carries the project metadata plus a compact `chatTurns` array (per-chat `{ sessionId, lastTurnCompletedAt, lastSeen? }` for the sidebar UNREAD count) and a `dirty` uncommitted-file count. `root` is the ROOT workspace itself, carrying the same `chatTurns` field so the sidebar's Home entry gets the identical badge; it is `null` only if the root record could not be read.",
+            description: "Returns `{ projects, root }`. `projects` is an array of the root workspace's CHILDREN; each entry carries the project metadata plus a compact `chatTurns` array (per-chat `{ sessionId, lastTurnCompletedAt, lastSeen? }` for the sidebar UNREAD count) and a `dirty` uncommitted-file count. `chatTurns` covers only chats that still EXIST and are not ARCHIVED, so the badge cannot outlive its chats (#732) and agrees with `/chats/attention` on archived ones. `root` is the ROOT workspace itself, carrying the same `chatTurns` field so the sidebar's Home entry gets the identical badge; it is `null` only if the root record could not be read.",
             response: {
                 200: {
                     description: "Object with a `projects` array (each item a project enriched with `chatTurns` and `dirty`) and a `root` workspace object enriched with `chatTurns`.",
@@ -79,7 +129,7 @@ export function registerProjectRoutes(app, ctx) {
         const user = readStateUser(req);
         const projectsOut = await Promise.all(list.map(async (p) => ({
             ...p,
-            chatTurns: await buildChatTurns(p.slug, turnsByProject, user, readState, unread),
+            chatTurns: await buildChatTurns(p.slug, turnsByProject, await liveSessionIds(herdctl, p), user, readState, unread, archive),
             // The cheap store-wide sweep above buckets by path segment under
             // `projectsRoot`, so it can only speak for projects whose working dir is
             // the metadata dir. For one pointing somewhere else (a linked checkout,
@@ -94,7 +144,10 @@ export function registerProjectRoutes(app, ctx) {
         // a file directly in the projects root has no bucket at all. Reporting 0
         // would be a fabricated clean; the field is optional, so it stays absent.
         const rootOut = root
-            ? { ...root, chatTurns: await buildChatTurns(ROOT_KEY, turnsByProject, user, readState, unread) }
+            ? {
+                ...root,
+                chatTurns: await buildChatTurns(ROOT_KEY, turnsByProject, await liveSessionIds(herdctl, root), user, readState, unread, archive),
+            }
             : null;
         return { projects: projectsOut, root: rootOut };
     });
@@ -437,6 +490,17 @@ export function registerProjectWorkspaceRoutes(app, ctx) {
             catch (err) {
                 req.log.warn({ err }, "keeper-agent unregister failed (project dir already removed)");
             }
+            // #734: and its herdctl JOB RECORDS, which `remove()` cannot reach — they
+            // live in the shared fleet-wide jobs dir, not under the project. They are
+            // keyed by agent name, which is derived from the slug, which is derived
+            // from the NAME: leaving them behind means a project created later with
+            // the same name inherits this one's run history — prompt text and reply
+            // summaries — plus a phantom unread badge over zero chats.
+            await herdctl
+                .purgeProjectJobs(project.slug, Object.keys(project.hooks ?? {}), Object.keys(project.triggers ?? {}))
+                .catch((err) => {
+                req.log.warn({ err }, "job-record purge failed (project is still deleted)");
+            });
             return reply.code(200).send({ ok: true, slug: project.slug });
         }
         catch (err) {

package/packages/server/dist/ws-protocol.d.ts

@@ -233,6 +233,26 @@ export interface ChatSetQueueMessage {
          * stored as the enqueue time — the server stamps that itself.
          */
         ts?: number | null;
+        /**
+         * Files staged in the composer that must ride the queued message (#728).
+         *
+         * Attachments used to be consumed ONLY by `chat:send`, so a message queued
+         * during a live turn left them staged: the tray never cleared and the file
+         * silently rode whatever the user sent next — a message they never meant to
+         * attach it to. They belong to the queued message, so they travel with it into
+         * the shared slot and are sent by the drain.
+         *
+         * Merged into the slot as a UNION BY ID, never a replace: a write can only
+         * ever ADD to what is staged, so one client's `set_queue` cannot silently drop
+         * another's file, and a client re-asserting its queue on reload (which by then
+         * has an empty tray) is a no-op rather than a wipe. Attachments leave the slot
+         * only when it is cleared outright or popped back to a composer.
+         */
+        attachments?: Array<{
+            id: string;
+            filename: string;
+            kind?: string;
+        }>;
     };
 }
 /**
@@ -393,6 +413,16 @@ export interface ChatQueuedFlushedMessage {
          * when the frame is just telling the client to clear a stale/already-sent copy.
          */
         text?: string;
+        /**
+         * The attachments that rode the drained message (#728), so the client renders
+         * the auto-sent user bubble with its files exactly as a live send does. Only
+         * present alongside `text` (a clear-only frame carries neither).
+         */
+        attachments?: Array<{
+            id: string;
+            filename: string;
+            kind?: string;
+        }>;
     };
 }
 /**
@@ -414,6 +444,17 @@ export interface ChatQueuedStateMessage {
         sessionId: string;
         /** The chat's full queued text, or null when the slot is now empty. */
         text: string | null;
+        /**
+         * The files staged on the slot (#728). Shared exactly like the text is: every
+         * attached client renders the same chips, so a file queued on one device is
+         * visible on the other rather than being invisible state that surfaces only
+         * when the drain sends it. Absent/empty when the slot holds no attachments.
+         */
+        attachments?: Array<{
+            id: string;
+            filename: string;
+            kind?: string;
+        }>;
         /**
          * The slot's identity. A client adopts it as its own queue id, so its next
          * edit updates this shared slot in place rather than appending beside it.
@@ -451,6 +492,17 @@ export interface ChatQueuedReturnedMessage {
         sessionId: string;
         /** The queued text, for the client to put back in its composer. */
         text: string;
+        /**
+         * The files that were staged on the slot (#728), for the client to put back in
+         * its attachment tray. Stop returns the whole message, not just its prose —
+         * dropping the files here would be the same silent loss under a different name,
+         * and leaving them on the (now cleared) slot would strand them server-side.
+         */
+        attachments?: Array<{
+            id: string;
+            filename: string;
+            kind?: string;
+        }>;
     };
 }
 /**

package/packages/server/dist/ws-protocol.js

@@ -166,6 +166,28 @@ export function resolveTurnUsage(state) {
         outputTokens: Math.max(base.outputTokens, state.cumulative?.outputTokens ?? 0),
     };
 }
+/**
+ * Validate an optional wire list of composer attachment refs (#328/#728). Shared
+ * by `chat:send` and `chat:set_queue` — the queue carries the same refs the send
+ * does, so it validates them the same way rather than by a second, drifting copy.
+ * `undefined` is valid (the field is optional everywhere it appears).
+ */
+function isAttachmentRefList(v) {
+    if (v === undefined)
+        return true;
+    if (!Array.isArray(v))
+        return false;
+    for (const a of v) {
+        if (!a || typeof a !== "object")
+            return false;
+        const ao = a;
+        if (typeof ao.id !== "string" || typeof ao.filename !== "string")
+            return false;
+        if (ao.kind !== undefined && typeof ao.kind !== "string")
+            return false;
+    }
+    return true;
+}
 export function isClientMessage(data) {
     if (typeof data !== "object" || data === null)
         return false;
@@ -187,19 +209,8 @@ export function isClientMessage(data) {
             return false;
         if (p.model !== undefined && typeof p.model !== "string")
             return false;
-        if (p.attachments !== undefined) {
-            if (!Array.isArray(p.attachments))
-                return false;
-            for (const a of p.attachments) {
-                if (!a || typeof a !== "object")
-                    return false;
-                const ao = a;
-                if (typeof ao.id !== "string" || typeof ao.filename !== "string")
-                    return false;
-                if (ao.kind !== undefined && typeof ao.kind !== "string")
-                    return false;
-            }
-        }
+        if (!isAttachmentRefList(p.attachments))
+            return false;
         return p.sessionId === undefined || p.sessionId === null || typeof p.sessionId === "string";
     }
     if (m.type === "chat:command") {
@@ -247,6 +258,10 @@ export function isClientMessage(data) {
             return false;
         if (p.qid !== undefined && p.qid !== null && typeof p.qid !== "string")
             return false;
+        // The queued message carries the composer's staged files (#728), validated
+        // exactly as `chat:send` validates its own.
+        if (!isAttachmentRefList(p.attachments))
+            return false;
         return true;
     }
     return false;

package/packages/server/dist/ws.js

@@ -57,7 +57,7 @@ import { keeperAgentName, keeperSlugFromAgent, } from "./herdctl.js";
 import { consumeResumedTurn } from "./resume-drain.js";
 import { isKnownModel, getContextLimit, DEFAULT_MODEL, isKnownDriveMode, } from "./models.js";
 import { SessionHub } from "./session-hub.js";
-import { partsOf } from "./queued-message.js";
+import { hasQueuedContent, partsOf, } from "./queued-message.js";
 import { resolveAttachmentsConfig } from "./attachments-config.js";
 import { wrapAttachments, inferAttachmentKind } from "./attachments-hint.js";
 import { sendFileServerDef, SEND_FILE_SERVER_KEY } from "./send-file-mcp.js";
@@ -476,15 +476,16 @@ export function makeChatHandler(deps) {
                 void deps.queuedMessage
                     .get(keeperAgentName(slug), sessionId)
                     .then((queued) => {
-                    if (!queued?.text)
+                    if (!hasQueuedContent(queued))
                         return;
                     send({
                         type: "chat:queued_state",
                         payload: {
                             projectSlug: slug,
                             sessionId,
-                            text: queued.text,
+                            text: queued.text || null,
                             ...(queued.id ? { qid: queued.id } : {}),
+                            ...(queued.attachments?.length ? { attachments: queued.attachments } : {}),
                         },
                     });
                 })
@@ -499,6 +500,29 @@ export function makeChatHandler(deps) {
         // `take` makes the read+clear atomic so two concurrent drains can never both
         // send it; the flushed-parts ledger skips what was already drained (a stale
         // client re-assert on reload) so it isn't sent twice.
+        /**
+         * Put attachments the drain could not carry back onto the (now empty) slot as
+         * an attachments-only queued message, and tell every client (#728). Only the
+         * slash-command path uses this: a command cannot carry files, and dropping
+         * them here would be the silent loss this whole change is about.
+         */
+        const restageAttachments = async (slug, sessionId, attachments) => {
+            if (!deps.queuedMessage)
+                return;
+            const agent = keeperAgentName(slug);
+            await deps.queuedMessage
+                .set(agent, sessionId, {
+                text: "",
+                createdAtMs: Date.now(),
+                id: randomUUID(),
+                attachments,
+            })
+                .catch(() => undefined);
+            hub.broadcast(sessionId, {
+                type: "chat:queued_state",
+                payload: { projectSlug: slug, sessionId, text: null, attachments },
+            });
+        };
         const drainQueue = async (slug, sessionId) => {
             if (!deps.queuedMessage)
                 return;
@@ -509,7 +533,9 @@ export function makeChatHandler(deps) {
                 return;
             const agent = keeperAgentName(slug);
             const queued = await deps.queuedMessage.take(agent, sessionId).catch(() => null);
-            if (!queued?.text)
+            // A slot with no prose but staged files is a real message (#328/#728), so
+            // "is there anything here" is content, not text.
+            if (!hasQueuedContent(queued) || !queued)
                 return;
             const markerKey = `${agent}${KEY_SEP}${sessionId}`;
             // Parked by a Stop we couldn't hand back (see returnQueueToComposer): the
@@ -539,28 +565,44 @@ export function makeChatHandler(deps) {
             const parts = partsOf(queued);
             const stale = parts.some((p) => ledger.get(p.id)?.has(p.text));
             const text = stale ? "" : queued.text;
+            // A leading-slash queued message is a slash command (e.g. "/compact"): the
+            // CLI dispatches it, and a command carries no attachments — exactly as the
+            // live composer refuses to attach files to one. Keep them on the slot rather
+            // than destroying them: they stay visible as a queued message of their own
+            // and go out after the command's turn, which is the only outcome here that
+            // isn't silent loss (#728). Unreachable from the current client, which never
+            // stages files onto a slash-command queue; reachable if one ever appends
+            // prose + a file behind an already-queued command.
+            const isCommand = !stale && text.startsWith("/");
+            const attachments = stale || isCommand ? [] : (queued.attachments ?? []);
+            // An attachments-only slot has no text but is still a real message
+            // (#328/#728), so what makes this a send is CONTENT, not prose.
+            const sending = !stale && (Boolean(text) || attachments.length > 0);
             // Tell every attached client (origin + reconnected sockets) to clear its copy
-            // of this message. When we're really sending it, carry the text so the client
-            // renders the sent bubble in-transcript; on a stale re-assert we only clear.
+            // of this message. When we're really sending it, carry the text + attachments
+            // so the client renders the sent bubble in-transcript exactly as a live send
+            // does; on a stale re-assert we only clear.
             hub.broadcast(sessionId, {
                 type: "chat:queued_flushed",
                 payload: {
                     projectSlug: slug,
                     sessionId,
-                    ...(text ? { text } : {}),
+                    ...(sending && text ? { text } : {}),
+                    ...(sending && attachments.length > 0 ? { attachments } : {}),
                 },
             });
-            if (!text)
+            if (!sending)
                 return;
             // Every identity this slot carried is now flushed, so a re-assert from any
             // client that held one of them is recognised rather than sent again.
             for (const p of parts)
                 rememberFlushed(ledger, p.id, p.text);
             // Broadcast the flush frame BEFORE kicking the turn so the user bubble renders
-            // above the reply. Run it detached, like a human send. A leading-slash queued
-            // message is a slash command (e.g. "/compact"): route it through the command
-            // path so the CLI dispatches it — matching how the composer sends one live.
-            if (text.startsWith("/")) {
+            // above the reply. Run it detached, like a human send.
+            if (isCommand) {
+                if ((queued.attachments?.length ?? 0) > 0) {
+                    void restageAttachments(slug, sessionId, queued.attachments);
+                }
                 void onChatCommand({
                     type: "chat:command",
                     payload: { projectSlug: slug, command: text, sessionId },
@@ -569,7 +611,14 @@ export function makeChatHandler(deps) {
             else {
                 void onChatSend({
                     type: "chat:send",
-                    payload: { projectSlug: slug, sessionId, message: text },
+                    payload: {
+                        projectSlug: slug,
+                        sessionId,
+                        message: text,
+                        // The files the user staged behind this message (#728). They used to
+                        // stay in the composer tray and ride whatever was sent NEXT.
+                        ...(attachments.length > 0 ? { attachments } : {}),
+                    },
                 });
             }
         };
@@ -582,6 +631,9 @@ export function makeChatHandler(deps) {
                 return;
             const sessionId = msg.payload.sessionId ?? null;
             const text = msg.payload.text ?? null;
+            // The composer's staged files ride the queued message (#728). They merge
+            // additively into the slot, so a write that carries none never removes any.
+            const attachments = msg.payload.attachments ?? [];
             // Every chat belongs to a workspace keeper.
             const agent = keeperAgentName(slug);
             if (!sessionId) {
@@ -589,12 +641,15 @@ export function makeChatHandler(deps) {
                 // re-asserts it (same qid) once the id resolves, so it persists then.
                 return;
             }
-            // Store or clear the queued message.
-            if (text && text.trim().length > 0) {
+            // Store or clear the queued message. A slot with staged files but no prose is
+            // a real message (#328: an attachment-only send is valid), so "is there
+            // anything to store" is text OR attachments — it used to be text alone, which
+            // is why an attachment-only submit during a live turn was a silent no-op.
+            if ((text && text.trim().length > 0) || attachments.length > 0) {
                 // A queued message is persisted verbatim and the whole sidecar is rewritten
                 // on every mutation, so an unbounded one is a cheap way to bloat the data
                 // dir. Refuse it loudly rather than silently truncating the user's text.
-                if (text.length > MAX_QUEUED_CHARS) {
+                if (text != null && text.length > MAX_QUEUED_CHARS) {
                     send({
                         type: "chat:error",
                         payload: {
@@ -611,7 +666,7 @@ export function makeChatHandler(deps) {
                 // first client's message with no signal to anyone — and then rendered it,
                 // in that client's own transcript, as a user bubble they never typed.
                 const next = await deps.queuedMessage
-                    .upsert(agent, sessionId, { id: queueIdOf(msg.payload), text }, Date.now(), randomUUID)
+                    .upsert(agent, sessionId, { id: queueIdOf(msg.payload), text: text ?? "", attachments }, Date.now(), randomUUID)
                     .catch(() => undefined);
                 // The queue is shared chat state, so announce it: every attached client
                 // renders the same slot, and echoing `qid` back on its next write is how a
@@ -623,8 +678,9 @@ export function makeChatHandler(deps) {
                         payload: {
                             projectSlug: slug,
                             sessionId,
-                            text: next?.text ?? null,
+                            text: next?.text || null,
                             ...(next?.id ? { qid: next.id } : {}),
+                            ...(next?.attachments?.length ? { attachments: next.attachments } : {}),
                         },
                     });
                 }
@@ -1247,8 +1303,9 @@ export function makeChatHandler(deps) {
             return;
         const agent = keeperAgentName(slug);
         const queued = await deps.queuedMessage.take(agent, sessionId).catch(() => null);
-        if (!queued?.text)
+        if (!hasQueuedContent(queued) || !queued)
             return;
+        const attachments = queued.attachments ?? [];
         const live = to && to.readyState === to.OPEN ? to : null;
         if (!live) {
             // Nobody to hand it to — the tab closed between the Stop and this turn
@@ -1268,18 +1325,26 @@ export function makeChatHandler(deps) {
                 payload: {
                     projectSlug: slug,
                     sessionId,
-                    text: queued.text,
+                    text: queued.text || null,
                     ...(queued.id ? { qid: queued.id } : {}),
+                    ...(attachments.length > 0 ? { attachments } : {}),
                 },
             });
             return;
         }
-        // The stopping client gets the text; everyone else just sees the shared slot
-        // clear, WITH a reason — a chip vanishing from under you with no explanation
-        // is the same silence that made #629 bite.
+        // The stopping client gets the text AND the files staged behind it (#728) —
+        // Stop returns the whole message, and a file left on the cleared slot would be
+        // stranded server-side. Everyone else just sees the shared slot clear, WITH a
+        // reason — a chip vanishing from under you with no explanation is the same
+        // silence that made #629 bite.
         writeFrame(live, {
             type: "chat:queued_returned",
-            payload: { projectSlug: slug, sessionId, text: queued.text },
+            payload: {
+                projectSlug: slug,
+                sessionId,
+                text: queued.text,
+                ...(attachments.length > 0 ? { attachments } : {}),
+            },
         });
         hub.broadcast(sessionId, {
             type: "chat:queued_state",

package/packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paddock/server",
-  "version": "0.66.1",
+  "version": "0.66.2",
   "private": true,
   "type": "module"
 }

package/packages/web/dist/assets/InstanceConfigPage-DKzAHOhx.js

@@ -0,0 +1,2 @@
+import{r as p,k as Y,b as w,j as t,A as B,l as Z,X as _,m as ee,n as te,p as ne,M as re,q as se}from"./index-DGNSeqL-.js";function ae(){const[e,n]=p.useState(null),[i,o]=p.useState(!0),[s,c]=p.useState(null),[l,h]=p.useState({}),[u,$]=p.useState(!1),[A,y]=p.useState(null),[D,S]=p.useState(!1),[f,q]=p.useState(""),[v,G]=p.useState(!1),[P,O]=p.useState(null),R=p.useRef(null),z=Y("(min-width: 1024px)");p.useEffect(()=>{let r=!0;return o(!0),w.getInstanceConfig().then(a=>{r&&(n(a),c(null))}).catch(a=>r&&c(a instanceof Error?a.message:String(a))).finally(()=>r&&o(!1)),()=>{r=!1}},[]);const H=(r,a)=>{S(!1),y(null),h(d=>({...d,[r]:a}))},K=r=>L(r,l),C=p.useMemo(()=>e?e.groups.flatMap(r=>r.fields):[],[e]),x=p.useMemo(()=>C.filter(r=>r.editable&&!r.envOverridden).filter(r=>Object.prototype.hasOwnProperty.call(l,r.key)).filter(r=>!M(l[r.key],T(r))).map(r=>r.key),[C,l]),I=p.useMemo(()=>new Set(x),[x]),m=p.useMemo(()=>{if(!e)return[];const r=f.trim().toLowerCase(),a=[];for(const d of e.groups){const g=r!==""&&d.label.toLowerCase().includes(r),j=d.fields.filter(b=>{const N=L(b,l);return v&&M(N,b.default)?!1:r===""||g?!0:fe(b).includes(r)});j.length>0&&a.push({...d,fields:j})}return a},[e,f,v,l]),V=m.reduce((r,a)=>r+a.fields.length,0),X=f.trim()!==""||v,J=m.some(r=>r.fields.some(a=>a.envOverridden));p.useEffect(()=>{const r=R.current;if(!r||m.length===0)return;const a=m.map(g=>g.id),d=()=>{const g=r.getBoundingClientRect().top;let j=a[0];for(const b of a){const N=document.getElementById(F(b));if(N)if(N.getBoundingClientRect().top-g<=80)j=b;else break}O(j)};return d(),r.addEventListener("scroll",d,{passive:!0}),()=>r.removeEventListener("scroll",d)},[m]);const Q=r=>{var d;const a=document.getElementById(F(r));(d=a==null?void 0:a.scrollIntoView)==null||d.call(a,{behavior:"smooth",block:"start"}),O(r)},U=async()=>{if(x.length===0||!e)return;const r={};for(const a of x)r[a]=l[a];$(!0),y(null);try{await w.updateInstanceConfig(r,e.configVersion);const a=await w.getInstanceConfig();n(a),h({}),S(!0)}catch(a){if(a instanceof te&&a.status===409)try{n(await w.getInstanceConfig())}catch{}y(a instanceof Error?a.message:String(a))}finally{$(!1)}},W=()=>{h({}),y(null),S(!1)};return t.jsxs(t.Fragment,{children:[t.jsxs("div",{className:"flex min-h-0 flex-1",children:[e&&t.jsx(ie,{groups:m,active:P,onJump:Q,dirtyCount:be(m,I)}),t.jsxs("div",{className:"flex min-h-0 min-w-0 flex-1 flex-col",children:[e&&t.jsx(oe,{query:f,onQuery:q,modifiedOnly:v,onModifiedOnly:G,visibleCount:V,totalCount:C.length,filtering:X,autoFocus:z}),t.jsx("div",{ref:R,className:"min-h-0 flex-1 overflow-y-auto px-4 py-5 sm:px-6",children:t.jsxs("div",{className:"mx-auto max-w-4xl",children:[t.jsx(le,{saved:D,configPath:e==null?void 0:e.configPath,restartRequired:(e==null?void 0:e.restartRequired)??!1,fileError:e==null?void 0:e.configFileError}),i&&t.jsx("p",{className:"text-sm text-paddock-500",children:"Loading…"}),s&&t.jsxs("p",{className:"text-sm text-red-600 dark:text-red-400",role:"alert",children:["Failed to load settings: ",s]}),e&&J&&t.jsx(de,{}),e&&V===0&&t.jsxs("p",{className:"py-8 text-center text-sm text-paddock-500",children:["No settings match"," ",f.trim()?t.jsxs(t.Fragment,{children:["“",t.jsx("span",{className:"font-medium",children:f.trim()}),"”"]}):"this filter","."]}),m.map((r,a)=>t.jsx(ce,{group:r,first:a===0,children:t.jsx("div",{className:"grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-2",children:r.fields.map(d=>t.jsx(pe,{field:d,value:K(d),dirty:I.has(d.key),onChange:g=>H(d.key,g)},d.key))})},r.id))]})})]})]}),e&&t.jsxs("footer",{className:"flex items-center gap-3 border-t border-paddock-200 px-4 py-3 dark:border-paddock-800 sm:px-6",children:[A&&t.jsxs("span",{className:"flex items-center gap-1.5 text-[13px] text-red-600 dark:text-red-400",role:"alert",children:[t.jsx(B,{width:14,height:14,className:"shrink-0"}),A]}),t.jsx("span",{className:"ml-auto text-[12px] text-paddock-400",children:x.length>0?`${x.length} unsaved change${x.length===1?"":"s"}`:"No changes"}),t.jsx("button",{type:"button",className:"btn-subtle",onClick:W,disabled:x.length===0||u,children:"Reset"}),t.jsx("button",{type:"button",className:"btn-primary",onClick:U,disabled:x.length===0||u,children:u?"Saving…":"Save changes"})]})]})}function ie({groups:e,active:n,onJump:i,dirtyCount:o}){return t.jsx("nav",{"aria-label":"Config sections",className:"hidden w-52 shrink-0 overflow-y-auto border-r border-paddock-200 px-2 py-4 dark:border-paddock-800 lg:block",children:t.jsx("ul",{className:"space-y-0.5",children:e.map(s=>{const c=s.id===n,l=o[s.id]??0;return t.jsx("li",{children:t.jsxs("button",{type:"button",onClick:()=>i(s.id),"aria-current":c?"true":void 0,className:`flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left text-[13px] transition-colors ${c?"bg-paddock-100 font-medium text-paddock-900 dark:bg-paddock-800 dark:text-paddock-100":"text-paddock-500 hover:bg-paddock-100/60 hover:text-paddock-800 dark:hover:bg-paddock-800/50 dark:hover:text-paddock-200"}`,children:[t.jsx("span",{className:"min-w-0 flex-1 truncate",children:s.label}),l>0&&t.jsx("span",{className:"h-1.5 w-1.5 shrink-0 rounded-full bg-accent","aria-label":`${l} unsaved`}),t.jsx("span",{className:"shrink-0 text-[11px] tabular-nums text-paddock-400",children:s.fields.length})]})},s.id)})})})}function oe({query:e,onQuery:n,modifiedOnly:i,onModifiedOnly:o,visibleCount:s,totalCount:c,filtering:l,autoFocus:h}){return t.jsxs("div",{className:"flex flex-wrap items-center gap-2 border-b border-paddock-200 px-4 py-2.5 dark:border-paddock-800 sm:px-6",children:[t.jsxs("div",{className:"relative min-w-0 flex-1 sm:max-w-sm",children:[t.jsx(Z,{width:14,height:14,className:"pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-paddock-400"}),t.jsx("input",{type:"search","aria-label":"Search settings",placeholder:"Search settings, keys, env vars…",className:"input h-8 w-full pl-8 pr-7 text-[13px] [&::-webkit-search-cancel-button]:appearance-none",value:e,autoFocus:h,onChange:u=>n(u.target.value),onKeyDown:u=>{u.key==="Escape"&&e!==""&&(u.preventDefault(),n(""))}}),e!==""&&t.jsx("button",{type:"button","aria-label":"Clear search",onClick:()=>n(""),className:"absolute right-2 top-1/2 -translate-y-1/2 text-paddock-400 hover:text-paddock-700 dark:hover:text-paddock-200",children:t.jsx(_,{width:13,height:13})})]}),t.jsx("button",{type:"button","aria-pressed":i,onClick:()=>o(!i),className:`shrink-0 rounded-md border px-2.5 py-1 text-[12px] transition-colors ${i?"border-accent/60 bg-accent/10 text-accent":"border-paddock-200 text-paddock-500 hover:text-paddock-800 dark:border-paddock-700 dark:hover:text-paddock-200"}`,children:"Modified only"}),t.jsx("span",{className:"shrink-0 text-[12px] tabular-nums text-paddock-400",children:l?`${s} of ${c}`:`${c} settings`})]})}function le({saved:e,configPath:n,restartRequired:i,fileError:o}){const s=o?"red":e?"emerald":"amber";return t.jsxs("div",{role:"status",className:`mb-5 flex items-start gap-2 rounded-lg border px-3 py-2.5 text-[13px] leading-snug ${s==="red"?"border-red-300 bg-red-50 text-red-800 dark:border-red-700/60 dark:bg-red-900/20 dark:text-red-300":s==="emerald"?"border-emerald-300 bg-emerald-50 text-emerald-800 dark:border-emerald-700/60 dark:bg-emerald-900/20 dark:text-emerald-300":"border-amber-300 bg-amber-50 text-amber-800 dark:border-amber-700/60 dark:bg-amber-900/20 dark:text-amber-300"}`,children:[s==="emerald"?t.jsx(ee,{width:15,height:15,className:"mt-0.5 shrink-0"}):t.jsx(B,{width:15,height:15,className:"mt-0.5 shrink-0"}),t.jsx("span",{children:o?t.jsxs(t.Fragment,{children:[t.jsxs("strong",{children:["Could not read ",E(n),"."]})," ",o," — the values below are the running instance's; what a restart would load is unknown until the file parses."]}):e?t.jsxs(t.Fragment,{children:[t.jsx("strong",{children:"Saved to disk."})," These changes take effect only after the server restarts."]}):i?t.jsxs(t.Fragment,{children:[t.jsx("strong",{children:"Restart pending."})," ",t.jsx("code",{className:"font-mono text-[12px]",children:E(n)})," holds changes the running instance has not picked up — the fields below marked"," ",t.jsx(k,{tone:"amber",children:"restart"})," differ from what is in force right now."]}):t.jsxs(t.Fragment,{children:["Changes here are written to ",t.jsx("code",{className:"font-mono text-[12px]",children:E(n)})," ","and take effect only after the server restarts — the running instance keeps its current config until then."]})})]})}function de(){return t.jsxs("p",{className:"mb-5 text-[12px] leading-snug text-paddock-500",children:["Settings marked ",t.jsx(k,{tone:"amber",children:"env"})," are overridden by an environment variable, which wins over this file — edit that variable (and restart) to change them."]})}function ce({group:e,first:n,children:i}){return t.jsxs("section",{id:F(e.id),className:`scroll-mt-4 ${n?"":"mt-9 border-t border-paddock-200 pt-7 dark:border-paddock-800"}`,children:[t.jsx("h2",{className:"text-base font-semibold tracking-tight text-paddock-900 dark:text-paddock-50",children:e.label}),e.description&&t.jsx("p",{className:"mt-1 text-[12px] leading-snug text-paddock-500",children:e.description}),t.jsx("div",{className:"mt-4",children:i})]})}function pe({field:e,value:n,dirty:i,onChange:o}){const s=!e.editable||e.envOverridden,c=`cfg-${e.key}`,l=e.type==="boolean";return t.jsxs("div",{className:`min-w-0 ${ge(e,n)?"sm:col-span-2":""} ${i?"-ml-2.5 border-l-2 border-accent pl-2":""}`,children:[t.jsxs("div",{className:"flex items-center justify-between gap-2",children:[t.jsxs("label",{htmlFor:s||l?void 0:c,className:"min-w-0 text-[13px] font-medium",children:[t.jsx("span",{className:"align-middle",children:e.label}),e.sensitive&&t.jsx(k,{tone:"amber",children:"sensitive"}),e.envOverridden&&t.jsx(k,{tone:"amber",title:`Overridden by environment variable ${e.envVar} — edit that env var (and restart) to change it.`,children:"env"}),!e.editable&&!e.envOverridden&&t.jsx(k,{tone:"plain",children:"read-only"}),e.pendingRestart&&t.jsx(k,{tone:"amber",title:"The config file and the running instance disagree on this field — restart to apply.",children:"restart"})]}),l&&!s&&t.jsx(ue,{id:c,checked:!!n,onChange:o,label:e.label})]}),e.help&&t.jsx("p",{className:"mt-0.5 text-[12px] leading-snug text-paddock-500",children:e.help}),s?t.jsx(he,{field:e,value:n}):!l&&t.jsx(me,{field:e,value:n,onChange:o,inputId:c}),e.envOverridden&&t.jsx("p",{className:"mt-1 truncate font-mono text-[11px] text-amber-600 dark:text-amber-500/90",children:e.envVar}),e.pendingRestart&&t.jsxs("p",{className:"mt-1 text-[11px] leading-snug text-amber-600 dark:text-amber-500/90",children:["In force now: ",t.jsx("span",{className:"font-mono",children:xe(e.value)})]})]})}function xe(e){if(e==null||e==="")return"(not set)";const i=(Array.isArray(e)?e.join(", "):String(e)).replace(/\s+/g," ").trim();return i.length>60?`${i.slice(0,60)}…`:i}function k({children:e,tone:n,title:i}){return t.jsx("span",{title:i,className:`ml-1.5 rounded px-1 py-px align-middle text-[10px] font-semibold uppercase tracking-wide ${n==="amber"?"bg-amber-100 text-amber-700 dark:bg-amber-900/40 dark:text-amber-400":"bg-paddock-100 text-paddock-500 dark:bg-paddock-800 dark:text-paddock-400"}`,children:e})}function ue({id:e,checked:n,onChange:i,label:o}){return t.jsxs("label",{htmlFor:e,className:"relative shrink-0 cursor-pointer",children:[t.jsx("input",{id:e,type:"checkbox","aria-label":o,className:"peer sr-only",checked:n,onChange:s=>i(s.target.checked)}),t.jsx("span",{className:"block h-[18px] w-8 rounded-full bg-paddock-300 transition-colors after:absolute after:left-[2px] after:top-[2px] after:h-[14px] after:w-[14px] after:rounded-full after:bg-white after:transition-transform after:content-[''] peer-checked:bg-accent peer-checked:after:translate-x-[14px] peer-focus-visible:ring-2 peer-focus-visible:ring-accent/50 dark:bg-paddock-700"})]})}function me({field:e,value:n,onChange:i,inputId:o}){if(e.type==="enum")return t.jsx("select",{id:o,className:"input mt-1.5",value:String(n??""),onChange:s=>i(s.target.value),children:(e.enumValues??[]).map(s=>t.jsx("option",{value:s,children:s},s))});if(e.type==="number")return t.jsx("input",{id:o,type:"number",className:"input mt-1.5",value:n==null?"":String(n),placeholder:e.default===null?"default":String(e.default),onChange:s=>i(s.target.value===""?null:Number(s.target.value))});if(e.type==="text"){const s=n==null||n===e.default,c=n==null?String(e.default??""):String(n),l=typeof e.default=="string"&&!s;return t.jsxs("div",{className:"mt-1.5",children:[t.jsx("textarea",{id:o,className:"input min-h-[7rem] resize-y font-mono text-[12px] leading-relaxed",rows:6,spellCheck:!1,value:c,onChange:h=>i(h.target.value)}),t.jsxs("div",{className:"mt-1 flex items-center justify-between gap-3 text-[12px] text-paddock-500",children:[t.jsx("span",{children:s?"Using the built-in default.":n===""?"Empty — nothing will be appended.":`${c.length.toLocaleString()} characters.`}),l&&t.jsx("button",{type:"button",className:"shrink-0 underline underline-offset-2 hover:text-paddock-700 dark:hover:text-paddock-300",onClick:()=>i(null),children:"Restore default"})]})]})}if(e.type==="string-list"){const s=Array.isArray(n)?n.join(", "):String(n??"");return t.jsx("input",{id:o,type:"text",className:"input mt-1.5",value:s,onChange:c=>i(c.target.value.split(",").map(l=>l.trim()).filter(Boolean))})}return t.jsx("input",{id:o,type:"text",className:"input mt-1.5",value:n==null?"":String(n),placeholder:e.default===null?"":String(e.default),onChange:s=>i(s.target.value)})}function he({field:e,value:n}){return t.jsx("div",{className:"mt-1 text-[12px] text-paddock-600 dark:text-paddock-300",children:e.type==="boolean"?t.jsx("span",{className:"font-mono",children:n?"true":"false"}):n==null||n===""?t.jsx("span",{className:"italic text-paddock-400",children:e.type==="text"&&n===""?"(empty — nothing appended)":"(not set)"}):e.type==="text"?t.jsx("span",{className:"block max-h-40 overflow-y-auto whitespace-pre-wrap rounded bg-paddock-50 px-2 py-1.5 font-mono text-[12px] leading-relaxed dark:bg-paddock-900/40",children:String(n)}):t.jsx("span",{className:"block break-all font-mono",children:Array.isArray(n)?n.join(", "):String(n)})})}function ge(e,n){return e.type==="text"||e.type==="string-list"?!0:(Array.isArray(n)?n.join(", "):n==null?"":String(n)).length>38}function fe(e){return[e.label,e.key,e.help,e.envVar,...e.enumValues??[]].filter(Boolean).join(" ").toLowerCase()}function be(e,n){const i={};for(const o of e)i[o.id]=o.fields.filter(s=>n.has(s.key)).length;return i}const F=e=>`cfg-section-${e}`;function T(e){return e.pendingValue===void 0?e.value:e.pendingValue}function L(e,n){return Object.prototype.hasOwnProperty.call(n,e.key)?n[e.key]:T(e)}function M(e,n){return Array.isArray(e)&&Array.isArray(n)?e.length===n.length&&e.every((i,o)=>i===n[o]):e===n}function E(e){if(!e)return"paddock.config.yaml";const n=e.split("/");return n[n.length-1]||e}function je(){const e=ne(),n=(e==null?void 0:e.openNav)??(()=>{});return t.jsxs("div",{className:"flex h-full min-h-0 flex-col",children:[t.jsxs("header",{className:"pt-safe flex items-center gap-2 border-b border-paddock-200 px-3 pb-2.5 dark:border-paddock-800 sm:px-6 lg:py-4",children:[t.jsx("button",{type:"button",onClick:n,"aria-label":"Open menu",className:"btn-subtle -ml-1 shrink-0 px-2 py-1.5 lg:hidden",children:t.jsx(re,{width:20,height:20})}),t.jsx(se,{width:18,height:18,className:"shrink-0 text-paddock-400"}),t.jsx("h1",{className:"text-[15px] font-semibold tracking-tight",children:"Config"})]}),t.jsx(ae,{})]})}export{je as InstanceConfigPage};
+