@bivy/bivy 0.2.0-staging.28 → 0.2.0-staging.30

package/dist/server.js

@@ -1344,7 +1344,11 @@ async function runTerminalList() {
     const out = [];
     for (const t of runs) {
         let sessionRef = t.meta.sessionId;
-        if (!sessionRef && t.meta.autoName) {
+        // Discover the on-disk session for agents that assign their id lazily (Pi,
+        // Codex). Runs whenever there's no pinned id — not just for auto-named
+        // terminals — so the takeover-readiness flag below is accurate even for a
+        // run launched with an explicit --name.
+        if (!sessionRef) {
             try {
                 sessionRef = await SESSION_DISCOVERY_BY_AGENT[t.meta.agent ?? ""]?.(t.workspace, t.createdAt);
             }
@@ -1355,7 +1359,11 @@ async function runTerminalList() {
         if (t.meta.autoName && nativeName && !isEmptyUntitledTitle(nativeName))
             t.meta.name = nativeName;
         const { autoName: _autoName, ...publicMeta } = t.meta;
-        out.push({ termId: t.id, workspace: t.workspace, createdAt: t.createdAt, lastActivityAt: t.lastActivityAt, pid: terminals.pid(t.id), ...publicMeta });
+        // "Continue as chat" can only adopt a session that exists: a pinned id, or a
+        // session discovered on disk. Surface that so the client can disable the
+        // affordance (with guidance) until the agent has actually started its
+        // session, instead of letting the user tap it and hit a 409.
+        out.push({ termId: t.id, workspace: t.workspace, createdAt: t.createdAt, lastActivityAt: t.lastActivityAt, pid: terminals.pid(t.id), ...publicMeta, takeoverReady: Boolean(sessionRef) });
     }
     return out;
 }
@@ -2581,6 +2589,7 @@ const RELAY_COMMANDS = {
                 agent: meta?.runtimeId ?? s.agent,
                 agentName: meta?.agentName ?? s.agentName,
                 source: rec?.source ?? meta?.source,
+                forkedFrom: rec?.forkedFrom ?? meta?.forkedFrom,
                 branch: rec?.worktree?.branch ?? meta?.branch,
                 sandbox: rec?.sandbox ?? normalizeSandboxTier(meta?.sandbox),
                 prUrl: rec?.prUrl ?? meta?.prUrl,
@@ -5350,6 +5359,11 @@ async function standUpFork(opts) {
     const record = plan.kind === "resume"
         ? await createSession(cwd, plan.sessionFile, { runtimeId: targetRuntimeId, source: bundle.record.source, makeActive: false })
         : await createSession(cwd, undefined, { runtimeId: targetRuntimeId, source: bundle.record.source, makeActive: false });
+    // 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). Just
+    // the parent's session id — an identifier, not content, so it's safe to
+    // carry into metadata the same way branch/prUrl already are.
+    record.forkedFrom = bundle.record.sourceSessionId;
     // Attach the reconstructed worktree to the record. createSession only
     // populates record.worktree when it provisions one itself (fresh repo session)
     // or restores it from stored metadata (resume) — neither happens for a fork,
@@ -5703,6 +5717,7 @@ function persistSessionMetadata(record, status = sessionStatus(record)) {
         name: record.session.getName(),
         workspace: record.workspace,
         source: record.source ?? "manual",
+        forkedFrom: record.forkedFrom,
         runtimeId: record.runtimeId,
         sandbox: record.sandbox,
         agentName: getRuntime(record.runtimeId).displayName,
@@ -8421,6 +8436,7 @@ app.get("/api/sessions", async (_req, res, next) => {
                 agent: meta?.runtimeId ?? s.agent,
                 agentName: meta?.agentName ?? s.agentName,
                 source: rec?.source ?? meta?.source,
+                forkedFrom: rec?.forkedFrom ?? meta?.forkedFrom,
                 branch: rec?.worktree?.branch ?? meta?.branch,
                 prUrl: rec?.prUrl ?? meta?.prUrl,
                 prs: rec?.prs ?? meta?.prs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.2.0-staging.28",
+  "version": "0.2.0-staging.30",
   "type": "module",
   "license": "FSL-1.1-ALv2",
   "description": "Run coding agents on machines you own. Source-available, self-hostable agent workspace.",