negotium 0.2.4 → 0.2.6

package/dist/runtime/src/storage/runtime-gateway-submissions.ts

@@ -9,6 +9,8 @@ export interface RuntimeGatewaySubmission {
   createdAt: string;
   ackCursor: number;
   messageCursor: number;
+  /** Hash of every ingress field that can change canonical or execution semantics. */
+  payloadHash?: string;
 }
 
 interface RuntimeGatewaySubmissionRow {
@@ -20,6 +22,7 @@ interface RuntimeGatewaySubmissionRow {
   created_at: string;
   ack_cursor: number | bigint;
   message_cursor: number | bigint;
+  payload_hash: string | null;
 }
 
 db.exec(`
@@ -31,7 +34,8 @@ db.exec(`
     user_id TEXT NOT NULL,
     created_at TEXT NOT NULL,
     ack_cursor INTEGER NOT NULL DEFAULT 0,
-    message_cursor INTEGER NOT NULL DEFAULT 0
+    message_cursor INTEGER NOT NULL DEFAULT 0,
+    payload_hash TEXT
   )
 `);
 try {
@@ -39,6 +43,9 @@ try {
     "ALTER TABLE runtime_gateway_submissions ADD COLUMN ack_cursor INTEGER NOT NULL DEFAULT 0",
   );
 } catch {}
+try {
+  db.exec("ALTER TABLE runtime_gateway_submissions ADD COLUMN payload_hash TEXT");
+} catch {}
 try {
   db.exec(
     "ALTER TABLE runtime_gateway_submissions ADD COLUMN message_cursor INTEGER NOT NULL DEFAULT 0",
@@ -58,6 +65,7 @@ function rowToSubmission(row: RuntimeGatewaySubmissionRow): RuntimeGatewaySubmis
     createdAt: row.created_at,
     ackCursor: Number(row.ack_cursor),
     messageCursor: Number(row.message_cursor),
+    payloadHash: row.payload_hash ?? undefined,
   };
 }
 
@@ -76,12 +84,32 @@ export function findRuntimeGatewaySubmission(
   return row ? rowToSubmission(row) : null;
 }
 
+/**
+ * Attach a payload hash to a submission recorded before the `payload_hash`
+ * column existed (or before it was populated for that row). Called the first
+ * time a legacy row is confirmed to match a duplicate request on every field
+ * we *can* verify, so every subsequent replay under the same key is checked
+ * against the full semantic payload instead of the narrower legacy field set.
+ * A no-op once the row already has a hash, so it never overwrites a value
+ * `submitRuntimeGatewayTurn` already trusts.
+ */
+export function backfillRuntimeGatewaySubmissionPayloadHash(
+  clientMessageId: string,
+  payloadHash: string,
+): void {
+  db.query(
+    `UPDATE runtime_gateway_submissions
+       SET payload_hash = ?
+       WHERE client_message_id = ? AND payload_hash IS NULL`,
+  ).run(payloadHash, clientMessageId);
+}
+
 export function recordRuntimeGatewaySubmission(submission: RuntimeGatewaySubmission): void {
   db.query(
     `INSERT INTO runtime_gateway_submissions
        (client_message_id, request_id, topic_id, message_id, user_id, created_at,
-        ack_cursor, message_cursor)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
+        ack_cursor, message_cursor, payload_hash)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
   ).run(
     submission.clientMessageId,
     submission.requestId,
@@ -91,5 +119,6 @@ export function recordRuntimeGatewaySubmission(submission: RuntimeGatewaySubmiss
     submission.createdAt,
     submission.ackCursor,
     submission.messageCursor,
+    submission.payloadHash ?? null,
   );
 }

package/dist/runtime/src/storage/runtime-turn-requests.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import {
   flattenUserTurnAttachments,
   legacyUserTurnEnvelope,
-  renderUserPromptBatch,
+  renderUserTurnBatch,
   type UserTurnEnvelope,
 } from "#runtime/user-turn-envelope";
 import { db } from "#storage/forum-db";
@@ -31,10 +31,14 @@ export interface RuntimeUserTurnExecution {
   bridgeSessionFromHistory?: boolean;
   peerBridge?: PeerRuntimeBridgeContext;
   from?: string;
+  /** Vault namespace for this turn, independent from the local execution principal. */
+  vaultUserId?: string;
   /** Newly accepted user texts not yet recorded in the unified conversation log. */
   conversationPrompts?: string[];
   /** Number of leading userMessages already present in the unified conversation log. */
   loggedUserMessageCount?: number;
+  /** Native session whose provider output proves it accepted this request's user turn. */
+  providerSessionId?: string;
   /** Request ids whose ordered messages were folded into this replacement. */
   supersededRequestIds?: string[];
 }
