@evident-ai/cli 3.6.1-dev.4f2b317 → 3.6.1-dev.5d5fa2a

package/dist/index.js

@@ -1256,6 +1256,36 @@ function effectiveCorrelatedRun(messages, userMessageId) {
 function extractReplyTextForMessage(messages, opencodeUserMessageId) {
   return lastText(effectiveCorrelatedRun(messages, opencodeUserMessageId));
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function projectV2ToolContent(content) {
+  if (!isRecord(content) || content.type !== "tool" || typeof content.name !== "string" || !isRecord(content.state)) {
+    return null;
+  }
+  const { state } = content;
+  const status2 = state.status;
+  if (status2 !== "streaming" && status2 !== "running" && status2 !== "completed" && status2 !== "error") {
+    return null;
+  }
+  const projectedState = {
+    status: status2 === "streaming" ? "pending" : status2
+  };
+  if (status2 !== "streaming" && isRecord(state.input)) projectedState.input = state.input;
+  const output = Array.isArray(state.content) ? state.content.filter(
+    (entry) => isRecord(entry) && entry.type === "text" && typeof entry.text === "string"
+  ).map((entry) => entry.text) : [];
+  if (output.length > 0) projectedState.output = output.join("\n");
+  if (status2 === "error" && isRecord(state.error) && typeof state.error.message === "string") {
+    projectedState.error = state.error.message;
+  }
+  return {
+    type: "tool",
+    tool: content.name,
+    ...typeof content.id === "string" ? { callID: content.id } : {},
+    state: projectedState
+  };
+}
 
 // ../../packages/types/src/telemetry/index.ts
 var TelemetryEventTypes = {
@@ -1445,7 +1475,7 @@ import ora4 from "ora";
 import { select as select4 } from "@inquirer/prompts";
 
 // src/lib/telemetry.ts
-var CLI_VERSION = (true ? "3.6.1-dev.4f2b317" : void 0) ?? process.env.npm_package_version ?? "unknown";
+var CLI_VERSION = (true ? "3.6.1-dev.5d5fa2a" : void 0) ?? process.env.npm_package_version ?? "unknown";
 function getCliVersion() {
   return CLI_VERSION;
 }
@@ -3075,7 +3105,7 @@ function buildSessionArchive(input) {
   };
   return { ...archive, content_fingerprint: fingerprintArchive(archive) };
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function errorMessage2(error2) {
@@ -3213,7 +3243,7 @@ async function exportV2SessionMessages(client, sessionId, signal) {
     }
     const path = `${basePath}?${params.toString()}`;
     const { body } = await requestPage(client, sessionId, path, signal);
-    if (!isRecord(body) || !Array.isArray(body.data) || !isRecord(body.cursor)) {
+    if (!isRecord2(body) || !Array.isArray(body.data) || !isRecord2(body.cursor)) {
       throw invalidResponse("v2", sessionId, path, "expected a {data: [], cursor: {\u2026}} envelope");
     }
     messages.push(...body.data);
@@ -3260,7 +3290,7 @@ function readWatermarks(path, log3) {
   }
   try {
     const parsed = JSON.parse(content);
-    if (!isRecord2(parsed)) throw new Error("invalid watermark object");
+    if (!isRecord3(parsed)) throw new Error("invalid watermark object");
     const entries = Object.entries(parsed);
     if (!entries.every(([sessionId, value]) => sessionId.length > 0 && isWatermark(value))) {
       throw new Error("invalid watermark entry");
@@ -3283,12 +3313,12 @@ function recordUpload(path, sessionId, entry, watermarks) {
   watermarks.clear();
   for (const [id, watermark] of updated) watermarks.set(id, watermark);
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isWatermark(value) {
-  if (!isRecord2(value)) return false;
-  return typeof value.fingerprint === "string" && typeof value.uploaded_at === "string" && typeof value.key === "string";
+  if (!isRecord3(value)) return false;
+  return typeof value.fingerprint === "string" && typeof value.uploaded_at === "string" && typeof value.key === "string" && (!("conversation_id" in value) || value.conversation_id === null || typeof value.conversation_id === "string");
 }
 function isMissingFile3(error2) {
   return error2 instanceof Error && "code" in error2 && error2.code === "ENOENT";
@@ -3310,7 +3340,7 @@ var shell_contract_default = {
     "session-db-verify",
     "archive-put"
   ],
-  archiveStdinMaxBytes: 16777216
+  archiveStdinMaxBytes: 33554432
 };
 
 // src/lib/runner-synchroniser.ts
@@ -3450,9 +3480,15 @@ function runSynchroniser(args, opts) {
 var MAX_SESSION_ARCHIVE_BYTES = MAX_ARCHIVE_STDIN_BYTES;
 var EXIT_ARCHIVE_CONFIG_MISSING = 50;
 var EXIT_ARCHIVE_ACCESS_DENIED = 51;
-function transportFailure(bytes, reason) {
+function transportFailure(bytes, reason, exitCode) {
   const message = reason === "missing-executable" ? "runner-synchroniser is unavailable; session archival requires a hosted runner." : reason === "timeout" ? "runner-synchroniser timed out before the archive upload completed." : "session archive upload did not complete.";
-  return { kind: "transport-failed", bytes, reason, message };
+  return {
+    kind: "transport-failed",
+    bytes,
+    reason,
+    message,
+    ...exitCode !== void 0 ? { exitCode } : {}
+  };
 }
 function isJson(body) {
   try {
@@ -3497,10 +3533,157 @@ async function uploadSessionArchive(key, body, options) {
   }
   return transportFailure(
     bytes.byteLength,
-    result.code === null ? "spawn-failed" : "process-failed"
+    result.code === null ? "spawn-failed" : "process-failed",
+    result.code ?? void 0
   );
 }
 
+// src/lib/opencode/session-binding-resolution.ts
+var SESSION_BINDING_PROJECTION_CHUNK_SIZE = 500;
+var SESSION_BINDING_PROJECTION_TIMEOUT_MS = 1e4;
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isProjectionSource(value) {
+  return value === "current" || value === "invocation" || value === "history";
+}
+function emptySessionBindingProjection() {
+  return {
+    current: /* @__PURE__ */ new Map(),
+    invocation: /* @__PURE__ */ new Map(),
+    history: /* @__PURE__ */ new Map(),
+    conflicts: /* @__PURE__ */ new Set()
+  };
+}
+function requestedSessionIds(sessions) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const session of sessions) {
+    if (session.id.length > 0) ids.add(session.id);
+    if (typeof session.parentID === "string" && session.parentID.length > 0) {
+      ids.add(session.parentID);
+    }
+  }
+  return [...ids];
+}
+function parseProjectionResponse(value, requestedIds) {
+  if (!isRecord4(value) || !Array.isArray(value.bindings) || !Array.isArray(value.conflicts)) {
+    return null;
+  }
+  const projection = emptySessionBindingProjection();
+  for (const candidate of value.bindings) {
+    if (!isRecord4(candidate) || typeof candidate.opencode_session_id !== "string" || typeof candidate.conversation_id !== "string" || !isProjectionSource(candidate.source) || !requestedIds.has(candidate.opencode_session_id) || projection.conflicts.has(candidate.opencode_session_id)) {
+      return null;
+    }
+    const bindings = projection[candidate.source];
+    if (bindings.has(candidate.opencode_session_id)) return null;
+    bindings.set(candidate.opencode_session_id, candidate.conversation_id);
+  }
+  for (const conflict of value.conflicts) {
+    if (typeof conflict !== "string" || !requestedIds.has(conflict) || projection.conflicts.has(conflict) || projection.current.has(conflict) || projection.invocation.has(conflict) || projection.history.has(conflict)) {
+      return null;
+    }
+    projection.conflicts.add(conflict);
+  }
+  return projection;
+}
+async function fetchSessionBindingProjection({
+  apiUrl,
+  runnerId,
+  authHeader,
+  sessions,
+  signal,
+  fetchImpl = fetch
+}) {
+  const ids = requestedSessionIds(sessions);
+  const projection = emptySessionBindingProjection();
+  const failures = [];
+  if (ids.length === 0) return { projection, complete: true, failures };
+  for (let offset = 0; offset < ids.length; offset += SESSION_BINDING_PROJECTION_CHUNK_SIZE) {
+    const chunk = ids.slice(offset, offset + SESSION_BINDING_PROJECTION_CHUNK_SIZE);
+    const chunkIndex = Math.floor(offset / SESSION_BINDING_PROJECTION_CHUNK_SIZE) + 1;
+    try {
+      const response = await fetchImpl(
+        `${apiUrl}/runners/${runnerId}/conversations/session-bindings`,
+        {
+          method: "POST",
+          headers: {
+            Authorization: authHeader,
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ opencode_session_ids: chunk }),
+          signal: signal ?? AbortSignal.timeout(SESSION_BINDING_PROJECTION_TIMEOUT_MS)
+        }
+      );
+      if (!response.ok) {
+        failures.push({ chunk: chunkIndex, kind: "http", status: response.status });
+        continue;
+      }
+      const result = parseProjectionResponse(await response.json(), new Set(chunk));
+      if (result === null) {
+        failures.push({ chunk: chunkIndex, kind: "invalid-response" });
+        continue;
+      }
+      for (const source of ["current", "invocation", "history"]) {
+        for (const [sessionId, conversationId] of result[source]) {
+          projection[source].set(sessionId, conversationId);
+        }
+      }
+      for (const conflict of result.conflicts) projection.conflicts.add(conflict);
+    } catch (error2) {
+      failures.push({
+        chunk: chunkIndex,
+        kind: "network",
+        message: error2 instanceof Error ? error2.message : String(error2)
+      });
+    }
+  }
+  return { projection, complete: failures.length === 0, failures };
+}
+function directResolution(sessionId, sources) {
+  const localBinding = sources.ledger.get(sessionId);
+  if (localBinding) return { conversation_id: localBinding, source: "ledger" };
+  const watermarkedBinding = sources.watermarks.get(sessionId)?.conversation_id;
+  if (typeof watermarkedBinding === "string" && watermarkedBinding.length > 0) {
+    return { conversation_id: watermarkedBinding, source: "watermark" };
+  }
+  if (sources.projection.conflicts.has(sessionId)) return { reason: "conflict" };
+  for (const source of ["current", "invocation", "history"]) {
+    const conversationId = sources.projection[source].get(sessionId);
+    if (conversationId) return { conversation_id: conversationId, source };
+  }
+  return null;
+}
+function isResolved(resolution) {
+  return "conversation_id" in resolution;
+}
+function resolveSessionBindings(sessions, sources) {
+  const resolutions = /* @__PURE__ */ new Map();
+  for (const session of sessions) {
+    resolutions.set(session.id, directResolution(session.id, sources) ?? { reason: "unmapped" });
+  }
+  let assignedParent = true;
+  while (assignedParent) {
+    assignedParent = false;
+    for (const session of sessions) {
+      const resolution = resolutions.get(session.id);
+      if (isResolved(resolution) || resolution.reason !== "unmapped") continue;
+      if (typeof session.parentID !== "string" || session.parentID.length === 0) continue;
+      const parent = resolutions.get(session.parentID) ?? directResolution(session.parentID, sources) ?? { reason: "unmapped" };
+      if (isResolved(parent)) {
+        resolutions.set(session.id, {
+          conversation_id: parent.conversation_id,
+          source: "parent"
+        });
+        assignedParent = true;
+      } else if (parent.reason === "conflict" || parent.reason === "parent-conflict") {
+        resolutions.set(session.id, { reason: "parent-conflict" });
+        assignedParent = true;
+      }
+    }
+  }
+  return resolutions;
+}
+
 // src/lib/opencode/session-archive-run.ts
 var SESSION_ARCHIVE_UPLOAD_TIMEOUT_MS = 6e4;
 function updatedAt(session) {
@@ -3513,6 +3696,12 @@ function sessionArchiveKey(prefix, sessionId) {
 function failureMessage(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
+function countMessageParts(messages) {
+  return messages.reduce((count, message) => {
+    if (typeof message !== "object" || message === null || !("parts" in message)) return count;
+    return count + (Array.isArray(message.parts) ? message.parts.length : 0);
+  }, 0);
+}
 function isBudgetExpired(deadline, now, signal) {
   return signal?.aborted === true || now() >= deadline;
 }
@@ -3552,6 +3741,19 @@ async function runSessionArchive({
     skippedBudgetIds: [],
     neverWatermarkedFailures: 0,
     unmappedIds: [],
+    conflictedIds: [],
+    unresolved: 0,
+    conflicts: 0,
+    reconciliationComplete: deps.reconciliationComplete ?? true,
+    reconciliationIncomplete: 0,
+    bindingSourceCounts: {
+      ledger: 0,
+      watermark: 0,
+      current: 0,
+      invocation: 0,
+      history: 0,
+      parent: 0
+    },
     archivedSessionIds: [],
     failures: [],
     staleSince: null
@@ -3560,6 +3762,22 @@ async function runSessionArchive({
   const upload = deps.upload ?? uploadSessionArchive;
   const exportMessages = deps.exportMessages ?? exportSessionMessages;
   const writeWatermark = deps.recordWatermark ?? recordUpload;
+  const resolutions = resolveSessionBindings(sessions, {
+    ledger: deps.bindings,
+    watermarks: deps.watermarks,
+    projection: deps.projection ?? emptySessionBindingProjection()
+  });
+  for (const [sessionId, resolution] of resolutions) {
+    if ("conversation_id" in resolution) {
+      summary.bindingSourceCounts[resolution.source]++;
+    } else if (resolution.reason === "conflict" || resolution.reason === "parent-conflict") {
+      summary.conflictedIds.push(sessionId);
+    } else {
+      summary.unmappedIds.push(sessionId);
+    }
+  }
+  summary.unresolved = summary.unmappedIds.length + summary.conflictedIds.length;
+  summary.conflicts = summary.conflictedIds.length;
   const failedWatermarks = [];
   const recordFailedWatermark = (watermark) => {
     if (watermark) failedWatermarks.push(watermark.uploaded_at);
@@ -3573,8 +3791,22 @@ async function runSessionArchive({
       summary.skippedBudget = summary.skippedBudgetIds.length;
       break;
     }
-    const conversationId = deps.bindings.get(session.id) ?? null;
-    if (conversationId === null) summary.unmappedIds.push(session.id);
+    const resolution = resolutions.get(session.id) ?? { reason: "unmapped" };
+    const resolved = "conversation_id" in resolution;
+    const conversationId = resolved ? resolution.conversation_id : null;
+    const bindingSource = resolved ? resolution.source : "unmapped";
+    if (!resolved && !summary.reconciliationComplete) {
+      summary.failed++;
+      summary.reconciliationIncomplete++;
+      summary.failures.push({
+        sessionId: session.id,
+        outcome: "reconciliation-incomplete",
+        reason: resolution.reason,
+        archived: false
+      });
+      recordFailedWatermark(deps.watermarks.get(session.id));
+      continue;
+    }
     const exportBudget = createBudgetSignal(deps.signal, remainingMs);
     let messages;
     try {
@@ -3611,7 +3843,7 @@ async function runSessionArchive({
         messages,
         apiVersion: deps.client.version,
         conversationId,
-        bindingSource: conversationId === null ? "unmapped" : "ledger",
+        bindingSource,
         runnerId: deps.runnerId,
         archivedAt
       });
@@ -3648,6 +3880,11 @@ async function runSessionArchive({
           outcome: outcome.kind,
           ...reason !== void 0 ? { reason } : {},
           ..."message" in outcome ? { message: outcome.message } : {},
+          bytes: outcome.bytes,
+          byteLimit: MAX_SESSION_ARCHIVE_BYTES,
+          messageCount: messages.length,
+          partCount: countMessageParts(messages),
+          ..."exitCode" in outcome && outcome.exitCode !== void 0 ? { exitCode: outcome.exitCode } : {},
           archived: false
         });
         recordFailedWatermark(existing);
@@ -3663,7 +3900,8 @@ async function runSessionArchive({
       const watermark = {
         fingerprint: snapshot.content_fingerprint,
         uploaded_at: new Date(now()).toISOString(),
-        key
+        key,
+        conversation_id: conversationId
       };
       try {
         writeWatermark(deps.watermarkPath, session.id, watermark, deps.watermarks);
@@ -4620,8 +4858,15 @@ function collectSubagentSessions(messages, userMessageId) {
   for (const message of assistants) {
     const parts = Array.isArray(message.parts) ? message.parts : [];
     for (const part of parts) {
-      if (!part || typeof part !== "object" || part.type !== "tool" || part.tool !== "task")
+      if (!part || typeof part !== "object" || part.type !== "tool") continue;
+      const childSession = part.childSession;
+      if (childSession) {
+        if (seen.has(childSession.sessionId)) continue;
+        seen.add(childSession.sessionId);
+        refs.push(childSession);
         continue;
+      }
+      if (part.tool !== "task") continue;
       const state = part.state;
       if (!state || typeof state !== "object") continue;
       const metadata = state.metadata;
@@ -5223,14 +5468,14 @@ async function probeOpenCodeRequestReadiness(port, client) {
 
 // src/lib/opencode/session-v2.ts
 var ALL_HTTP_STATUSES2 = Array.from({ length: 500 }, (_, index) => index + 100);
-function isRecord3(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function finiteNumber2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
 function adaptTime(value) {
-  if (!isRecord3(value)) return void 0;
+  if (!isRecord5(value)) return void 0;
   const created = finiteNumber2(value.created);
   const completed = finiteNumber2(value.completed);
   if (created === void 0 && completed === void 0) return void 0;
@@ -5240,11 +5485,11 @@ function adaptTime(value) {
   };
 }
 function adaptTokens(value) {
-  if (!isRecord3(value)) return void 0;
+  if (!isRecord5(value)) return void 0;
   const input = finiteNumber2(value.input);
   const output = finiteNumber2(value.output);
   const reasoning = finiteNumber2(value.reasoning);
-  const cache = isRecord3(value.cache) ? {
+  const cache = isRecord5(value.cache) ? {
     ...finiteNumber2(value.cache.read) !== void 0 ? { read: finiteNumber2(value.cache.read) } : {},
     ...finiteNumber2(value.cache.write) !== void 0 ? { write: finiteNumber2(value.cache.write) } : {}
   } : void 0;
@@ -5268,7 +5513,7 @@ function adaptMessageInfo(value, role) {
   if (typeof value.finish === "string") info.finish = value.finish;
   if ("error" in value) info.error = value.error;
   if (typeof value.agent === "string") info.agent = value.agent;
-  if (isRecord3(value.model)) {
+  if (isRecord5(value.model)) {
     if (typeof value.model.id === "string") info.modelID = value.model.id;
     if (typeof value.model.providerID === "string") info.providerID = value.model.providerID;
   }
@@ -5277,8 +5522,16 @@ function adaptMessageInfo(value, role) {
   if (tokens) info.tokens = tokens;
   return info;
 }
+function v2ChildSessionEvidence(content) {
+  const state = isRecord5(content.state) ? content.state : null;
+  const metadata = state && isRecord5(state.metadata) ? state.metadata : null;
+  const sessionId = typeof metadata?.sessionID === "string" && metadata.sessionID.length > 0 ? metadata.sessionID : typeof metadata?.sessionId === "string" && metadata.sessionId.length > 0 ? metadata.sessionId : null;
+  if (sessionId === null) return null;
+  const time = isRecord5(content.time) ? content.time : null;
+  return { sessionId, startedAtMs: finiteNumber2(time?.created) ?? null };
+}
 function adaptV2Message(value) {
-  if (!isRecord3(value) || typeof value.id !== "string" || typeof value.type !== "string") {
+  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.type !== "string") {
     return null;
   }
   if (value.type === "user") {
@@ -5291,7 +5544,13 @@ function adaptV2Message(value) {
   if (value.type !== "assistant" || !Array.isArray(value.content)) return null;
   const parts = [];
   for (const content of value.content) {
-    if (!isRecord3(content) || typeof content.type !== "string") return null;
+    if (!isRecord5(content) || typeof content.type !== "string") return null;
+    const toolPart = projectV2ToolContent(content);
+    if (toolPart) {
+      const childSession = v2ChildSessionEvidence(content);
+      parts.push(childSession ? { ...toolPart, childSession } : toolPart);
+      continue;
+    }
     if (content.type === "text") {
       if (typeof content.text !== "string") return null;
       parts.push({ type: "text", text: content.text });
@@ -5305,23 +5564,23 @@ function adaptV2Message(value) {
   };
 }
 function adaptFormTool(value) {
-  if (!isRecord3(value) || typeof value.messageID !== "string" || typeof value.id !== "string") {
+  if (!isRecord5(value) || typeof value.messageID !== "string" || typeof value.id !== "string") {
     return void 0;
   }
   return { messageID: value.messageID, callID: value.id };
 }
 function adaptV2FormWire(value) {
-  if (!isRecord3(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
+  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
     return null;
   }
   return value;
 }
 function adaptV2FormField(value, header) {
-  if (!isRecord3(value)) return null;
+  if (!isRecord5(value)) return null;
   const question = typeof value.title === "string" ? value.title : typeof value.question === "string" ? value.question : typeof value.key === "string" ? value.key : null;
   if (!question) return null;
   const options = Array.isArray(value.options) ? value.options.flatMap((option) => {
-    if (!isRecord3(option)) return [];
+    if (!isRecord5(option)) return [];
     const label = typeof option.label === "string" ? option.label : typeof option.value === "string" ? option.value : null;
     if (!label) return [];
     return [
@@ -5339,7 +5598,7 @@ function adaptV2Form(value) {
   const header = typeof form.title === "string" ? form.title : "";
   const questions = form.fields.map((field) => adaptV2FormField(field, header)).filter((question) => question !== null);
   if (questions.length === 0) return null;
-  const tool = isRecord3(form.metadata) ? adaptFormTool(form.metadata.tool) : void 0;
+  const tool = isRecord5(form.metadata) ? adaptFormTool(form.metadata.tool) : void 0;
   return {
     id: form.id,
     sessionID: form.sessionID,
@@ -5349,7 +5608,7 @@ function adaptV2Form(value) {
   };
 }
 function adaptV2FormList(value) {
-  if (!isRecord3(value) || !Array.isArray(value.data)) return null;
+  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
   return value.data.map(adaptV2Form).filter((form) => form !== null);
 }
 function adaptPattern(value) {
@@ -5360,7 +5619,7 @@ function adaptPattern(value) {
   return void 0;
 }
 function adaptV2PermissionWire(value) {
-  if (!isRecord3(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
+  if (!isRecord5(value) || typeof value.id !== "string" || typeof value.sessionID !== "string") {
     return null;
   }
   if (typeof value.permission !== "string" && typeof value.action !== "string") return null;
@@ -5372,12 +5631,12 @@ function adaptV2Permission(value) {
   const type = permission.permission ?? permission.action;
   if (!type) return null;
   const pattern = adaptPattern(permission.pattern) ?? adaptPattern(permission.patterns) ?? adaptPattern(permission.resources);
-  const time = isRecord3(permission.time) ? finiteNumber2(permission.time.created) !== void 0 ? { created: finiteNumber2(permission.time.created) } : void 0 : void 0;
+  const time = isRecord5(permission.time) ? finiteNumber2(permission.time.created) !== void 0 ? { created: finiteNumber2(permission.time.created) } : void 0 : void 0;
   return {
     id: permission.id,
     type,
     sessionID: permission.sessionID,
-    metadata: isRecord3(permission.metadata) ? permission.metadata : {},
+    metadata: isRecord5(permission.metadata) ? permission.metadata : {},
     raw: permission,
     ...pattern !== void 0 ? { pattern } : {},
     ...typeof permission.messageID === "string" ? { messageID: permission.messageID } : {},
@@ -5387,12 +5646,12 @@ function adaptV2Permission(value) {
   };
 }
 function adaptV2PermissionList(value) {
-  if (!isRecord3(value) || !Array.isArray(value.data)) return null;
+  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
   return value.data.map(adaptV2Permission).filter((permission) => permission !== null);
 }
 function adaptV2Session(value) {
-  if (!isRecord3(value) || typeof value.id !== "string" || value.id.length === 0) return null;
-  const time = isRecord3(value.time) ? {
+  if (!isRecord5(value) || typeof value.id !== "string" || value.id.length === 0) return null;
+  const time = isRecord5(value.time) ? {
     ...finiteNumber2(value.time.created) !== void 0 ? { created: finiteNumber2(value.time.created) } : {},
     ...finiteNumber2(value.time.updated) !== void 0 ? { updated: finiteNumber2(value.time.updated) } : {}
   } : void 0;
@@ -5404,7 +5663,7 @@ function adaptV2Session(value) {
   };
 }
 function adaptV2SessionList(value) {
-  if (!isRecord3(value) || !Array.isArray(value.data) || !isRecord3(value.cursor)) return null;
+  if (!isRecord5(value) || !Array.isArray(value.data) || !isRecord5(value.cursor)) return null;
   return {
     data: value.data.map(adaptV2Session).filter((session) => session !== null),
     cursor: value.cursor
@@ -5413,18 +5672,18 @@ function adaptV2SessionList(value) {
 function adaptV2Location(value) {
   const candidates = [
     value,
-    isRecord3(value) ? value.data : void 0,
-    isRecord3(value) ? value.location : void 0
+    isRecord5(value) ? value.data : void 0,
+    isRecord5(value) ? value.location : void 0
   ];
   for (const candidate of candidates) {
-    if (!isRecord3(candidate) || typeof candidate.directory !== "string") continue;
+    if (!isRecord5(candidate) || typeof candidate.directory !== "string") continue;
     const directory = candidate.directory.trim();
     if (directory) return directory;
   }
   return null;
 }
 function adaptV2Messages(value) {
-  if (!isRecord3(value) || !Array.isArray(value.data)) return [];
+  if (!isRecord5(value) || !Array.isArray(value.data)) return [];
   return value.data.slice().reverse().map(adaptV2Message).filter((message) => message !== null);
 }
 async function readJson(response) {
@@ -5439,7 +5698,7 @@ async function readJson(response) {
 async function readData(client, path, init) {
   const response = await client.request(path, init);
   const body = await readJson(response);
-  if (!isRecord3(body) || !("data" in body)) {
+  if (!isRecord5(body) || !("data" in body)) {
     throw new Error(`OpenCode V2 response for ${path} was missing its data envelope`);
   }
   return body.data;
@@ -5474,7 +5733,7 @@ async function createV2Session(client, directory) {
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ location: { directory } })
   });
-  if (!isRecord3(data) || typeof data.id !== "string" || data.id.length === 0) {
+  if (!isRecord5(data) || typeof data.id !== "string" || data.id.length === 0) {
     throw new Error("OpenCode V2 create session response was missing data.id");
   }
   return data.id;
@@ -5619,8 +5878,8 @@ async function sendV2Prompt(client, sessionId, text, options, onInvalidModelSele
       `OpenCode V2 prompt response could not be read: ${error2 instanceof Error ? error2.message : String(error2)}`
     );
   }
-  const data = isRecord3(body) && "data" in body ? body.data : void 0;
-  if (!isRecord3(data) || typeof data.id !== "string" || data.id.length === 0) {
+  const data = isRecord5(body) && "data" in body ? body.data : void 0;
+  if (!isRecord5(data) || typeof data.id !== "string" || data.id.length === 0) {
     throw new OpenCodeV2PromptAckError("OpenCode V2 prompt response was missing data.id");
   }
   return data.id;
@@ -5629,7 +5888,7 @@ async function getV2SessionMessages(client, sessionId) {
   const path = `/api/session/${encodeURIComponent(sessionId)}/message?order=desc&limit=200`;
   try {
     const body = await readJson(await client.request(path));
-    if (!isRecord3(body) || !Array.isArray(body.data) || !isRecord3(body.cursor)) return null;
+    if (!isRecord5(body) || !Array.isArray(body.data) || !isRecord5(body.cursor)) return null;
     return adaptV2Messages(body);
   } catch (error2) {
     console.error(
@@ -5668,7 +5927,7 @@ async function interruptV2Session(client, sessionId) {
 async function getV2ActiveSessions(client) {
   try {
     const body = await readJson(await client.request("/api/session/active"));
-    if (!isRecord3(body) || !isRecord3(body.data)) return null;
+    if (!isRecord5(body) || !isRecord5(body.data)) return null;
     return body.data;
   } catch (error2) {
     console.error(
@@ -5684,8 +5943,8 @@ async function isV2SessionOngoing(client, sessionId) {
 }
 function sessionErrorReason2(value) {
   if (typeof value === "string" && value.trim()) return value.trim().slice(0, 500);
-  if (isRecord3(value)) {
-    const data = isRecord3(value.data) ? value.data : void 0;
+  if (isRecord5(value)) {
+    const data = isRecord5(value.data) ? value.data : void 0;
     const reason = typeof data?.message === "string" && data.message || typeof value.message === "string" && value.message || typeof value.name === "string" && value.name;
     if (reason) return reason.replace(/\s+/g, " ").trim().slice(0, 500);
   }
@@ -5701,17 +5960,17 @@ function adaptV2SessionErrorEvent(value) {
       return null;
     }
   }
-  if (!isRecord3(parsed)) return null;
+  if (!isRecord5(parsed)) return null;
   try {
     const establishedShape = parseSessionErrorFrame(JSON.stringify(parsed));
     if (establishedShape) return establishedShape;
   } catch (error2) {
     void error2;
   }
-  const candidates = [parsed, parsed.payload, parsed.data].filter(isRecord3);
+  const candidates = [parsed, parsed.payload, parsed.data].filter(isRecord5);
   for (const event of candidates) {
     if (event.type !== "session.error") continue;
-    const properties = [event.properties, event.data, event].find(isRecord3);
+    const properties = [event.properties, event.data, event].find(isRecord5);
     if (!properties) continue;
     const sessionId = typeof properties.sessionID === "string" && properties.sessionID || typeof properties.sessionId === "string" && properties.sessionId;
     if (!sessionId) continue;
@@ -5847,7 +6106,7 @@ function parseCodexUsageHeaders(headers) {
 function normalizeProbeModel(model) {
   return model.endsWith("-fast") ? model.slice(0, -"-fast".length) : model;
 }
-function isRecord4(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function unsupportedProbeModels(reason, port) {
@@ -5858,14 +6117,14 @@ async function resolveV1ProbeModels(client, port) {
   try {
     const response = await client.request("/config/providers");
     const body = await response.json();
-    if (!isRecord4(body) || !Array.isArray(body.providers)) {
+    if (!isRecord6(body) || !Array.isArray(body.providers)) {
       return unsupportedProbeModels("V1 provider response did not contain a providers array", port);
     }
     const provider = body.providers.find(
-      (candidate) => isRecord4(candidate) && candidate.id === "openai"
+      (candidate) => isRecord6(candidate) && candidate.id === "openai"
     );
-    if (!provider || !isRecord4(provider.models)) return { status: "supported", models: [] };
-    const defaults2 = isRecord4(body.default) ? body.default : void 0;
+    if (!provider || !isRecord6(provider.models)) return { status: "supported", models: [] };
+    const defaults2 = isRecord6(body.default) ? body.default : void 0;
     const candidates = [
       ...typeof defaults2?.openai === "string" ? [defaults2.openai] : [],
       ...Object.keys(provider.models)
@@ -5887,14 +6146,14 @@ async function resolveV2ProbeModels(client, port) {
   try {
     const response = await client.request(path);
     const body = await response.json();
-    if (!isRecord4(body) || !Array.isArray(body.data)) {
+    if (!isRecord6(body) || !Array.isArray(body.data)) {
       return unsupportedProbeModels(`V2 GET ${path} did not contain a provider data array`, port);
     }
     const provider = body.data.find(
-      (candidate) => isRecord4(candidate) && candidate.id === "openai"
+      (candidate) => isRecord6(candidate) && candidate.id === "openai"
     );
     if (!provider) return { status: "supported", models: [] };
-    if (!isRecord4(provider.models)) {
+    if (!isRecord6(provider.models)) {
       return unsupportedProbeModels(
         "V2 provider response has no safe OpenAI model catalogue",
         port
@@ -6004,7 +6263,7 @@ var CONNECT_KEY_MAX_ATTEMPTS = 3;
 var CONNECT_KEY_RETRY_DELAY_MS = 250;
 var INTEGRATION_LIST_MAX_READS = 10;
 var INTEGRATION_LIST_RETRY_DELAY_MS = 1e3;
-function isRecord5(value) {
+function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var sleep2 = (milliseconds) => new Promise((resolve5) => setTimeout(resolve5, milliseconds));
@@ -6020,7 +6279,7 @@ function readOpenCodeCredentials(homeDir, log3) {
     } catch (error2) {
       return null;
     }
-    return isRecord5(parsed) ? parsed : null;
+    return isRecord7(parsed) ? parsed : null;
   } catch (error2) {
     const code = error2.code;
     if (code !== "ENOENT" && code !== "ENOTDIR") {
@@ -6033,7 +6292,7 @@ function classifyOpenCodeCredentials(credentials2) {
   const importable = [];
   const unsupported = [];
   for (const [integrationId, value] of Object.entries(credentials2)) {
-    if (!isRecord5(value) || typeof value.type !== "string") {
+    if (!isRecord7(value) || typeof value.type !== "string") {
       unsupported.push({ integrationId, reason: "unrecognised credential entry" });
       continue;
     }
@@ -6048,7 +6307,7 @@ function classifyOpenCodeCredentials(credentials2) {
       unsupported.push({ integrationId, reason: "unrecognised credential entry" });
       continue;
     }
-    if (value.metadata === void 0 || isRecord5(value.metadata) && Object.keys(value.metadata).length === 0) {
+    if (value.metadata === void 0 || isRecord7(value.metadata) && Object.keys(value.metadata).length === 0) {
       importable.push({ integrationId, key: value.key });
     } else {
       unsupported.push({ integrationId, reason: "needs the interactive connect flow" });
@@ -6125,10 +6384,10 @@ async function importOpenCodeCredentials({
   return result;
 }
 function parseIntegrationList(value) {
-  if (!isRecord5(value) || !Array.isArray(value.data)) return null;
+  if (!isRecord7(value) || !Array.isArray(value.data)) return null;
   const integrationIds = /* @__PURE__ */ new Set();
   for (const integration of value.data) {
-    if (!isRecord5(integration) || typeof integration.id !== "string" || !Array.isArray(integration.connections)) {
+    if (!isRecord7(integration) || typeof integration.id !== "string" || !Array.isArray(integration.connections)) {
       return null;
     }
     if (integration.connections.length > 0) integrationIds.add(integration.id);
@@ -17004,11 +17263,11 @@ function logSessionArchiveSummary(state, phase, summary) {
   const everyUploadFailed = summary.uploadAttempts > 0 && summary.uploadFailures === summary.uploadAttempts;
   const staleSince = everyUploadFailed && summary.staleSince !== null ? `; archive stale since ${summary.staleSince}` : "";
   const neverWatermarked = summary.neverWatermarkedFailures > 0 ? `; ${summary.neverWatermarkedFailures} failed session(s) had no prior successful upload` : "";
-  const warning2 = summary.failed > 0 || summary.failures.length > 0 || everyUploadFailed;
+  const warning2 = summary.failed > 0 || summary.failures.length > 0 || everyUploadFailed || !summary.reconciliationComplete;
   logSessionArchiveActivity(state, phase, {
     type: "info",
     level: warning2 ? "warn" : "info",
-    message: `Session archive: inspected ${summary.inspected}, uploaded ${summary.uploaded}, unchanged ${summary.unchanged}, failed ${summary.failed}, skipped budget ${summary.skippedBudget}, unmapped ${summary.unmappedIds.length}` + staleSince + neverWatermarked,
+    message: `Session archive: inspected ${summary.inspected}, uploaded ${summary.uploaded}, unchanged ${summary.unchanged}, failed ${summary.failed}, skipped budget ${summary.skippedBudget}, unmapped ${summary.unmappedIds.length}, conflicts ${summary.conflicts}, reconciliation incomplete ${summary.reconciliationIncomplete}; bindings ledger ${summary.bindingSourceCounts.ledger}, watermark ${summary.bindingSourceCounts.watermark}, current ${summary.bindingSourceCounts.current}, invocation ${summary.bindingSourceCounts.invocation}, history ${summary.bindingSourceCounts.history}, parent ${summary.bindingSourceCounts.parent}` + staleSince + neverWatermarked,
     metadata: {
       outcome: "archive-run-complete",
       sessions_inspected: summary.inspected,
@@ -17019,22 +17278,41 @@ function logSessionArchiveSummary(state, phase, summary) {
       uploads_failed: summary.uploadFailures,
       sessions_skipped_budget: summary.skippedBudget,
       sessions_unmapped: summary.unmappedIds.length,
+      sessions_unresolved: summary.unresolved,
+      sessions_conflicted: summary.conflicts,
+      sessions_reconciliation_incomplete: summary.reconciliationIncomplete,
+      binding_reconciliation_complete: summary.reconciliationComplete,
+      bindings_from_ledger: summary.bindingSourceCounts.ledger,
+      bindings_from_watermark: summary.bindingSourceCounts.watermark,
+      bindings_from_current: summary.bindingSourceCounts.current,
+      bindings_from_invocation: summary.bindingSourceCounts.invocation,
+      bindings_from_history: summary.bindingSourceCounts.history,
+      bindings_from_parent: summary.bindingSourceCounts.parent,
       sessions_without_prior_watermark: summary.neverWatermarkedFailures,
       ...everyUploadFailed && summary.staleSince !== null ? { stale_since: summary.staleSince } : {}
     }
   });
   for (const failure of summary.failures) {
     const permanentSizeFailure = failure.reason === "too-large";
-    const safeMessage = failure.message ? `: ${redactDiagnosticText(failure.message).slice(0, 200)}` : "";
+    const hasPayloadDetails = failure.bytes !== void 0 && failure.byteLimit !== void 0 && failure.messageCount !== void 0 && failure.partCount !== void 0;
+    const payloadDetails = hasPayloadDetails ? `; payload bytes=${failure.bytes} limit=${failure.byteLimit} messages=${failure.messageCount} parts=${failure.partCount}` : "";
+    const safeMessage = !hasPayloadDetails && failure.message ? `: ${redactDiagnosticText(failure.message).slice(0, 200)}` : "";
     logSessionArchiveActivity(state, phase, {
       type: "info",
       level: "warn",
-      message: `Session archive: session ${failure.sessionId} ` + (permanentSizeFailure ? "failed permanently (too-large payload)" : `failed (${failure.outcome}`) + (permanentSizeFailure ? "" : failure.reason ? `, reason=${failure.reason})` : ")") + safeMessage,
+      message: `Session archive: session ${failure.sessionId} ` + (permanentSizeFailure ? "failed permanently (too-large payload)" : `failed (${failure.outcome}`) + (permanentSizeFailure ? "" : failure.reason ? `, reason=${failure.reason})` : ")") + payloadDetails + (failure.exitCode !== void 0 ? `; child exit code=${failure.exitCode}` : "") + safeMessage,
       metadata: {
         outcome: failure.outcome,
         session_id: failure.sessionId,
         archived: failure.archived,
-        ...failure.reason !== void 0 ? { reason: failure.reason } : {}
+        ...failure.reason !== void 0 ? { reason: failure.reason } : {},
+        ...failure.exitCode !== void 0 ? { child_exit_code: failure.exitCode } : {},
+        ...hasPayloadDetails ? {
+          payload_bytes: failure.bytes,
+          payload_limit_bytes: failure.byteLimit,
+          message_count: failure.messageCount,
+          part_count: failure.partCount
+        } : {}
       }
     });
   }
@@ -17049,6 +17327,17 @@ function logSessionArchiveSummary(state, phase, summary) {
       }
     });
   }
+  if (summary.conflictedIds.length > 0) {
+    logSessionArchiveActivity(state, phase, {
+      type: "info",
+      level: "warn",
+      message: `Session archive: ${summary.conflictedIds.length} session(s) have conflicting conversation identities: ${summary.conflictedIds.join(", ")}`,
+      metadata: {
+        outcome: "conflicted-session-bindings",
+        sessions_conflicted: summary.conflicts
+      }
+    });
+  }
 }
 async function drainSessionDeletionReports(state) {
   const path = sessionDeletionReportPath(homedir8(), process.env);
@@ -17507,21 +17796,48 @@ async function runSessionArchiveBatch(state, phase, sessions, budgetMs, signal)
     });
     return null;
   }
+  const bindings = readSessionBindings(
+    sessionBindingLedgerPath(homedir8(), process.env),
+    (message) => logSessionArchiveActivity(state, phase, {
+      type: "info",
+      level: "warn",
+      message: redactDiagnosticText(message),
+      metadata: { outcome: "binding-ledger-read-failed" }
+    })
+  );
+  const reconciliation = await fetchSessionBindingProjection({
+    apiUrl: getApiUrlConfig(),
+    runnerId: state.agentId,
+    authHeader: state.authHeader,
+    sessions,
+    signal
+  });
+  if (!reconciliation.complete) {
+    const failure = reconciliation.failures[0];
+    const detail = failure.kind === "http" ? `HTTP ${failure.status} for chunk ${failure.chunk}` : failure.kind === "network" ? `network failure for chunk ${failure.chunk}: ${redactDiagnosticText(failure.message ?? "unknown error").slice(0, 200)}` : `invalid response for chunk ${failure.chunk}`;
+    logSessionArchiveActivity(state, phase, {
+      type: "info",
+      level: "warn",
+      message: `Session archive: binding reconciliation incomplete for runner ${state.agentId}; ${reconciliation.failures.length} chunk(s) failed (${detail}), unresolved sessions will not replace existing archives`,
+      metadata: {
+        outcome: "binding-reconciliation-incomplete",
+        runner_id: state.agentId,
+        failed_chunks: reconciliation.failures.length,
+        first_failed_chunk: failure.chunk,
+        first_failure_kind: failure.kind,
+        ...failure.status !== void 0 ? { http_status: failure.status } : {}
+      }
+    });
+  }
   const summary = await runSessionArchive({
     sessions,
     deps: {
       client,
       runnerId: state.agentId,
       keyPrefix: config.keyPrefix,
-      bindings: readSessionBindings(
-        sessionBindingLedgerPath(homedir8(), process.env),
-        (message) => logSessionArchiveActivity(state, phase, {
-          type: "info",
-          level: "warn",
-          message: redactDiagnosticText(message),
-          metadata: { outcome: "binding-ledger-read-failed" }
-        })
-      ),
+      bindings,
+      projection: reconciliation.projection,
+      reconciliationComplete: reconciliation.complete,
       watermarks: state.sessionArchiveWatermarks,
       watermarkPath,
       signal,