@epoch-agent/server 0.10.1 → 0.12.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { createServer } from 'http';
 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, 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 { 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, conformsToWire, WIRE_LAST_SESSION_FIELDS, isQuestionAnswerMap, isProviderType, apiKeyEnvVar, WIRE_FILE_STAT_MAX, WIRE_SETTING_WRITE_LAYERS, isWirePlanAction, WIRE_PLAN_ACTIONS, isPermissionLevel, PERMISSION_LEVELS, 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, createWriteStream, accessSync, constants } from 'fs';
 import { stat, readFile, rm } from 'fs/promises';
@@ -197,6 +197,7 @@ var SessionRegistry = class {
       controller: null,
       turnStartedAt: null,
       lastFinish: null,
+      persisted: null,
       queue: [],
       lastActiveTick: ++this.tick
     });
@@ -376,6 +377,7 @@ function toWireSummary(id, hub, row, extra = {}) {
     turnStartedAt: state.turnStartedAt,
     lastFinish: state.lastFinish,
     role: extra.role ?? null,
+    archived: row?.archived ?? false,
     ...extra.snippet === void 0 ? {} : { snippet: extra.snippet }
   };
 }
@@ -388,7 +390,7 @@ function toWireSummaryWorkspace(bound, live, row) {
   }
   return row?.workspaceState === "none" ? { state: "none" } : { state: "unknown" };
 }