@@ -175,7 +179,11 @@ function rowToRequest(row: RuntimeUserTurnRequestRow): RuntimeUserTurnRequest {
               (Array.isArray((item as UserTurnEnvelope).attachments) &&
                 (item as UserTurnEnvelope).attachments?.every(
                   (attachment) => typeof attachment === "string",
-                ))),
+                ))) &&
+            ((item as UserTurnEnvelope).actorUserId === undefined ||
+              typeof (item as UserTurnEnvelope).actorUserId === "string") &&
+            ((item as UserTurnEnvelope).actorLabel === undefined ||
+              typeof (item as UserTurnEnvelope).actorLabel === "string"),
         )
       ) {
         userMessages = parsed as UserTurnEnvelope[];
@@ -285,6 +293,8 @@ export function mergeRuntimeUserTurnRequest(input: {
   execution: RuntimeUserTurnExecution;
   topicEpoch: number;
   alreadyIncludedRequestIds?: string[];
+  /** Requests already committed to the provider's native session; keep their lineage, not prompts. */
+  omitRequestIds?: string[];
 }): { requestId: string; supersededRequestIds: string[] } {
   const now = Date.now();
   return db
@@ -295,14 +305,23 @@ export function mergeRuntimeUserTurnRequest(input: {
         )
         .all(input.topicId);
       const previous = rows.map(rowToRequest);
+      const omittedRequestIds = new Set([
+        ...(input.omitRequestIds ?? []),
+        ...previous
+          .filter((request) => Boolean(request.execution?.providerSessionId))
+          .map((request) => request.requestId),
+      ]);
+      const carried = previous.filter((request) => !omittedRequestIds.has(request.requestId));
       const alreadyIncludedRequestIds = new Set(input.alreadyIncludedRequestIds ?? []);
-      const alreadyIncludedMessages = previous
+      const alreadyIncludedMessages = carried
         .filter((request) => alreadyIncludedRequestIds.has(request.requestId))
         .flatMap((request) => request.userMessages);
       const includedPrefixMatches = alreadyIncludedMessages.every((message, index) => {
         const candidate = input.userMessages[index];
         return (
           candidate?.prompt === message.prompt &&
+          candidate.actorUserId === message.actorUserId &&
+          candidate.actorLabel === message.actorLabel &&
           JSON.stringify(candidate.attachments ?? []) === JSON.stringify(message.attachments ?? [])
         );
       });
@@ -310,7 +329,7 @@ export function mergeRuntimeUserTurnRequest(input: {
         ? alreadyIncludedMessages.length
         : 0;
       const userMessages = [
-        ...previous.flatMap((request) => request.userMessages),
+        ...carried.flatMap((request) => request.userMessages),
         ...input.userMessages.slice(alreadyIncludedMessageCount),
       ];
       const incomingLoggedCount = Math.min(
@@ -318,7 +337,7 @@ export function mergeRuntimeUserTurnRequest(input: {
         input.userMessages.length,
       );
       const loggedUserMessageCount =
-        previous.reduce((count, request) => count + loggedMessageCount(request), 0) +
+        carried.reduce((count, request) => count + loggedMessageCount(request), 0) +
         Math.max(0, incomingLoggedCount - alreadyIncludedMessageCount);
       const execution: RuntimeUserTurnExecution = {
         ...input.execution,
@@ -335,7 +354,7 @@ export function mergeRuntimeUserTurnRequest(input: {
           .slice(loggedUserMessageCount)
           .map((message) => message.prompt),
       };
-      const sessionBase = previous.find(
+      const sessionBase = carried.find(
         (request) => request.execution?.sessionIdSpecified,
       )?.execution;
       if (sessionBase?.sessionIdSpecified) {
@@ -355,7 +374,7 @@ export function mergeRuntimeUserTurnRequest(input: {
         input.requestId,
         input.topicId,
         input.userId,
-        renderUserPromptBatch(userMessages.map((message) => message.prompt)),
+        renderUserTurnBatch(userMessages),
         JSON.stringify(userMessages),
         attachments?.length ? JSON.stringify(attachments) : null,
         input.allowAutoContinue ? 1 : 0,
@@ -371,6 +390,46 @@ export function mergeRuntimeUserTurnRequest(input: {
     .immediate();
 }
 
+/**
+ * Record that provider output proves the native session contains this durable
+ * turn. A session-id event alone is insufficient: some providers publish it
+ * before appending the user prompt. This marker lets a different runtime
+ * process omit only a demonstrably committed prompt when it merges a steering
+ * message after preemption.
+ *
+ * Match only the exact request id. A late session event from a superseded turn
+ * must not mark its replacement (whose prompts have not reached the provider).
+ */
+export function markRuntimeUserTurnProviderSessionObserved(
+  topicId: string,
+  requestId: string,
+  sessionId: string,
+): boolean {
+  return db
+    .transaction(() => {
+      const row = db
+        .query<RuntimeUserTurnRequestRow, [string, string]>(
+          "SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? AND request_id = ?",
+        )
+        .get(topicId, requestId);
+      if (!row) return false;
+      const request = rowToRequest(row);
+      const execution: RuntimeUserTurnExecution = {
+        ...request.execution,
+        providerSessionId: sessionId,
+      };
+      const result = db
+        .query(
+          `UPDATE runtime_user_turn_requests
+           SET execution_json = ?
+           WHERE topic_id = ? AND request_id = ?`,
+        )
+        .run(JSON.stringify(execution), topicId, requestId);
+      return result.changes === 1;
+    })
+    .immediate();
+}
+
 export function markRuntimeUserTurnMessagesLogged(
   topicId: string,
   requestId: string,
@@ -392,6 +451,8 @@ export function markRuntimeUserTurnMessagesLogged(
           const candidate = request.userMessages[index];
           return (
             candidate?.prompt === message.prompt &&
+            candidate.actorUserId === message.actorUserId &&
+            candidate.actorLabel === message.actorLabel &&
             JSON.stringify(candidate.attachments ?? []) ===
               JSON.stringify(message.attachments ?? [])
           );

package/dist/runtime/src/types.ts

@@ -176,6 +176,8 @@ export interface AgentQueryOptions {
   cwd: string;
   systemPrompt: string;
   userId?: string;
+  /** Credential namespace when it differs from the execution principal. */
+  vaultUserId?: string;
   session?: string;
   playwrightPort?: number;
   playwrightCapability?: string;

package/dist/runtime/src/version.ts

@@ -1 +1 @@
-export const NEGOTIUM_VERSION = "0.2.4";
+export const NEGOTIUM_VERSION = "0.2.6";

package/dist/runtime-helpers.js

@@ -447,7 +447,6 @@ var BROWSER_DIR = resolveLocalStateDir("NEGOTIUM_BROWSER_DIR", "browser");
 var BROWSER_PROFILES_DIR = resolve(BROWSER_DIR, "profiles");
 var BINARIES_DIR = resolve(STATE_DIR, "binaries");
 var SECRETS_DIR = resolve(STATE_DIR, "secrets");
-var CONTEXTS_DIR = resolve(STATE_DIR, "data", "contexts");
 var DM_WORKSPACE_DIR = resolve(STATE_DIR, "data", "dm");
 var SESSION_WORKSPACE_DIR = resolve(STATE_DIR, "data", "sessions");
 var CLAUDE_EXECUTABLE_ENV = envText("NEGOTIUM_CLAUDE_EXECUTABLE");
@@ -590,7 +589,6 @@ mkdirSync2(WORKSPACE_DIR, { recursive: true });
 mkdirSync2(TOPIC_WORKSPACE_DIR, { recursive: true });
 mkdirSync2(SHARED_WIKI_DIR, { recursive: true });
 mkdirSync2(CRON_WORKSPACE_DIR, { recursive: true });
-mkdirSync2(CONTEXTS_DIR, { recursive: true });
 mkdirSync2(DM_WORKSPACE_DIR, { recursive: true });
 mkdirSync2(SESSION_WORKSPACE_DIR, { recursive: true });
 mkdirSync2(BROWSER_DIR, { recursive: true });
@@ -1134,4 +1132,4 @@ export {
   CLAUDE_EFFORT_VALUES
 };
 
-//# debugId=16168DE340D196C364756E2164756E21
+//# debugId=38CF47A0C3C063A564756E2164756E21