@epoch-agent/server 0.11.0 → 0.13.0

package/dist/index.js

@@ -197,6 +197,7 @@ var SessionRegistry = class {
       controller: null,
       turnStartedAt: null,
       lastFinish: null,
+      persisted: null,
       queue: [],
       lastActiveTick: ++this.tick
     });
@@ -465,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";
   }
@@ -542,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() ?? [];
@@ -637,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);
         }
@@ -657,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) {
@@ -1503,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 } };
 }
@@ -1720,8 +1748,10 @@ async function patchSession(ctx, req, res, sessionId, lang) {
     );
   }
   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, {
@@ -1734,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) {
@@ -1772,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 } : {}
@@ -1793,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);
@@ -2108,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 }
@@ -3192,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 = [];
@@ -4837,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);
   }