@epoch-agent/server 0.8.1 → 0.10.0

package/dist/index.js

@@ -1,12 +1,13 @@
 import { createServer } from 'http';
-import { t, ApprovalRelay, QuestionRelay, serializeStream, withRoleScope, withModelScope, withToolScope, nextRunAt, skillIndexDescription, SANDBOX_EXCLUDES, SANDBOX_COVERS, isSystemOpenable, backgroundTaskOutput, listBackgroundTasks, providerLabel, MAX_REASON_CHARS, MAX_OBJECTIVE_CHARS, MAX_GOAL_MAX_ROUNDS, DEFAULT_GOAL_MAX_ROUNDS, SCHEDULE_DEFAULT_ALLOWLIST, SCHEDULE_DEFAULTS, coalesceRecording, readRecording } from '@epoch-agent/runtime';
+import { createLogger, t, ApprovalRelay, QuestionRelay, serializeStream, withRoleScope, withModelScope, withToolScope, nextRunAt, observeBackgroundTasks, skillIndexDescription, SANDBOX_EXCLUDES, SANDBOX_COVERS, isSystemOpenable, backgroundTaskOutput, listBackgroundTasks, providerLabel, MAX_REASON_CHARS, MAX_OBJECTIVE_CHARS, MAX_GOAL_MAX_ROUNDS, DEFAULT_GOAL_MAX_ROUNDS, SCHEDULE_DEFAULT_ALLOWLIST, SCHEDULE_DEFAULTS, coalesceRecording, readRecording } from '@epoch-agent/runtime';
 import { timingSafeEqual, randomBytes } from 'crypto';
-import { PLAN_OUTCOMES, WIRE_AUTH_COOKIE, WIRE_AUTH_COOKIE_ATTRS, WIRE_AUTH_TOKEN_PARAM, extractAllMentions, MAX_ATTACH_FILES, utf8ByteLength, MAX_SESSION_REFS, attachSessionSurface, isWireRewindScope, WIRE_REWIND_SCOPES, MAX_ATTACH_TOTAL_BYTES, MAX_ATTACH_BYTES, WIRE_LANG_PARAM, isLang, isQuestionAnswerMap, isProviderType, apiKeyEnvVar, WIRE_FILE_STAT_MAX, WIRE_SETTING_WRITE_LAYERS, isWirePlanAction, WIRE_PLAN_ACTIONS, isPermissionLevel, PERMISSION_LEVELS, collectPendingApprovals, unfixedRules, isWireSettingWriteLayer, parseModelRef, WIRE_GOAL_ACTIONS, OPERATION_TYPES, isOperationType } from '@epoch-agent/protocol';
+import { PLAN_OUTCOMES, WIRE_AUTH_COOKIE, WIRE_AUTH_COOKIE_ATTRS, WIRE_AUTH_TOKEN_PARAM, extractAllMentions, MAX_ATTACH_FILES, utf8ByteLength, MAX_SESSION_REFS, attachSessionSurface, isWireRewindScope, WIRE_REWIND_SCOPES, mcpConnectorState, MAX_ATTACH_TOTAL_BYTES, MAX_ATTACH_BYTES, truncateToBudget, WIRE_LANG_PARAM, isLang, isQuestionAnswerMap, isProviderType, apiKeyEnvVar, WIRE_FILE_STAT_MAX, WIRE_SETTING_WRITE_LAYERS, isWirePlanAction, WIRE_PLAN_ACTIONS, isPermissionLevel, PERMISSION_LEVELS, conformsToWire, WIRE_TRUST_REQUEST_FIELDS, WIRE_FORGET_WORKSPACE_FIELDS, collectPendingApprovals, unfixedRules, isWireSettingWriteLayer, parseModelRef, WIRE_GOAL_ACTIONS, OPERATION_TYPES, isOperationType, WIRE_PLUGIN_UPLOAD_FORM_FIELDS } from '@epoch-agent/protocol';
 import { resolve, join, relative, isAbsolute, sep, dirname, basename, extname } from 'path';
-import { existsSync, realpathSync, statSync, mkdirSync, createReadStream, readdirSync, accessSync, constants } from 'fs';
+import { existsSync, realpathSync, statSync, mkdirSync, createReadStream, readdirSync, createWriteStream, accessSync, constants } from 'fs';
+import { stat, readFile, rm } from 'fs/promises';
+import { pipeline } from 'stream/promises';
 import { homedir } from 'os';
 import { execFile, spawn } from 'child_process';
-import { stat, readFile } from 'fs/promises';
 import { fileURLToPath } from 'url';
 
 // src/index.ts
@@ -271,6 +272,22 @@ function toWireSessionWorkspace(bound) {
     skippedInstructionFiles: bound.projectContext.skippedInstructions
   };
 }
