doer-agent 0.4.1 → 0.4.2

package/dist/agent.js

@@ -21,7 +21,6 @@ const settingsRpcCodec = StringCodec();
 const gitRpcCodec = StringCodec();
 const skillRpcCodec = StringCodec();
 const runEventsCodec = StringCodec();
-const retainedRuns = new Map();
 const activeSessionWatchers = new Map();
 const sessionLineIndexCache = new Map();
 const ANSI_RE = /\u001b\[[0-9;]*m/g;
@@ -1004,9 +1003,9 @@ function cloneRunTask(task, _sinceSeq) {
         ...task,
     };
 }
-function buildImmediateRunChangedEvent(task) {
+function buildImmediateRunEvent(task, type) {
     return {
-        type: "run.changed",
+        type,
         agentId: task.agentId,
         sessionId: task.sessionId,
         filePath: task.sessionFilePath,
@@ -1020,8 +1019,8 @@ function buildImmediateRunChangedEvent(task) {
         finishedAt: task.finishedAt,
     };
 }
-function publishImmediateRunChangedEvent(args) {
-    args.nc.publish(buildAgentRunEventsSubject(args.userId, args.task.agentId), runEventsCodec.encode(JSON.stringify(buildImmediateRunChangedEvent(args.task))));
+function publishImmediateRunEvent(args) {
+    args.nc.publish(buildAgentRunEventsSubject(args.userId, args.task.agentId), runEventsCodec.encode(JSON.stringify(buildImmediateRunEvent(args.task, args.type ?? "run.changed"))));
 }
 async function findSessionFilePathBySessionId(sessionId) {
     const targetSessionId = sessionId.trim();
@@ -1159,7 +1158,7 @@ async function updateRunSessionMetadata(task, metadata) {
     task.updatedAt = formatLocalTimestamp();
     await persistRunTask(task).catch(() => undefined);
     if (metadata.nc) {
-        publishImmediateRunChangedEvent({
+        publishImmediateRunEvent({
             nc: metadata.nc,
             userId: task.userId,
             task,
@@ -1173,9 +1172,6 @@ async function updateRunSessionMetadata(task, metadata) {
         }).catch(() => undefined);
     }
 }
-function persistRetainedRun(task) {
-    retainedRuns.set(task.id, cloneRunTask(task));
-}
 function normalizePersistedRunTask(value) {
     if (!value || typeof value !== "object") {
         return null;
@@ -1239,10 +1235,10 @@ async function getStoredRun(runId) {
             }
         }
         catch {
-            // Ignore malformed persisted state and fall back to retained memory.
+            // Ignore malformed persisted state.
         }
     }
-    return retainedRuns.get(runId) ?? null;
+    return null;
 }
 async function startManagedRun(args) {
     const prepared = await prepareCommandExecution({
@@ -1321,8 +1317,8 @@ async function startManagedRun(args) {
         task.status = "failed";
         task.error = message;
         task.finishedAt = formatLocalTimestamp();
-        persistRetainedRun(task);
-        publishImmediateRunChangedEvent({ nc: args.nc, userId: task.userId, task });
+        publishImmediateRunEvent({ nc: args.nc, userId: task.userId, task });
+        publishImmediateRunEvent({ nc: args.nc, userId: task.userId, task, type: "run.finished" });
         void removeRunTask(task.id).catch(() => undefined);
         void releaseRunStartSlot({ runId: task.id, sessionId: task.sessionId }).catch(() => undefined);
         void prepared.codexAuthCleanup().catch(() => undefined);
@@ -1339,16 +1335,15 @@ async function startManagedRun(args) {
         task.finishedAt = formatLocalTimestamp();
         task.status = task.cancelRequested ? "canceled" : (task.resultExitCode ?? 1) === 0 ? "completed" : "failed";
         task.error = task.status === "failed" ? `Command exited with code ${task.resultExitCode ?? "null"}` : null;
-        persistRetainedRun(task);
-        publishImmediateRunChangedEvent({ nc: args.nc, userId: task.userId, task });
+        publishImmediateRunEvent({ nc: args.nc, userId: task.userId, task });
+        publishImmediateRunEvent({ nc: args.nc, userId: task.userId, task, type: "run.finished" });
         void removeRunTask(task.id).catch(() => undefined);
         void releaseRunStartSlot({ runId: task.id, sessionId: task.sessionId }).catch(() => undefined);
         void prepared.codexAuthCleanup().catch(() => undefined);
         writeRunStatus(task.id, `completed status=${task.status} exitCode=${task.resultExitCode ?? "null"} signal=${task.resultSignal ?? "null"}`);
     });
-    persistRetainedRun(task);
     void persistRunTask(task).catch(() => undefined);
-    publishImmediateRunChangedEvent({ nc: args.nc, userId: task.userId, task });
+    publishImmediateRunEvent({ nc: args.nc, userId: task.userId, task });
     writeRunStatus(task.id, `started requestId=${args.requestId} cwd=${prepared.taskWorkspace}`);
     if (!task.sessionId) {
         void pollPendingSession();
@@ -2411,17 +2406,8 @@ async function handleRunRpcMessage(args) {
             return;
         }
         if (request.action === "list") {
-            const persisted = await listPersistedRunTasks();
-            const mergedById = new Map();
-            for (const task of persisted) {
-                mergedById.set(task.id, cloneRunTask(task));
-            }
-            for (const task of retainedRuns.values()) {
-                if (!mergedById.has(task.id)) {
-                    mergedById.set(task.id, cloneRunTask(task));
-                }
-            }
-            const merged = [...mergedById.values()]
+            const merged = (await listPersistedRunTasks())
+                .map((task) => cloneRunTask(task))
                 .sort((a, b) => Date.parse(b.updatedAt) - Date.parse(a.updatedAt))
                 .slice(0, request.limit);
             publishRunRpcResponse({ nc: args.jetstream.nc, responseSubject, payload: { requestId, ok: true, tasks: merged } });
@@ -2439,7 +2425,7 @@ async function handleRunRpcMessage(args) {
             target.cancelRequested = true;
             target.updatedAt = formatLocalTimestamp();
             await persistRunTask(target);
-            publishImmediateRunChangedEvent({ nc: args.jetstream.nc, userId: target.userId, task: target });
+            publishImmediateRunEvent({ nc: args.jetstream.nc, userId: target.userId, task: target });
             writeRunStatus(target.id, `cancel requested pid=${target.processPid}`);
             sendSignalToPid(target.processPid, "SIGINT");
             const task = cloneRunTask(target);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",