@jpcasabiancai/cayenne 0.5.2 → 0.5.3

package/dist/cli.js

@@ -9925,6 +9925,9 @@ function worthRespawning(current, next) {
   if (next.state !== "ok") return next.state === "none" && current.state !== "none";
   return current.state !== "ok" || current.token !== next.token;
 }
+function refusedByPostgres(code) {
+  return typeof code === "string" && /^[0-9A-Z]{5}$/.test(code) && code !== UNIQUE_VIOLATION && code !== "40003" && !code.startsWith("08") && !code.startsWith("57P");
+}
 function assertTaskMode(mode) {
   if (TASK_REFUSED_MODES.has(mode)) {
     throw new Error(`VALIDATION: a task session cannot run in ${mode}`);
@@ -9962,7 +9965,7 @@ function shrink(event) {
       return null;
   }
 }
-var READ_ONLY_TEXT, REFRESH_WITHIN_MS, betweenTurns, UNREADABLE_MARK_CREDS, roundUsd, ORPHANED_STATUSES, RESTARTABLE_STATUSES, isAtOrBelow3, DENY_MESSAGE_MAX, EXIT_ERROR_MAX, INITIAL_PROMPT_MAX, TASK_SKILL_LOOKUP_MS, TASK_REFUSED_MODES, OWNER_DRIVEN_KINDS, REPO_OWNER_ONLY, REPO_NO_DUPLICATE, PROVIDER_SESSION_ID, REPO_WORKTREE_GONE, TASK_ASK_TOOLS, MEMORY_PREAMBLE, MEMORY_SOURCE, wrapMemory, PATH_INPUT_TOOLS, PATH_INPUT_KEYS, isRecord, errorCode, SessionManager;
+var READ_ONLY_TEXT, REFRESH_WITHIN_MS, betweenTurns, UNREADABLE_MARK_CREDS, roundUsd, UNIQUE_VIOLATION, ROW_WRITE_TIMEOUT_MS, ORPHANED_STATUSES, RESTARTABLE_STATUSES, isAtOrBelow3, DENY_MESSAGE_MAX, EXIT_ERROR_MAX, INITIAL_PROMPT_MAX, TASK_SKILL_LOOKUP_MS, TASK_REFUSED_MODES, OWNER_DRIVEN_KINDS, REPO_OWNER_ONLY, REPO_NO_DUPLICATE, PROVIDER_SESSION_ID, REPO_WORKTREE_GONE, TASK_ASK_TOOLS, MEMORY_PREAMBLE, MEMORY_SOURCE, wrapMemory, PATH_INPUT_TOOLS, PATH_INPUT_KEYS, isRecord, errorCode, SessionManager;
 var init_manager = __esm({
   "src/sessions/manager.ts"() {
     "use strict";
@@ -10004,6 +10007,8 @@ var init_manager = __esm({
       readOnlyText: READ_ONLY_UNAVAILABLE
     };
     roundUsd = (usd) => Math.round(usd * 1e6) / 1e6;
+    UNIQUE_VIOLATION = "23505";
+    ROW_WRITE_TIMEOUT_MS = 3e4;
     ORPHANED_STATUSES = ["running", "awaiting_permission"];
     RESTARTABLE_STATUSES = /* @__PURE__ */ new Set(["idle", ...ORPHANED_STATUSES]);
     isAtOrBelow3 = (p, dir) => p === dir || p.startsWith(dir.endsWith(sep16) ? dir : `${dir}${sep16}`);
@@ -11806,6 +11811,7 @@ var init_manager = __esm({
           stopping: false,
           dropping: null,
           inflight: /* @__PURE__ */ new Set(),
+          writes: Promise.resolve(),
           changesVersion: this.nextChangesSeed(),
           watcher: null,
           docs: null,
@@ -12099,13 +12105,15 @@ var init_manager = __esm({
         );
         session.on("result", (r) => {
           this.deps.timings?.finished(sessionId);
+          const lastSeq = live.writes.then(() => live.seq);
           guard(async () => {
             if (live.provider === "claude") await this.recordCost(sessionId, live, r);
+            const seq = await lastSeq;
             const status = r.isError ? "error" : "idle";
             live.status = status;
             await this.updateSession(sessionId, { status, last_message_at: (/* @__PURE__ */ new Date()).toISOString() });
             const { authMode: _authMode, ...event } = r;
-            await this.broadcast(sessionId, { type: "result", seq: live.seq, ...event });
+            await this.broadcast(sessionId, { type: "result", seq, ...event });
             await this.broadcast(sessionId, {
               type: "session.status",
               status,
@@ -12213,36 +12221,55 @@ var init_manager = __esm({
           );
         });
       }
+      /**
+       * Write one `chat_messages` row and broadcast its `message` twin, in this session's write order.
+       *
+       * The step is queued on `live.writes` before this method first awaits, so two calls made back to
+       * back (the SDK hands a short turn's reply and result row over on one tick) insert and broadcast
+       * in call order: insert N and its broadcast both happen before insert N+1 starts. A caller on
+       * the prompt path may therefore wait for earlier rows' inserts — a database wait. It never
+       * waits on a relay send: `broadcast` returns once the relay has the event queued.
+       *
+       * Rejects with `PROVIDER_ERROR: persist failed: …` for this row only; the chain goes on.
+       */
       async persist(sessionId, live, role, content, providerUuid, parentToolUseId, raw) {
         const safeContent = this.secrets.redact(content);
         const safeRaw = this.secrets.redact(raw);
-        live.seq += 1;
-        const seq = live.seq;
-        const { data, error } = await this.deps.db.from("chat_messages").insert({
-          session_id: sessionId,
-          // Overwritten from the session by stamp_message_workspace; the insert policy still needs
-          // is_member(workspace_id) to see a non-null value.
-          workspace_id: this.deps.workspaceId,
-          seq,
-          role,
-          content: safeContent,
-          provider_uuid: providerUuid,
-          parent_tool_use_id: parentToolUseId,
-          raw: safeRaw
-        }).select(
-          "id, session_id, workspace_id, seq, role, content, provider_uuid, parent_tool_use_id, created_at"
-        ).single();
-        if (error || !data) {
-          throw new Error(`PROVIDER_ERROR: persist failed: ${error?.message ?? "no row"}`);
-        }
-        const row = {
-          ...data,
-          seq,
-          role,
-          content: safeContent
-        };
-        await this.broadcast(sessionId, { type: "message", message: row });
-        return row;
+        const step = live.writes.then(async () => {
+          const seq = live.seq + 1;
+          live.seq = seq;
+          const { data, error } = await this.deps.db.from("chat_messages").insert({
+            session_id: sessionId,
+            // Overwritten from the session by stamp_message_workspace; the insert policy still needs
+            // is_member(workspace_id) to see a non-null value.
+            workspace_id: this.deps.workspaceId,
+            seq,
+            role,
+            content: safeContent,
+            provider_uuid: providerUuid,
+            parent_tool_use_id: parentToolUseId,
+            raw: safeRaw
+          }).select(
+            "id, session_id, workspace_id, seq, role, content, provider_uuid, parent_tool_use_id, created_at"
+          ).abortSignal(AbortSignal.timeout(ROW_WRITE_TIMEOUT_MS)).single();
+          if (error || !data) {
+            if (refusedByPostgres(error?.code)) live.seq = seq - 1;
+            throw new Error(`PROVIDER_ERROR: persist failed: ${error?.message ?? "no row"}`);
+          }
+          const row = {
+            ...data,
+            seq,
+            role,
+            content: safeContent
+          };
+          await this.broadcast(sessionId, { type: "message", message: row });
+          return row;
+        });
+        live.writes = step.then(
+          () => void 0,
+          () => void 0
+        );
+        return step;
       }
       /**
        * The highest `chat_messages.seq` this session has, or 0. A failed read is fatal rather than

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpcasabiancai/cayenne",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "files": [
     "dist/cli.js"
   ],