+function projectInventoryOf(workspaces, sessionId, trustRequest) {
+  const root = workspaces.of(sessionId)?.workspace.root;
+  return {
+    inventory: root === void 0 ? EMPTY_INVENTORY : workspaces.inventoryOf(root),
+    trustRequest
+  };
+}
+var EMPTY_INVENTORY = {
+  instructionFiles: [],
+  skills: 0,
+  roles: 0,
+  commands: 0,
+  hookFiles: [],
+  policies: 0,
+  settingsFiles: []
+};
 function toWireBinding(state, bound) {
   if (state === "bound" && bound)
     return { state: "bound", workspace: toWireSessionWorkspace(bound) };
@@ -417,6 +434,7 @@ var SessionHub = class {
   registry;
   sinks = /* @__PURE__ */ new Set();
   observers = /* @__PURE__ */ new Set();
+  counted = /* @__PURE__ */ new Set();
   requestOwner = /* @__PURE__ */ new Map();
   seq = 0;
   graceTimer = null;
@@ -474,6 +492,9 @@ var SessionHub = class {
   get connectionCount() {
     return this.sinks.size;
   }
+  get present() {
+    return this.sinks.size + this.counted.size;
+  }
   subscribe(sink, lastEventId) {
     sink(this.connectionFrame({ type: "connected" }));
     if (lastEventId !== void 0) {
@@ -491,18 +512,24 @@ var SessionHub = class {
       if (released) return;
       released = true;
       this.sinks.delete(sink);
-      if (this.sinks.size === 0) this.armGrace();
+      if (this.present === 0) this.armGrace();
     };
   }
-  observe(sink) {
+  observe(sink, opts = {}) {
     if (this.closed) return () => {
     };
     this.observers.add(sink);
+    if (opts.counts === true) {
+      this.counted.add(sink);
+      this.clearGrace();
+    }
     let released = false;
     return () => {
       if (released) return;
       released = true;
       this.observers.delete(sink);
+      const wasPresent = this.counted.delete(sink);
+      if (wasPresent && this.present === 0) this.armGrace();
     };
   }
   start(sessionId, message, decorate) {
@@ -554,6 +581,14 @@ var SessionHub = class {
     this.syncApprovalState(entry);
     return true;
   }
+  notifyTasksChanged(sessionId) {
+    if (this.closed) return;
+    this.publish(sessionId, { type: "tasks-changed" });
+  }
+  notifySessionsChanged(sessionId) {
+    if (this.closed) return;
+    this.publish(sessionId, { type: "sessions-changed" });
+  }
   shutdown() {
     if (this.closed) return;
     this.closed = true;
@@ -561,6 +596,7 @@ var SessionHub = class {
     this.reap();
     this.sinks.clear();
     this.observers.clear();
+    this.counted.clear();
   }
   publish(sessionId, event) {
     const frame = { seq: ++this.seq, sessionId, ts: this.clock(), event };
@@ -624,7 +660,7 @@ var SessionHub = class {
   }
   drainQueue(entry) {
     if (this.closed || !this.registry.has(entry.session.sessionId)) return;
-    if (this.sinks.size === 0) {
+    if (this.present === 0) {
       entry.queue.length = 0;
       return;
     }
@@ -645,7 +681,7 @@ var SessionHub = class {
     this.graceTimer = null;
   }
   reap() {
-    if (this.sinks.size > 0 && !this.closed) return;
+    if (this.present > 0 && !this.closed) return;
     for (const [, entry] of this.registry.all()) {
       entry.queue.length = 0;
       if (entry.state === "idle") continue;
@@ -763,6 +799,54 @@ async function readJsonBody(req, limit = JSON_BODY_LIMIT, lang) {
     };
   }
 }
+var PLUGIN_UPLOAD_BODY_LIMIT = 50 * 1024 * 1024;
+async function readRawBody(req, limit, lang) {
+  const chunks = [];
+  let size = 0;
+  try {
+    for await (const chunk of req) {
+      const buf = chunk;
+      size += buf.length;
+      if (size > limit) {
+        req.destroy();
+        return { ok: false, status: 413, message: t("web.body_too_large", { limit }, lang) };
+      }
+      chunks.push(buf);
+    }
+  } catch (err) {
+    return {
+      ok: false,
+      status: 400,
+      message: t("web.body_read_failed", { reason: describe(err) }, lang)
+    };
+  }
+  if (size === 0) {
+    return { ok: false, status: 400, message: t("web.body_empty", void 0, lang) };
+  }
+  return { ok: true, value: Buffer.concat(chunks) };
+}
+async function streamBodyToFile(req, target, lang) {
+  const sink = createWriteStream(target, { flags: "wx" });
+  try {
+    await pipeline(req, sink);
+  } catch (err) {
+    await rm(target, { force: true }).catch(() => void 0);
+    return {
+      ok: false,
+      status: 400,
+      message: t("web.body_read_failed", { reason: describe(err) }, lang)
+    };
+  }
+  try {
+    return { ok: true, bytes: (await stat(target)).size };
+  } catch (err) {
+    return {
+      ok: false,
+      status: 500,
+      message: t("web.body_read_failed", { reason: describe(err) }, lang)
+    };
+  }
+}
 function describe(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -929,7 +1013,7 @@ function estimateIndexTokens(text) {
   return Math.ceil(text.length / 4);
 }
 function toWireMcp(server) {
-  const state = server.needsLogin ? "needs-login" : server.connected ? "connected" : "failed";
+  const state = mcpConnectorState(server);
   return {
     name: server.name,
     state,
@@ -939,7 +1023,7 @@ function toWireMcp(server) {
     source: server.source
   };
 }
-function collectCapabilities(runtime, tools, bound, role) {
+function collectCapabilities(runtime, tools, bound, role, project) {
   const residency = runtime.skillIndexResidency(role);
   return {
     roles: runtime.agentRoles.map((r) => toWireRole(r, runtime.agentRoleNotices)),
@@ -948,7 +1032,10 @@ function collectCapabilities(runtime, tools, bound, role) {
     mcpServers: runtime.mcpServers.map(toWireMcp),
     project: {
       root: bound?.workspace.root ?? null,
-      trusted: bound?.trust.trusted ?? false
+      trusted: bound?.trust.trusted ?? false,
+      execTrusted: bound?.trust.exec ?? false,
+      inventory: project.inventory,
+      trustRequest: project.trustRequest
     }
   };
 }
@@ -1018,6 +1105,81 @@ function replaceLeadingText(message, prompt) {
   const head = { type: "text", text: prompt };
   return [head, ...message.slice(1)];
 }
+async function uploadAttachment(ctx, req, res, sessionId, lang) {
+  const raw = nameParam(req.url);
+  if (raw === void 0) {
+    return sendError(res, 400, "bad-request", t("web.attachment_name_required", void 0, lang));
+  }
+  const control = ctx.runtime.attachments;
+  let placed;
+  try {
+    placed = control.place(sessionId, raw);
+  } catch (err) {
+    return sendError(res, 500, "attachment-failed", describe2(err));
+  }
+  if (!placed) {
+    return sendError(
+      res,
+      400,
+      "bad-request",
+      t("web.attachment_name_invalid", { name: raw }, lang)
+    );
+  }
+  const out = await streamBodyToFile(req, placed.path, lang);
+  if (!out.ok) return sendError(res, out.status, "bad-body", out.message);
+  control.prune(sessionId);
+  return sendJson(res, 200, {
+    name: placed.name,
+    bytes: out.bytes
+  });
+}
+function attachUploads(ctx, sessionId, names, usedBytes = 0) {
+  const parts = [];
+  const receipts = [];
+  let used = usedBytes;
+  for (const name of names) {
+    const part = readOne(ctx, sessionId, name, used);
+    parts.push(part);
+    if (part.text !== void 0) used += utf8ByteLength(part.text);
+    const { type: _type, text: _text, ...rest } = part;
+    receipts.push(rest);
+  }
+  return { parts, receipts, usedBytes: used };
+}
+function readOne(ctx, sessionId, name, usedBytes) {
+  const remaining = MAX_ATTACH_TOTAL_BYTES - usedBytes;
+  const path = ctx.runtime.attachments.resolve(sessionId, name) ?? name;
+  if (remaining <= 0) return { type: "file", path, omitted: "over-limit" };
+  const budget = Math.min(MAX_ATTACH_BYTES, remaining);
+  const out = ctx.runtime.attachments.read(sessionId, name);
+  if (!out.ok) {
+    return {
+      type: "file",
+      path,
+      omitted: out.reason,
+      ...out.bytes === void 0 ? {} : { bytes: out.bytes }
+    };
+  }
+  if (out.bytes <= budget) {
+    return { type: "file", path: out.path, text: out.text, bytes: out.bytes };
+  }
+  const { text, truncatedTo } = truncateToBudget(new TextEncoder().encode(out.text), budget);
+  return { type: "file", path: out.path, text, truncatedTo, bytes: out.bytes };
+}
+function nameParam(url) {
+  let raw;
+  try {
+    raw = new URL(url ?? "/", "http://127.0.0.1").searchParams.get("name");
+  } catch {
+    return void 0;
+  }
+  return raw && raw.length > 0 ? raw : void 0;
+}
+function describe2(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+// src/mentions.ts
+var EMPTY_MENTIONS = { files: [], sessions: [] };
 var MAX_CANDIDATES = 20;
 var MAX_CANDIDATE_LIMIT = 50;
 function visibilityOf(ctx, sessionId) {
@@ -1099,16 +1261,18 @@ function listFileCandidates(ctx, res, sessionId, rawUrl, lang) {
     truncated: result.truncated
   });
 }
-function attachMentions(ctx, sessionId, message) {
+function attachMentions(ctx, sessionId, message, uploads = []) {
   const text = leadingText2(message);
-  if (text === null) return { message, references: [], files: [] };
-  const mentions = extractAllMentions(text);
-  if (mentions.files.length === 0 && mentions.sessions.length === 0) {
+  const mentions = text === null ? EMPTY_MENTIONS : extractAllMentions(text);
+  if (uploads.length === 0 && mentions.files.length === 0 && mentions.sessions.length === 0) {
     return { message, references: [], files: [] };
   }
   const parts = [];
   let used = 0;
-  const fileReceipts = [];
+  const uploaded = attachUploads(ctx, sessionId, uploads, used);
+  parts.push(...uploaded.parts);
+  used = uploaded.usedBytes;
+  const fileReceipts = [...uploaded.receipts];
   for (const [index, path] of mentions.files.entries()) {
     const part = index >= MAX_ATTACH_FILES ? { type: "file", path, omitted: "over-limit" } : readOneFile(ctx, sessionId, path, used);
     parts.push(part);
@@ -1245,11 +1409,14 @@ function toWirePolicy(policy) {
   }));
   return { dirs, projectSkipped: policy.projectSkipped, skippedDir: policy.skippedDir };
 }
-function toWireSecurityWorkspace(bound) {
+function toWireSecurityWorkspace(bound, project) {
   return {
     ...toWireSessionWorkspace(bound),
     trustLevel: bound.trust.level,
-    unloadedExtraInstructionFiles: bound.unloadedInstructions
+    unloadedExtraInstructionFiles: bound.unloadedInstructions,
+    execTrusted: bound.trust.exec,
+    inventory: project.inventory,
+    trustRequest: project.trustRequest
   };
 }
 function toWireTrustList(known, workspaces, currentRoot) {
@@ -1260,11 +1427,13 @@ function toWireTrustList(known, workspaces, currentRoot) {
       name: w.name,
       level: decision.level,
       trusted: decision.trusted,
-      current: currentRoot !== null && w.root === currentRoot
+      execTrusted: decision.exec,
+      current: currentRoot !== null && w.root === currentRoot,
+      exists: existsSync(w.root)
     };
   });
 }
-function collectSecurity(runtime, workspaces, bound, session) {
+function collectSecurity(runtime, workspaces, bound, session, project) {
   const perms = runtime.permissions;
   return {
     sandbox: runtime.isolation ? toWireSandbox(runtime.isolation, runtime.config.sandbox?.terminal !== false) : null,
@@ -1277,7 +1446,7 @@ function collectSecurity(runtime, workspaces, bound, session) {
       managed: toWireManaged(perms.managed()),
       cached: perms.approvals().map(toWireApproval)
     } : PERMISSIONS_UNAVAILABLE,
-    workspace: bound ? toWireSecurityWorkspace(bound) : null,
+    workspace: bound ? toWireSecurityWorkspace(bound, project) : null,
     knownWorkspaces: toWireTrustList(workspaces.known(), workspaces, bound?.workspace.root ?? null),
     policy: toWirePolicy(runtime.policy),
     audit: perms ? toWireAudit(perms.audit()) : { rows: [], dropped: 0 }
@@ -1447,6 +1616,7 @@ function config(ctx, res, lang) {
     usageScope: runtime.usageScope,
     compression: runtime.compression,
     ...runtime.config.budget?.maxCostUsd !== void 0 ? { maxCostUsd: runtime.config.budget.maxCostUsd } : {},
+    ...runtime.config.display?.currency !== void 0 ? { currency: runtime.config.display.currency } : {},
     ...runtime.config.brand !== void 0 ? { brand: runtime.config.brand } : {},
     ...runtime.config.sidebarMenu !== void 0 ? { sidebarMenu: runtime.config.sidebarMenu } : {},
     ...runtime.config.userMenu !== void 0 ? { userMenu: runtime.config.userMenu } : {},
@@ -1510,6 +1680,7 @@ async function deleteSession(ctx, res, sessionId, lang) {
   }
   const outcome = await catalog.delete(sessionId);
   if (!outcome.deleted && !inHub) return sendUnknownSession(res, sessionId, lang);
+  ctx.hub.notifySessionsChanged(sessionId);
   sendJson(res, 200, outcome);
 }
 async function patchSession(ctx, req, res, sessionId, lang) {
@@ -1562,7 +1733,9 @@ async function postMessage(ctx, req, res, sessionId, lang) {
   }
   const body = await readJsonBody(req, void 0, lang);
   if (!body.ok) return sendError(res, body.status, "bad-body", body.message);
-  const message = parseUserContent(asRecord(body.value).message);
+  const uploads = parseAttachmentNames(asRecord(body.value)["attachments"]);
+  const parsed = parseUserContent(asRecord(body.value).message);
+  const message = parsed ?? (uploads.length > 0 ? [] : null);
   if (message === null) {
     return sendError(res, 400, "bad-message", t("web.bad_message", void 0, lang));
   }
@@ -1573,7 +1746,7 @@ async function postMessage(ctx, req, res, sessionId, lang) {
     return sendError(res, mapped.status, mapped.code, mapped.message);
   }
   const expansion = expandUserContent(ctx.runtime, message, live?.model ?? null, picked.role);
-  const attached = attachMentions(ctx, sessionId, expansion.message);
+  const attached = attachMentions(ctx, sessionId, expansion.message, uploads);
   const started = ctx.hub.start(sessionId, attached.message, expansion.decorate);
   if (started.ok) {
     return sendJson(res, 202, {
@@ -1664,7 +1837,8 @@ function listCapabilities(ctx, res, sessionId, lang) {
     ctx.runtime,
     ctx.runtime.tools,
     ctx.runtime.workspaces.of(sessionId),
-    ctx.runtime.sessionFactory.get(sessionId)?.role?.name ?? null
+    ctx.runtime.sessionFactory.get(sessionId)?.role?.name ?? null,
+    projectInventoryOf(ctx.runtime.workspaces, sessionId, ctx.trustRequest !== void 0)
   );
   sendJson(res, 200, payload);
 }
@@ -1683,7 +1857,8 @@ function getSecurity(ctx, res, sessionId, lang) {
     ctx.runtime,
     ctx.runtime.workspaces,
     ctx.runtime.workspaces.of(sessionId),
-    ctx.runtime.sessionFactory.get(sessionId)?.permissions ?? null
+    ctx.runtime.sessionFactory.get(sessionId)?.permissions ?? null,
+    projectInventoryOf(ctx.runtime.workspaces, sessionId, ctx.trustRequest !== void 0)
   );
   sendJson(res, 200, payload);
 }
@@ -1753,6 +1928,10 @@ function parseUserContent(raw) {
   if (Array.isArray(raw) && raw.length > 0) return raw;
   return null;
 }
+function parseAttachmentNames(raw) {
+  if (!Array.isArray(raw)) return [];
+  return raw.filter((name) => typeof name === "string" && name.length > 0);
+}
 async function revokeApprovalCache(ctx, req, res, sessionId, lang) {
   if (!ctx.hub.has(sessionId)) return sendUnknownSession(res, sessionId, lang);
   const perms = ctx.runtime.permissions;
@@ -2282,10 +2461,11 @@ function sessionHasImages(session) {
 }
 function getModel(ctx, res, sessionId, _lang) {
   const { runtime } = ctx;
-  const selection = runtime.sessionFactory.get(sessionId)?.model.get();
+  const live = runtime.sessionFactory.get(sessionId);
+  const selection = live?.model.get();
   sendJson(res, 200, {
     selection: selection ? toWireSelection(selection) : null,
-    configured: runtime.config.model || null
+    configured: (live ? live.model.configured() : runtime.config.model) || null
   });
 }
 async function setModel(ctx, req, res, sessionId, lang) {
@@ -2433,9 +2613,18 @@ function toWireCounts(counts) {
     mcpServers: counts.mcpServers
   };
 }
-function toWirePluginEntry(entry) {
+function displayNamesOf(control) {
+  const out = /* @__PURE__ */ new Map();
+  for (const hit of control.search()) {
+    const shown = hit.entry.displayName;
+    if (shown !== void 0 && shown !== "") out.set(`${hit.marketplace}/${hit.entry.name}`, shown);
+  }
+  return out;
+}
+function toWirePluginEntry(entry, displayNames) {
   return {
     name: entry.name,
+    displayName: displayNames.get(`${entry.marketplace}/${entry.name}`) ?? null,
     version: entry.version,
     source: entry.source,
     sourceType: entry.sourceType,
@@ -2470,6 +2659,7 @@ function toWirePluginHit(hit, installed) {
     size: hit.entry.size ?? null,
     homepage: hit.entry.homepage ?? null,
     visibility: hit.entry.visibility ?? null,
+    status: hit.entry.status ?? null,
     updateAvailable: mine !== void 0 && !mine.linked && hit.entry.version !== void 0 && hit.entry.version !== mine.version
   };
 }
@@ -2526,21 +2716,39 @@ function fieldOf(payload, key) {
   const value = payload[key];
   return typeof value === "string" ? value.trim() : "";
 }
+function uploadFormOf(payload) {
+  const form = {};
+  for (const name of WIRE_PLUGIN_UPLOAD_FORM_FIELDS) {
+    const raw = fieldOf(payload, name);
+    if (raw === "") continue;
+    if (name === "visibility") {
+      if (raw === "private" || raw === "public") form[name] = raw;
+      continue;
+    }
+    form[name] = raw;
+  }
+  return form;
+}
 function listPlugins(ctx, res, lang) {
   const control = controlOf(ctx, res, lang);
   if (!control) return;
+  sendJson(res, 200, pluginsPayload(control));
+}
+function pluginsPayload(control) {
   const installed = control.list();
   const installedMap = new Map(
     installed.map((p) => [p.name, { version: p.version, linked: p.linked }])
   );
-  sendJson(res, 200, {
-    installed: installed.map(toWirePluginEntry),
+  const shown = displayNamesOf(control);
+  return {
+    installed: installed.map((p) => toWirePluginEntry(p, shown)),
     hits: control.search().map((hit) => toWirePluginHit(hit, installedMap)),
     marketplaces: control.marketplaces().map(toWireMarketplace),
     pendingRestart: control.pendingRestart,
     uploadEnabled: control.uploadEnabled,
-    uploadOptions: control.uploadOptions
-  });
+    uploadOptions: control.uploadOptions,
+    refreshEnabled: control.refreshEnabled
+  };
 }
 function sendPreview(res, outcome) {
   if (!outcome.ok) {
@@ -2597,7 +2805,7 @@ function sendAction(res, control, outcome) {
   const fresh = "record" in outcome ? control.list().find((p) => p.name === outcome.record.name) : void 0;
   sendJson(res, 200, {
     ok: true,
-    entry: fresh ? toWirePluginEntry(fresh) : null,
+    entry: fresh ? toWirePluginEntry(fresh, displayNamesOf(control)) : null,
     pendingRestart: control.pendingRestart,
     detail: "detail" in outcome ? outcome.detail : null,
     reason: null
@@ -2629,6 +2837,51 @@ async function installLocalPlugin(ctx, req, res, lang) {
     await control.installLocal(fieldOf(payload, "path"), fieldOf(payload, "token"), lang)
   );
 }
+async function stagePlugin(ctx, req, res, lang) {
+  if (refusedByLan(ctx, res, lang)) return;
+  const control = controlOf(ctx, res, lang);
+  if (!control) return;
+  const asJson = (req.headers["content-type"] ?? "").toLowerCase().includes("application/json");
+  if (asJson) {
+    const body = await readJsonBody(req, void 0, lang);
+    if (!body.ok) return sendError(res, body.status, "bad-body", body.message);
+    return sendStage(
+      res,
+      await control.stage({ kind: "path", path: fieldOf(asRecord(body.value), "path") }, lang)
+    );
+  }
+  const raw = await readRawBody(req, PLUGIN_UPLOAD_BODY_LIMIT, lang);
+  if (!raw.ok) return sendError(res, raw.status, "bad-body", raw.message);
+  return sendStage(
+    res,
+    await control.stage({ kind: "bytes", name: nameParam2(req), data: raw.value }, lang)
+  );
+}
+function nameParam2(req) {
+  try {
+    return new URL(req.url ?? "/", "http://127.0.0.1").searchParams.get("name") ?? "";
+  } catch {
+    return "";
+  }
+}
+function sendStage(res, outcome) {
+  const payload = outcome.ok ? {
+    ok: true,
+    path: outcome.path,
+    name: outcome.name,
+    version: outcome.version,
+    detail: null,
+    reason: null
+  } : {
+    ok: false,
+    path: null,
+    name: null,
+    version: null,
+    detail: outcome.detail,
+    reason: outcome.reason
+  };
+  sendJson(res, 200, payload);
+}
 async function updateInstalledPlugin(ctx, req, res, lang) {
   if (refusedByLan(ctx, res, lang)) return;
   const control = controlOf(ctx, res, lang);
@@ -2686,10 +2939,7 @@ function uploadPlugin(ctx, req, res, lang) {
       await control.upload(
         fieldOf(payload, "path"),
         fieldOf(payload, "token"),
-        {
-          ...fieldOf(payload, "visibility") === "private" ? { visibility: "private" } : fieldOf(payload, "visibility") === "public" ? { visibility: "public" } : {},
-          ...fieldOf(payload, "changelog") ? { changelog: fieldOf(payload, "changelog") } : {}
-        },
+        uploadFormOf(payload),
         lang
       )
     );
@@ -2739,13 +2989,34 @@ function sendUpload(res, outcome) {
     reason: outcome.ok ? null : outcome.reason
   });
 }
+async function refreshPlugins(ctx, res, lang) {
+  if (refusedByLan(ctx, res, lang)) return;
+  const control = controlOf(ctx, res, lang);
+  if (!control) return;
+  const outcome = await control.refresh(lang);
+  if (!outcome.ok) {
+    return sendJson(res, 200, {
+      ok: false,
+      plugins: null,
+      reason: outcome.reason,
+      detail: outcome.detail
+    });
+  }
+  sendJson(res, 200, {
+    ok: true,
+    plugins: pluginsPayload(control),
+    reason: null,
+    detail: outcome.detail === "" ? null : outcome.detail
+  });
+}
 function toWireProvider(option, lang) {
   return {
     type: option.type,
     label: providerLabel(option, lang),
     envVar: option.envVar,
     hasKey: option.hasKey,
-    keyHint: option.keyHint
+    keyHint: option.keyHint,
+    current: option.current
   };
 }
 function toWireSuggestions(view) {
@@ -3310,6 +3581,33 @@ async function removeSkill(ctx, req, res, lang) {
     reason: null
   });
 }
+function refusedByLan2(ctx, res, lang) {
+  if (!ctx.lanExposed) return false;
+  sendError(res, 403, "skill-stage-lan-exposed", t("web.skill_stage_lan_exposed", void 0, lang));
+  return true;
+}
+async function stageSkillDrop(ctx, req, res, lang) {
+  if (refusedByLan2(ctx, res, lang)) return;
+  const raw = await readRawBody(req, PLUGIN_UPLOAD_BODY_LIMIT, lang);
+  if (!raw.ok) return sendError(res, raw.status, "bad-body", raw.message);
+  const outcome = await ctx.runtime.skillStage.stage(
+    { name: nameParam3(req), data: raw.value },
+    lang
+  );
+  sendJson(res, 200, {
+    ok: outcome.ok,
+    path: outcome.ok ? outcome.path : null,
+    detail: outcome.ok ? null : outcome.detail,
+    reason: outcome.ok ? null : outcome.reason
+  });
+}
+function nameParam3(req) {
+  try {
+    return new URL(req.url ?? "/", "http://127.0.0.1").searchParams.get("name") ?? "";
+  } catch {
+    return "";
+  }
+}
 // src/sse.ts
 var DEFAULT_HEARTBEAT_MS = 15e3;
 function parseLastEventId(req) {
@@ -3793,9 +4091,9 @@ var VIEWABLE = /* @__PURE__ */ new Map([
   [".webm", { kind: "video", mime: "video/webm" }],
   [".mov", { kind: "video", mime: "video/quicktime" }]
 ]);
-function kindOf(stat2) {
-  if (stat2.kind === "text") return "text";
-  return VIEWABLE.get(extname(stat2.rel).toLowerCase())?.kind ?? "opaque";
+function kindOf(stat3) {
+  if (stat3.kind === "text") return "text";
+  return VIEWABLE.get(extname(stat3.rel).toLowerCase())?.kind ?? "opaque";
 }
 function toWireRefusal(reason) {
   return reason;
@@ -3843,15 +4141,15 @@ function statFiles(ctx, res, sessionId, rawUrl, lang) {
   const asked = params.getAll("path").filter((p) => p.trim() !== "");
   const taken = asked.slice(0, WIRE_FILE_STAT_MAX);
   const files = taken.map((path) => {
-    const stat2 = ctx.runtime.workspaceFiles.statFile(path, root);
-    if (!stat2.ok) return { path, ok: false, refusal: toWireRefusal(stat2.reason) };
+    const stat3 = ctx.runtime.workspaceFiles.statFile(path, root);
+    if (!stat3.ok) return { path, ok: false, refusal: toWireRefusal(stat3.reason) };
     return {
       path,
       ok: true,
-      kind: kindOf(stat2),
-      bytes: stat2.bytes,
-      mtimeMs: stat2.mtimeMs,
-      openable: ctx.sameMachine && isSystemOpenable(stat2.rel)
+      kind: kindOf(stat3),
+      bytes: stat3.bytes,
+      mtimeMs: stat3.mtimeMs,
+      openable: ctx.sameMachine && isSystemOpenable(stat3.rel)
     };
   });
   sendJson(res, 200, {
@@ -3865,18 +4163,18 @@ function readFileText(ctx, res, sessionId, rawUrl, lang) {
   if (root === null) return;
   const path = singlePath(res, rawUrl, lang);
   if (path === null) return;
-  const stat2 = ctx.runtime.workspaceFiles.statFile(path, root);
-  if (!stat2.ok) {
-    const refusal = toWireRefusal(stat2.reason);
+  const stat3 = ctx.runtime.workspaceFiles.statFile(path, root);
+  if (!stat3.ok) {
+    const refusal = toWireRefusal(stat3.reason);
     return sendError(res, statusFor(refusal), refusal, describeRefusal(refusal, lang));
   }
-  if (stat2.kind !== "text") {
+  if (stat3.kind !== "text") {
     return sendError(res, 415, "not-text", t("web.file_view_not_text", void 0, lang));
   }
-  if (stat2.bytes > MAX_TEXT_BYTES) {
+  if (stat3.bytes > MAX_TEXT_BYTES) {
     return sendError(res, 413, "too-large", describeRefusal("too-large", lang));
   }
-  const out = ctx.runtime.workspaceFiles.readFile(stat2.rel, root);
+  const out = ctx.runtime.workspaceFiles.readFile(stat3.rel, root);
   if (!out.ok) {
     const refusal = out.reason === "binary" ? "unreadable" : out.reason;
     return sendError(res, statusFor(refusal), refusal, describeRefusal(refusal, lang));
@@ -3892,26 +4190,26 @@ function readFileBytes(ctx, res, sessionId, rawUrl, headOnly, lang) {
   if (root === null) return;
   const path = singlePath(res, rawUrl, lang);
   if (path === null) return;
-  const stat2 = ctx.runtime.workspaceFiles.statFile(path, root);
-  if (!stat2.ok) {
-    const refusal = toWireRefusal(stat2.reason);
+  const stat3 = ctx.runtime.workspaceFiles.statFile(path, root);
+  if (!stat3.ok) {
+    const refusal = toWireRefusal(stat3.reason);
     return sendError(res, statusFor(refusal), refusal, describeRefusal(refusal, lang));
   }
-  const known = VIEWABLE.get(extname(stat2.rel).toLowerCase());
-  const inline = known !== void 0 && stat2.kind === "binary";
+  const known = VIEWABLE.get(extname(stat3.rel).toLowerCase());
+  const inline = known !== void 0 && stat3.kind === "binary";
   const headers = {
     "Content-Type": inline ? known.mime : "application/octet-stream",
     "X-Content-Type-Options": "nosniff",
-    "Content-Disposition": inline ? "inline" : `attachment; filename*=UTF-8''${encodeURIComponent(basenameOf(stat2.rel))}`
+    "Content-Disposition": inline ? "inline" : `attachment; filename*=UTF-8''${encodeURIComponent(basenameOf(stat3.rel))}`
   };
   if (inline && known.kind === "pdf") headers["Content-Security-Policy"] = "sandbox";
   if (headOnly) {
     return sendEmpty(res, 200, {
       ...headers,
-      "Content-Length": String(stat2.bytes)
+      "Content-Length": String(stat3.bytes)
     });
   }
-  sendFile(res, stat2.absPath, headers);
+  sendFile(res, stat3.absPath, headers);
 }
 function basenameOf(rel) {
   const cut = rel.lastIndexOf("/");
@@ -3962,6 +4260,26 @@ async function openFileWithSystemApp(ctx, req, res, sessionId, lang) {
   }
   sendJson(res, 200, { ok: true });
 }
+async function forgetWorkspace(ctx, sessionId, req, res, lang) {
+  const body = await readJsonBody(req, void 0, lang);
+  if (!body.ok) return sendError(res, body.status, "bad-body", body.message);
+  if (!conformsToWire(body.value, WIRE_FORGET_WORKSPACE_FIELDS)) {
+    return sendError(res, 400, "bad-request", t("web.forget_bad_request", {}, lang));
+  }
+  const { root } = body.value;
+  const workspaces = ctx.runtime.workspaces;
+  if (!workspaces.known().some((w) => w.root === root)) {
+    return sendError(res, 404, "unknown-workspace", t("web.forget_unknown", {}, lang));
+  }
+  const current = workspaces.of(sessionId)?.workspace.root;
+  if (current !== void 0 && current === root) {
+    return sendError(res, 409, "workspace-in-use", t("web.forget_in_use", {}, lang));
+  }
+  workspaces.forget(root);
+  sendJson(res, 200, {
+    known: toWireTrustList(workspaces.known(), workspaces, current ?? null)
+  });
+}
 var GIT_TIMEOUT_MS = 1e4;
 var GIT_MAX_BUFFER = 16 * 1024 * 1024;
 function runGit(cwd, args) {
@@ -4072,7 +4390,7 @@ async function gitDiff(root) {
   for (const item of picked) {
     const old = await gitSide(root, item.oldSha, sizes);
     const fresh = await worktreeSide(join(root, ...item.path.split("/")));
-    files.push(describe2(item.path, old, fresh));
+    files.push(describe3(item.path, old, fresh));
   }
   return { source: "git", root, files, truncated, notes };
 }
@@ -4118,7 +4436,7 @@ async function checkpointDiff(opts) {
   for (const absolute of picked) {
     const fresh = await worktreeSide(absolute);
     files.push(
-      describe2(displayPath(opts.workDir, absolute), ABSENT, fresh, {
+      describe3(displayPath(opts.workDir, absolute), ABSENT, fresh, {
         status: fresh.kind === "absent" ? "deleted" : "modified",
         omitted: "no-snapshot"
       })
@@ -4156,7 +4474,7 @@ async function worktreeSide(absolute) {
     return ABSENT;
   }
 }
-function describe2(path, old, fresh, override = {}) {
+function describe3(path, old, fresh, override = {}) {
   const status = override.status ?? (old.kind === "absent" ? "added" : fresh.kind === "absent" ? "deleted" : "modified");
   const oldBytes = bytesOf(old);
   const newBytes = bytesOf(fresh);
@@ -4239,6 +4557,7 @@ async function createSession(ctx, req, res, lang) {
   }
   ctx.hub.register(outcome.live.session);
   if (defer) ctx.runtime.workspaces.defer(outcome.live.sessionId);
+  if (outcome.created) ctx.hub.notifySessionsChanged(outcome.live.sessionId);
   sendJson(res, 200, {
     sessionId: outcome.live.sessionId,
     created: outcome.created,
@@ -4323,6 +4642,36 @@ async function sessionDiff(ctx, res, sessionId, _lang) {
     })
   );
 }
+function isKnownRoot(ctx, sessionId, root) {
+  if (ctx.runtime.workspaces.of(sessionId)?.workspace.root === root) return true;
+  return ctx.runtime.workspaces.known().some((w) => w.root === root);
+}
+async function requestTrust(ctx, sessionId, req, res, lang) {
+  const ask = ctx.trustRequest;
+  if (ask === void 0) {
+    return sendError(res, 404, "trust-request-unavailable", t("web.trust_unavailable", {}, lang));
+  }
+  const body = await readJsonBody(req, void 0, lang);
+  if (!body.ok) return sendError(res, body.status, "bad-body", body.message);
+  if (!conformsToWire(body.value, WIRE_TRUST_REQUEST_FIELDS)) {
+    return sendError(res, 400, "bad-request", t("web.trust_bad_request", {}, lang));
+  }
+  const { root, want } = body.value;
+  if (!isKnownRoot(ctx, sessionId, root)) {
+    return sendError(res, 400, "unknown-workspace", t("web.trust_unknown_root", {}, lang));
+  }
+  try {
+    await ask({ root, want: want === "exec" ? "exec" : "read" });
+  } catch (err) {
+    return sendError(
+      res,
+      500,
+      "trust-request-failed",
+      t("web.trust_failed", { detail: err instanceof Error ? err.message : String(err) }, lang)
+    );
+  }
+  sendJson(res, 200, { asked: true });
+}
 // src/routes.ts
 var DENY_KEY = {
   "missing-credential": "web.route.deny_missing_credential",
@@ -4330,10 +4679,17 @@ var DENY_KEY = {
   "bad-origin": "web.route.deny_bad_origin",
   "bad-host": "web.route.deny_bad_host"
 };
+var log = createLogger("server-route");
 function createRequestHandler(opts) {
   return (req, res) => {
     const lang = langOf(req.url);
-    dispatch(opts, req, res, lang).catch(() => {
+    dispatch(opts, req, res, lang).catch((err) => {
+      log.error("unhandled handler exception", {
+        method: req.method ?? "",
+        path: (req.url ?? "").split("?")[0],
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : void 0
+      });
       if (!res.headersSent) {
         sendError(res, 500, "internal", t("web.route.internal_error", void 0, lang));
       } else res.destroy();
@@ -4418,6 +4774,9 @@ async function handleApi(opts, req, res, method, segments, lang) {
   if (resource === "skills" && first === "import" && second === void 0 && method === "POST") {
     return importSkills(ctx, req, res, lang);
   }
+  if (resource === "skills" && first === "stage" && second === void 0 && method === "POST") {
+    return stageSkillDrop(ctx, req, res, lang);
+  }
   if (resource === "skills" && first === "remove" && second === void 0 && method === "POST") {
     return removeSkill(ctx, req, res, lang);
   }
@@ -4457,6 +4816,12 @@ async function handleApi(opts, req, res, method, segments, lang) {
   if (resource === "plugins" && first === "upload" && second === void 0 && method === "POST") {
     return uploadPlugin(ctx, req, res, lang);
   }
+  if (resource === "plugins" && first === "refresh" && second === void 0 && method === "POST") {
+    return refreshPlugins(ctx, res, lang);
+  }
+  if (resource === "plugins" && first === "stage" && second === void 0 && method === "POST") {
+    return stagePlugin(ctx, req, res, lang);
+  }
   if (resource === "providers" && first === void 0 && isRead(method)) {
     return listProviders(ctx, res, lang);
   }
@@ -4538,6 +4903,9 @@ async function handleSessions(opts, req, res, method, sessionId, action, detail,
     if (method === "POST") return postMessage(ctx, req, res, sessionId, lang);
     return methodNotAllowed(res, "GET, POST", lang);
   }
+  if (action === "attachments" && method === "POST") {
+    return uploadAttachment(ctx, req, res, sessionId, lang);
+  }
   if (action === "abort" && method === "POST") return abortSession(ctx, res, sessionId, lang);
   if (action === "reference-candidates" && isRead(method)) {
     return listReferenceCandidates(ctx, res, sessionId, req.url, lang);
@@ -4596,6 +4964,12 @@ async function handleSessions(opts, req, res, method, sessionId, action, detail,
   if (action === "permission" && method === "POST") {
     return setPermission(ctx, req, res, sessionId, lang);
   }
+  if (action === "trust-request" && method === "POST") {
+    return requestTrust(ctx, sessionId, req, res, lang);
+  }
+  if (action === "workspaces" && method === "POST" && detail === "forget") {
+    return forgetWorkspace(ctx, sessionId, req, res, lang);
+  }
   if (action === "approval-cache" && method === "POST") {
     return revokeApprovalCache(ctx, req, res, sessionId, lang);
   }
@@ -4686,6 +5060,9 @@ async function createWebServer(opts) {
     onCooled: (sessionId) => opts.runtime.sessionFactory.release(sessionId)
   });
   if (opts.runtime.session) hub.register(opts.runtime.session);
+  const unsubscribeTasks = observeBackgroundTasks((sessionId) => {
+    hub.notifyTasksChanged(sessionId);
+  });
   let handle = null;
   const server = createServer((req, res) => {
     if (handle) return handle(req, res);
@@ -4694,7 +5071,10 @@ async function createWebServer(opts) {
   });
   const webRoot = opts.webRoot ?? defaultWebRoot();
   const listened = await listen(server, binding.host, binding.port);
-  if (!listened.ok) return listened;
+  if (!listened.ok) {
+    unsubscribeTasks();
+    return listened;
+  }
   handle = buildHandler(opts, hub, binding, listened.port, webRoot);
   return {
     ok: true,
@@ -4704,9 +5084,9 @@ async function createWebServer(opts) {
       host: binding.host,
       token: binding.token,
       ...webRoot === void 0 ? {} : { webRoot },
-      observe: (sink) => hub.observe(sink),
+      observe: (sink, opts2) => hub.observe(sink, opts2 ?? {}),
       snapshot: () => hub.listSessions(),
-      close: makeCloser(server, hub, opts.runtime)
+      close: makeCloser(server, hub, opts.runtime, unsubscribeTasks)
     }
   };
 }
@@ -4724,7 +5104,8 @@ function buildHandler(opts, hub, binding, port, webRoot) {
       artifactsRoot: opts.artifactsRoot ?? opts.runtime.artifactsRoot,
       lanExposed: binding.lanExposed,
       nativeDirPicker: resolveNativeDirPicker(machineFacts),
-      sameMachine: isSameMachine(machineFacts)
+      sameMachine: isSameMachine(machineFacts),
+      ...opts.onTrustRequest === void 0 ? {} : { trustRequest: opts.onTrustRequest }
     },
     guard: createAuthGuard({ token: binding.token, port, lanExposed: binding.lanExposed }),
     ...webRoot === void 0 ? {} : { webRoot },
@@ -4757,10 +5138,11 @@ function describeListenError(err, host, port) {
   }
   return t("web.listen_failed", { host, port, reason: err.message }, void 0);
 }
-function makeCloser(server, hub, runtime) {
+function makeCloser(server, hub, runtime, unsubscribeTasks) {
   let closing = null;
   return () => {
     closing ??= (async () => {
+      unsubscribeTasks();
       hub.shutdown();
       server.closeAllConnections();
       await new Promise((resolve4) => server.close(() => resolve4()));