@bivy/bivy 0.18.11-staging.6 → 0.18.11-staging.7

package/dist/controllers/fork-commands.js

@@ -72,7 +72,7 @@ export function createForkCommands(deps) {
                 // When the client has already picked a target agent, pass it so the
                 // bundle omits the native payload for a cross-runtime fork (it could
                 // never be replayed there — see buildForkBundle). Unset => keep it.
-                const bundle = buildForkBundle({ runtime: deps.getRuntime(rec.runtimeId), sessionFile: rec.sessionFile, record: forkRecord, dirtyPatch, workspaceSnapshot, targetRuntimeId: deps.agentFrom(msg), liveMessages: deps.forkMessages(rec), state: deps.forkInFlightState(rec) });
+                const bundle = buildForkBundle({ runtime: deps.getRuntime(rec.runtimeId), sessionFile: rec.sessionFile, record: forkRecord, dirtyPatch, workspaceSnapshot, targetRuntimeId: deps.agentFrom(msg), liveMessages: deps.forkMessages(rec), display: deps.forkDisplay(rec), state: deps.forkInFlightState(rec) });
                 ctx.reply({ type: "session.fork.bundle", requestId, bundle });
             }
             catch (error) {
@@ -150,7 +150,7 @@ export function createForkCommands(deps) {
                     ? captureWorkspaceSnapshot(sourceCwd, { maxBytes: deps.forkWorkspaceMaxBytes() })
                     : undefined;
                 // Same runtime → the bundle carries the native payload → full fidelity.
-                const bundle = buildForkBundle({ runtime, sessionFile: rec.sessionFile, record: forkRecord, dirtyPatch, workspaceSnapshot, targetRuntimeId: rec.runtimeId, liveMessages: deps.forkMessages(rec), state: deps.forkInFlightState(rec) });
+                const bundle = buildForkBundle({ runtime, sessionFile: rec.sessionFile, record: forkRecord, dirtyPatch, workspaceSnapshot, targetRuntimeId: rec.runtimeId, liveMessages: deps.forkMessages(rec), display: deps.forkDisplay(rec), state: deps.forkInFlightState(rec) });
                 // Cut a fresh fork branch (the source still holds its own); skip prereq
                 // detection (same node + same runtime ⇒ agent and repo are present).
                 const outcome = await deps.standUpFork({

package/dist/server.js

@@ -2105,6 +2105,7 @@ const RELAY_COMMANDS = {
     ...createForkCommands({
         broadcast,
         forkMessages: (rec) => transcripts.forkMessages(rec),
+        forkDisplay: (rec) => transcripts.conversationMessages(rec),
         resolveSession: (sessionId) => resolveSession(sessionId),
         getRuntime: (runtimeId) => getRuntime(runtimeId),
         forkRecordFor,
@@ -8919,6 +8920,7 @@ const forkStandUp = createForkStandUp({
     createSession,
     broadcast,
     persistSessionMetadata,
+    recordForkDisplay: (record, messages, forkedAt) => eventLog.appendForkDisplay(record.id, messages, forkedAt),
     scheduleAdvertise,
     bivySessionEnvelope,
     applyRequestedModel,

package/dist/session/event-log.js

@@ -209,6 +209,12 @@ function isBase(value) {
     const record = value;
     return record.bivyKind === "base" && Array.isArray(record.messages) && typeof record.reset === "boolean";
 }
+function isForkDisplay(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const record = value;
+    return record.bivyKind === "fork-display" && Array.isArray(record.messages) && typeof record.forkedAt === "number";
+}
 function isAttachment(value) {
     if (!value || typeof value !== "object")
         return false;
@@ -255,7 +261,7 @@ function isAppReviewEntry(value) {
     return entry.bivyKind === "app-review" && typeof entry.id === "string" && typeof entry.createdAt === "number" && typeof entry.afterMessageCount === "number" && isAppReview(entry.review);
 }
 function isRecord(value) {
-    return isOverlay(value) || isBase(value) || isAttachment(value) || isOutboundAttachment(value) || isInlineImage(value) || isAppPublication(value) || isAppReviewEntry(value) || isSuggestionEntry(value);
+    return isOverlay(value) || isBase(value) || isForkDisplay(value) || isAttachment(value) || isOutboundAttachment(value) || isInlineImage(value) || isAppPublication(value) || isAppReviewEntry(value) || isSuggestionEntry(value);
 }
 /**
  * Fold attachment records into a text→refs list: last write wins per text (a
@@ -743,7 +749,23 @@ export class EventLog {
      *  the display overlays — what a fork carries to another agent. */
     deriveBase(id, runtimeBase) {
         const logged = this.readBase(id);
-        return runtimeBase && runtimeBase.length ? mergeBases(logged, runtimeBase) : logged;
+        const base = runtimeBase && runtimeBase.length ? mergeBases(logged, runtimeBase) : logged;
+        const display = this.entries(id).find(isForkDisplay);
+        if (!display)
+            return base;
+        const replayed = (m) => {
+            const ts = m.timestamp;
+            return typeof ts === "number" && ts <= display.forkedAt;
+        };
+        return [...display.messages, ...base.filter((m) => !replayed(m))];
+    }
+    /** Record a fork's source transcript for display (see ForkDisplayLogEntry). */
+    appendForkDisplay(id, messages, forkedAt) {
+        if (!messages.length)
+            return;
+        this.load(id);
+        const record = { bivyKind: "fork-display", createdAt: Date.now(), forkedAt, messages: JSON.parse(JSON.stringify(messages)) };
+        this.enqueue(id, this.syntheticKey(id), record);
     }
     /** Full ordered record list (already-flushed followed by pending). */
     entries(id) {

package/dist/session/fork-standup.js

@@ -217,6 +217,11 @@ export function createForkStandUp(deps) {
         const record = plan.kind === "resume"
             ? await deps.createSession(cwd, plan.sessionFile, { runtimeId: targetRuntimeId, source: bundle.record.source, sandbox: forkSandbox, makeActive: false, newSession: true })
             : await deps.createSession(cwd, undefined, { runtimeId: targetRuntimeId, source: bundle.record.source, sandbox: forkSandbox, makeActive: false, newSession: true });
+        // A replayed or seeded destination resumes from a text rendering of the
+        // conversation. Show the source's own transcript (tool cards, sub-agent
+        // nesting) in its place; everything the fork does from now on follows it.
+        if (plan.fidelity !== "full" && bundle.display?.length)
+            deps.recordForkDisplay(record, bundle.display, Date.now());
         // Mark the new session as a fork of its source, so the run card can show
         // "Forked from …" and the lineage survives a reload (persisted below).
         record.forkedFrom = bundle.record.sourceSessionId;

package/dist/session/fork.js

@@ -1,4 +1,7 @@
 import { normalizeMessages, buildSeedPrompt, buildForkHistory, } from "./transcript-normal.js";
+/** Cap on the display transcript a bundle carries; larger sessions fall back to
+ *  showing the destination agent's own (text) replay. */
+export const FORK_DISPLAY_MAX_BYTES = 2 * 1024 * 1024;
 /**
  * Capture a fork bundle on the source node. Always includes the normalized
  * transcript (the cross-runtime seed, and the fallback when a same-runtime
@@ -49,7 +52,8 @@ export function buildForkBundle(opts) {
             // transcript below still supports replay or a seeded continuation.
         }
     }
-    return { record, normalized, ...(native ? { native } : {}), ...(opts.dirtyPatch ? { dirtyPatch: opts.dirtyPatch } : {}), ...(opts.workspaceSnapshot ? { workspaceSnapshot: opts.workspaceSnapshot } : {}), ...(opts.state ? { state: opts.state } : {}) };
+    const display = opts.display?.length && JSON.stringify(opts.display).length <= FORK_DISPLAY_MAX_BYTES ? [...opts.display] : undefined;
+    return { record, normalized, ...(native ? { native } : {}), ...(display ? { display } : {}), ...(opts.dirtyPatch ? { dirtyPatch: opts.dirtyPatch } : {}), ...(opts.workspaceSnapshot ? { workspaceSnapshot: opts.workspaceSnapshot } : {}), ...(opts.state ? { state: opts.state } : {}) };
 }
 /**
  * Decide the best fidelity a fork of `bundle` into `targetRuntime` can achieve:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.18.11-staging.6",
+  "version": "0.18.11-staging.7",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",