-function listSessionSummaries(hubStates, catalog, query, workspaceOf = () => null, roleOf = () => null, limit = DEFAULT_SESSION_LIST_LIMIT) {
+function listSessionSummaries(hubStates, catalog, query, workspaceOf = () => null, roleOf = () => null, limit = DEFAULT_SESSION_LIST_LIMIT, archived = false) {
   const byId = new Map(hubStates.map((s) => [s.id, s]));
   if (query) {
     if (!catalog) return [];
@@ -407,7 +409,7 @@ function listSessionSummaries(hubStates, catalog, query, workspaceOf = () => nul
     }
     return hits;
   }
-  const rows = catalog?.list(limit) ?? [];
+  const rows = catalog?.list(limit, archived ? { archived: true } : {}) ?? [];
   const summaries = rows.map(
     (row) => toWireSummary(row.id, byId.get(row.id), row, {
       workspace: workspaceOf(row.id),
@@ -415,7 +417,9 @@ function listSessionSummaries(hubStates, catalog, query, workspaceOf = () => nul
     })
   );
   const known = new Set(rows.map((r) => r.id));
-  const fresh = hubStates.filter((s) => !known.has(s.id)).map((s) => toWireSummary(s.id, s, null, { workspace: workspaceOf(s.id), role: roleOf(s.id) }));
+  const fresh = archived ? [] : hubStates.filter((s) => !known.has(s.id)).filter((s) => catalog?.get(s.id)?.archived !== true).map(
+    (s) => toWireSummary(s.id, s, null, { workspace: workspaceOf(s.id), role: roleOf(s.id) })
+  );
   return [...fresh, ...summaries].sort(compareSummaries).slice(0, limit);
 }
 function compareSummaries(a, b) {
@@ -462,6 +466,9 @@ var SessionHub = class {
   isCooled(sessionId) {
     return this.registry.isCooled(sessionId);
   }
+  persistedThrough(sessionId) {
+    return this.registry.get(sessionId)?.persisted ?? null;
+  }
   stateOf(sessionId) {
     return this.registry.get(sessionId)?.state ?? "idle";
   }
@@ -539,21 +546,22 @@ var SessionHub = class {
     }
     const queued = { message, ...decorate ? { decorate } : {} };
     if (entry.state !== "idle") {
+      const steered = decorate === void 0 && entry.queue.every((q) => q.decorate === void 0);
       if (!this.registry.enqueue(entry, queued)) {
         return { ok: false, reason: "queue-full", state: entry.state };
       }
-      return { ok: true, queued: true };
+      return { ok: true, queued: true, steered };
     }
     this.beginTurn(entry, queued);
     return { ok: true, queued: false };
   }
   abort(sessionId) {
     const entry = this.registry.get(sessionId);
-    if (!entry) return false;
-    entry.queue.length = 0;
-    if (!entry.controller) return false;
+    if (!entry) return { running: false, returned: [] };
+    const returned = entry.queue.splice(0, entry.queue.length).map((q) => q.message);
+    if (!entry.controller) return { running: false, returned };
     entry.controller.abort();
-    return true;
+    return { running: true, returned };
   }
   listPending(sessionId) {
     return this.registry.get(sessionId)?.relay.listPending() ?? [];
@@ -634,12 +642,19 @@ var SessionHub = class {
     const sessionId = entry.session.sessionId;
     const signal = entry.controller?.signal;
     try {
-      const run = entry.session.run(queued.message, signal ? { signal } : {});
+      const run = entry.session.run(queued.message, {
+        ...signal ? { signal } : {},
+        steer: this.steerFrom(entry)
+      });
       const raw = queued.decorate ? queued.decorate(run) : run;
       for await (const event of serializeStream(raw, entry.relay, entry.questions)) {
         const blocking = event.type === "approval-request" || event.type === "question";
         if (blocking) this.requestOwner.set(event.requestId, sessionId);
         const frame = this.publish(sessionId, stripArtifactData(event));
+        const through = entry.session.persistedThrough?.() ?? null;
+        if (through !== null && through !== entry.persisted?.id) {
+          entry.persisted = { id: through, seq: frame.seq };
+        }
         if (event.type === "finish") {
           entry.lastFinish = toWireFinish(event, frame.ts, entry.turnStartedAt);
         }
@@ -654,10 +669,22 @@ var SessionHub = class {
       }
       this.registry.touch(sessionId);
       entry.turnStartedAt = null;
+      entry.persisted = null;
       this.setState(entry, "idle");
       this.drainQueue(entry);
     }
   }
+  steerFrom(entry) {
+    const runLength = () => {
+      let n = 0;
+      while (n < entry.queue.length && entry.queue[n].decorate === void 0) n += 1;
+      return n;
+    };
+    return {
+      pending: () => runLength() > 0,
+      take: () => entry.queue.splice(0, runLength()).map((q) => q.message)
+    };
+  }
   drainQueue(entry) {
     if (this.closed || !this.registry.has(entry.session.sessionId)) return;
     if (this.present === 0) {
@@ -1500,9 +1527,13 @@ function toWireSettingRow(row) {
     overridable: row.overridable,
     writes: row.writes.map(toWireSettingWrite),
     ...row.valueKind === void 0 ? {} : { valueKind: row.valueKind },
-    ...row.choices === void 0 ? {} : { choices: [...row.choices] }
+    ...row.choices === void 0 ? {} : { choices: [...row.choices] },
+    ...row.pending === void 0 ? {} : { pending: toWireSettingPending(row.pending) }
   };
 }
+function toWireSettingPending(pending) {
+  return { ...toWireSettingWrite(pending), value: pending.value };
+}
 function toWireSettingStep(step) {
   return { layer: step.layer, ...step.value === void 0 ? {} : { value: step.value } };
 }
@@ -1604,11 +1635,18 @@ var APPROVAL_OUTCOMES = /* @__PURE__ */ new Set([
 function health(ctx, res) {
   sendJson(res, 200, { ok: true, version: ctx.version });
 }
+function lastSessionField(ctx) {
+  const recorded = ctx.runtime.lastOpenSession?.get();
+  if (!recorded) return {};
+  if (!ctx.hub.has(recorded) && !ctx.runtime.sessions?.get(recorded)) return {};
+  return { lastSessionId: recorded };
+}
 function config(ctx, res, lang) {
   const { runtime } = ctx;
   const bound = runtime.workspaces.of(runtime.sessionId);
   sendJson(res, 200, {
     sessionId: runtime.sessionId,
+    ...lastSessionField(ctx),
     model: runtime.config.model,
     permission: runtime.config.permission,
     workspace: bound ? toWireSessionWorkspace(bound) : null,
@@ -1638,13 +1676,15 @@ function config(ctx, res, lang) {
     nativeDirPicker: ctx.nativeDirPicker
   });
 }
-function listSessions(ctx, res, query, _lang) {
+function listSessions(ctx, res, query, _lang, archived = false) {
   const sessions = listSessionSummaries(
     ctx.hub.listSessions(),
     ctx.runtime.sessions,
     query ?? null,
     (id) => ctx.runtime.workspaces.of(id),
-    (id) => ctx.runtime.sessionFactory.get(id)?.role ?? null
+    (id) => ctx.runtime.sessionFactory.get(id)?.role ?? null,
+    void 0,
+    archived
   );
   sendJson(res, 200, { sessions });
 }
@@ -1686,9 +1726,16 @@ async function deleteSession(ctx, res, sessionId, lang) {
 async function patchSession(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 raw = asRecord(body.value).title;
-  const title = typeof raw === "string" ? raw.trim() : "";
-  if (title.length === 0) {
+  const fields = asRecord(body.value);
+  const rawTitle = fields["title"];
+  const rawArchived = fields["archived"];
+  const wantsTitle = rawTitle !== void 0;
+  const wantsArchive = typeof rawArchived === "boolean";
+  if (!wantsTitle && !wantsArchive) {
+    return sendError(res, 400, "bad-patch", t("web.patch_needs_field", void 0, lang));
+  }
+  const title = typeof rawTitle === "string" ? rawTitle.trim() : "";
+  if (wantsTitle && title.length === 0) {
     return sendError(res, 400, "bad-title", t("web.title_required", void 0, lang));
   }
   const catalog = ctx.runtime.sessions;
@@ -1700,8 +1747,11 @@ async function patchSession(ctx, req, res, sessionId, lang) {
       t("web.session_store_unavailable", void 0, lang)
     );
   }
-  const row = catalog.rename(sessionId, title);
+  let row = wantsTitle ? catalog.rename(sessionId, title) : catalog.get(sessionId);
+  const archivedBefore = row?.archived;
+  if (row && wantsArchive) row = catalog.setArchived(sessionId, rawArchived);
   if (!row) return sendUnknownSession(res, sessionId, lang);
+  if (wantsArchive && archivedBefore !== row.archived) ctx.hub.notifySessionsChanged(sessionId);
   const hub = ctx.hub.listSessions().find((s) => s.id === sessionId);
   sendJson(res, 200, {
     session: toWireSummary(sessionId, hub, row, {
@@ -1714,11 +1764,17 @@ function listMessages(ctx, res, sessionId, lang) {
   if (!ctx.hub.has(sessionId) && !ctx.runtime.sessions?.get(sessionId)) {
     return sendUnknownSession(res, sessionId, lang);
   }
-  const messages = ctx.runtime.sessionStore?.loadMessages(sessionId) ?? [];
+  const all = ctx.runtime.sessionStore?.loadMessages(sessionId) ?? [];
   const usage = ctx.runtime.sessionUsage(sessionId);
+  const flight = ctx.hub.persistedThrough(sessionId);
+  const openFrom = ctx.runtime.sessionStore?.openTurnFrom(sessionId) ?? null;
+  const messages = flight ? all.filter((m) => m.id <= flight.id) : all;
+  const interrupted = flight === null && openFrom !== null ? openFrom : void 0;
   sendJson(res, 200, {
     messages,
-    ...usage ? { usage } : {}
+    ...usage ? { usage } : {},
+    ...flight ? { inFlightThroughSeq: flight.seq } : {},
+    ...interrupted !== void 0 ? { interruptedTurnFrom: interrupted } : {}
   });
 }
 async function postMessage(ctx, req, res, sessionId, lang) {
@@ -1752,6 +1808,7 @@ async function postMessage(ctx, req, res, sessionId, lang) {
     return sendJson(res, 202, {
       accepted: true,
       queued: started.queued,
+      ...started.steered === void 0 ? {} : { steered: started.steered },
       ...expansion.notice ? { command: expansion.notice } : {},
       ...attached.references.length > 0 ? { references: attached.references } : {},
       ...attached.files.length > 0 ? { files: attached.files } : {}
@@ -1773,7 +1830,11 @@ function pickTurnRole(live, raw) {
 }
 function abortSession(ctx, res, sessionId, lang) {
   if (!ctx.hub.has(sessionId)) return sendUnknownSession(res, sessionId, lang);
-  sendJson(res, 200, { aborted: ctx.hub.abort(sessionId) });
+  const stopped = ctx.hub.abort(sessionId);
+  sendJson(res, 200, {
+    aborted: stopped.running,
+    ...stopped.returned.length > 0 ? { returned: stopped.returned } : {}
+  });
 }
 function listApprovals(ctx, res, sessionId, lang) {
   if (!ctx.hub.has(sessionId)) return sendUnknownSession(res, sessionId, lang);
@@ -2088,6 +2149,9 @@ async function rewind(ctx, req, res, sessionId, lang) {
   const input = readRewindInput(body.value, lang);
   if (!input.ok) return sendError(res, 400, input.code, input.message);
   const { turnIndex, scope, overwrite } = input.value;
+  if (scope !== "files" && ctx.hub.stateOf(sessionId) !== "idle") {
+    return sendError(res, 409, "turn-running", t("web.rewind_turn_running", void 0, lang));
+  }
   const result = await control.rewind(turnIndex, {
     scope,
     ...overwrite === void 0 ? {} : { overwrite }
@@ -2284,6 +2348,32 @@ function listBlockedGoals(ctx, res, _lang) {
   );
   sendJson(res, 200, { items });
 }
+async function putLastSession(ctx, req, res, lang) {
+  const control = ctx.runtime.lastOpenSession;
+  if (!control) {
+    return sendError(
+      res,
+      503,
+      "no-last-session-store",
+      t("web.last_session_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_LAST_SESSION_FIELDS)) {
+    return sendError(res, 400, "bad-request", t("web.last_session_bad_request", {}, lang));
+  }
+  const { sessionId } = body.value;
+  if (typeof sessionId !== "string" || sessionId.length === 0) {
+    return sendError(res, 400, "bad-request", t("web.last_session_bad_request", {}, lang));
+  }
+  if (!ctx.hub.has(sessionId) && !ctx.runtime.sessions?.get(sessionId)) {
+    return sendUnknownSession(res, sessionId, lang);
+  }
+  const failure = control.set(sessionId);
+  if (failure) return sendError(res, 500, "write-failed", failure(lang));
+  sendJson(res, 200, { ok: true });
+}
 function readConfig(ctx, res, lang) {
   if (ctx.lanExposed) return sendLanExposed(res, lang);
   const outcome = ctx.runtime.mcp.readConfig();
@@ -2959,6 +3049,8 @@ function sendUploadPreview(res, outcome) {
       ok: false,
       plan: null,
       token: null,
+      prefill: null,
+      fromManifest: null,
       reason: outcome.reason,
       detail: outcome.detail
     });
@@ -2977,6 +3069,8 @@ function sendUploadPreview(res, outcome) {
       skippedLinks: [...skippedLinks]
     },
     token: outcome.token,
+    prefill: outcome.prefill,
+    fromManifest: [...outcome.fromManifest],
     reason: null,
     detail: null
   });
@@ -3142,6 +3236,39 @@ function addFailure2(reason, detail, lang) {
 function stringList2(value) {
   return value.filter((v) => typeof v === "string");
 }
+async function removeRole(ctx, req, res, lang) {
+  if (ctx.lanExposed) {
+    return sendError(
+      res,
+      403,
+      "role-remove-lan-exposed",
+      t("web.role_remove_lan_exposed", void 0, lang)
+    );
+  }
+  const body = await readJsonBody(req);
+  if (!body.ok) return sendError(res, body.status, "bad-body", body.message);
+  const payload = asRecord(body.value);
+  const name = typeof payload["name"] === "string" ? payload["name"].trim() : "";
+  const outcome = ctx.runtime.roleWrite.remove(name, lang);
+  if (!outcome.ok) {
+    return sendJson(res, 200, {
+      ok: false,
+      name: "",
+      path: null,
+      takenOverBy: null,
+      detail: outcome.detail,
+      reason: outcome.reason
+    });
+  }
+  sendJson(res, 200, {
+    ok: true,
+    name: outcome.name,
+    path: outcome.path,
+    takenOverBy: outcome.takenOverBy,
+    detail: null,
+    reason: null
+  });
+}
 function stringList3(value) {
   if (!Array.isArray(value)) return null;
   const out = [];
@@ -3361,6 +3488,12 @@ function listPending(ctx, res, lang) {
   const items = collectPendingApprovals(control.list(), control.recentRuns(RECENT_RUNS_LIMIT));
   sendJson(res, 200, { items });
 }
+function listRunning(ctx, res, lang) {
+  const control = schedulesOf(ctx, res, lang);
+  if (!control) return;
+  const items = control.running().map(({ scheduleId, startedAt }) => ({ scheduleId, startedAt }));
+  sendJson(res, 200, { items });
+}
 function getSchedule(ctx, res, id, lang) {
   const control = schedulesOf(ctx, res, lang);
   if (!control) return;
@@ -3394,10 +3527,20 @@ async function patchSchedule(ctx, req, res, id, lang) {
   if (!body.ok) return sendError(res, body.status, "bad-body", body.message);
   const parsed = parseUpdate2(body.value, lang);
   if (!parsed.ok) return sendError(res, 400, "bad-schedule", parsed.message);
-  const saved = await control.update(id, parsed.value, {
-    bypassAcknowledged: bypassAcknowledged(body.value)
-  });
-  sendJson(res, 200, toSaveResponse(control, saved));
+  const { enabled, ...rest } = parsed.value;
+  const saved = Object.keys(rest).length > 0 ? await control.update(id, rest, { bypassAcknowledged: bypassAcknowledged(body.value) }) : { issues: [] };
+  if (saved.issues.length > 0) return sendJson(res, 200, toSaveResponse(control, saved));
+  const registration = enabled === void 0 ? saved.registration : await control.setEnabled(id, enabled);
+  const next = control.get(id) ?? saved.schedule;
+  sendJson(
+    res,
+    200,
+    toSaveResponse(control, {
+      ...next ? { schedule: next } : {},
+      issues: [],
+      ...registration ? { registration } : {}
+    })
+  );
 }
 async function deleteSchedule(ctx, res, id, lang) {
   const control = schedulesOf(ctx, res, lang);
@@ -4738,6 +4881,9 @@ async function handleApi(opts, req, res, method, segments, lang) {
     return config(ctx, res, lang);
   }
   if (resource === "events" && method === "GET") return openStream(opts, req, res);
+  if (resource === "last-session" && first === void 0 && method === "PUT") {
+    return putLastSession(ctx, req, res, lang);
+  }
   if (resource === "sessions") {
     return handleSessions(opts, req, res, method, first, second, detail, lang);
   }
@@ -4768,6 +4914,9 @@ async function handleApi(opts, req, res, method, segments, lang) {
   if (resource === "roles" && first === void 0 && method === "POST") {
     return addRole(ctx, req, res, lang);
   }
+  if (resource === "roles" && first === "remove" && method === "POST") {
+    return removeRole(ctx, req, res, lang);
+  }
   if (resource === "skills" && first === "import" && second === "preview" && method === "POST") {
     return previewSkillImport(ctx, req, res, lang);
   }
@@ -4865,6 +5014,10 @@ async function handleSchedules(ctx, req, res, method, scheduleId, action, runId,
     if (isRead(method)) return listPending(ctx, res, lang);
     return methodNotAllowed(res, "GET", lang);
   }
+  if (action === void 0 && scheduleId === "running") {
+    if (isRead(method)) return listRunning(ctx, res, lang);
+    return methodNotAllowed(res, "GET", lang);
+  }
   if (action === void 0) {
     if (isRead(method)) return getSchedule(ctx, res, scheduleId, lang);
     if (method === "PATCH") return patchSchedule(ctx, req, res, scheduleId, lang);
@@ -4888,7 +5041,9 @@ async function handleSchedules(ctx, req, res, method, scheduleId, action, runId,
 async function handleSessions(opts, req, res, method, sessionId, action, detail, lang) {
   const { ctx } = opts;
   if (sessionId === void 0) {
-    if (isRead(method)) return listSessions(ctx, res, searchQuery(req.url));
+    if (isRead(method)) {
+      return listSessions(ctx, res, searchQuery(req.url), lang, archivedFlag(req.url));
+    }
     if (method === "POST") return createSession(ctx, req, res, lang);
     return methodNotAllowed(res, "GET, POST", lang);
   }
@@ -5025,6 +5180,10 @@ function searchQuery(rawUrl) {
   const value = new URL(rawUrl ?? "/", "http://127.0.0.1").searchParams.get("q")?.trim();
   return value ? value : void 0;
 }
+function archivedFlag(rawUrl) {
+  const raw = new URL(rawUrl ?? "/", "http://127.0.0.1").searchParams.get("archived");
+  return raw === "1" || raw === "true";
+}
 function redirectWithoutToken(res, rawUrl) {
   const url = new URL(rawUrl ?? "/", "http://127.0.0.1");
   url.searchParams.delete(WIRE_AUTH_TOKEN_PARAM);