@bivy/bivy 0.2.0 → 0.2.1-staging.32

package/bin/bivy.mjs

@@ -1527,7 +1527,7 @@ async function cmdExec(args = []) {
 function cmdCompletions(args = []) {
   const shell = (args[0] || "").toLowerCase();
   const commands = [
-    "run", "sessions", "ls", "resume", "promote", "nodes", "agents", "agents:install", "shim", "takeover", "token", "exec",
+    "run", "sessions", "ls", "resume", "promote", "rename", "nodes", "agents", "agents:install", "shim", "takeover", "token", "exec",
     "send", "kill", "setup", "start", "stop", "restart", "status", "doctor", "logs", "login",
     "update", "update:log", "open", "service", "secrets", "voice", "link", "relay:setup",
     "github:connect", "github:app-create", "github:app-connect", "github:app-sync", "prune", "uninstall", "help", "version",
@@ -1908,6 +1908,49 @@ async function cmdPromote(args = []) {
   }
 }
 
+// `bivy rename <name>` — rename THIS node. Runs against the local daemon, which
+// persists the name to .bivy/node.json and live-updates relay/work-queue routing
+// (no restart needed). If the name collides on your account the control plane
+// auto-adjusts it for uniqueness, so we re-read the node info afterward to show
+// the name that actually stuck. Alias: node:rename.
+async function cmdRename(args = []) {
+  if (args.includes("-h") || args.includes("--help")) {
+    console.log('Usage: bivy rename <name>\n\nRename this node. Takes effect immediately (no restart). If the name is already used by another node on your account, it is auto-adjusted to stay unique.');
+    return;
+  }
+  if (!(await ensureDeps())) process.exit(1);
+  // Node names may contain spaces, so join all positional (non-flag) args rather
+  // than taking only the first. The daemon trims/collapses whitespace and caps
+  // the length; we just forward the raw text.
+  const name = args.filter((a) => !a.startsWith("-")).join(" ").trim();
+  if (!name) { console.error(c.red("Usage: bivy rename <name>")); process.exit(1); return; }
+
+  const config = loadConfig();
+  if (!(await ensureNodeRunning(config))) { console.error(c.red(`Could not start the Bivy node at ${url(config)}.`)); process.exit(1); return; }
+  let token;
+  try { token = await localDeviceToken(config); }
+  catch (error) { console.error(c.red(error?.message || String(error))); process.exit(1); return; }
+
+  const base = url(config);
+  const prev = await fetchJson(base, "/api/node/info", token).then((d) => d?.name).catch(() => undefined);
+  const res = await fetch(`${base}/api/node/name`, {
+    method: "POST",
+    headers: { authorization: `Bearer ${token}`, "content-type": "application/json" },
+    body: JSON.stringify({ name }),
+  });
+  if (!res.ok) {
+    const data = await res.json().catch(() => ({}));
+    console.error(c.red(`Rename failed (${res.status}): ${data.error || "unknown error"}`));
+    process.exit(1);
+    return;
+  }
+  const data = await res.json().catch(() => ({}));
+  const applied = data.name || name;
+  if (prev && prev !== applied) console.log(c.green(`Renamed node: ${c.dim(prev)} → ${applied}`));
+  else console.log(c.green(`Node name set to "${applied}".`));
+  if (applied !== name) console.log(c.dim(`(Adjusted from "${name}" to stay unique on your account.)`));
+}
+
 // `bivy send <id> "<message>"` — send a prompt to an existing session and stream
 // the reply. Thin wrapper over the headless exec client with --session.
 // Deliberately does NOT intercept -h/--help (see cmdExec above) — the message
@@ -3968,6 +4011,7 @@ ${c.bold("bivy")} — Bivy node CLI
   ${c.cyan("bivy run <agent> --node <name>")}  Start the session on another registered node
   ${c.cyan("bivy run <agent> --clone [remote]")}  Start in a fresh clone (current repo, or a given remote)
   ${c.cyan("bivy run <agent> --workspace <dir>")}  Start in an existing directory (default: current repo, else the configured workspace)
+  ${c.cyan("bivy rename <name>")}  Rename this node (takes effect immediately, no restart)
   ${c.cyan("bivy nodes")}       List/add/remove other nodes (add <name> <url> --token <t>)
   ${c.cyan("bivy agents")}      List the supported agents and which are installed (--json)
   ${c.cyan("bivy shim install <agent>")}  Make interactive '<agent>' launch its native TUI in a Bivy PTY (remote-visible)
@@ -4051,6 +4095,10 @@ An agent's own --help passes through, e.g. 'bivy run claude --help'.`);
     case "promote":
       await cmdPromote(args);
       break;
+    case "rename":
+    case "node:rename":
+      await cmdRename(args);
+      break;
     case "nodes":
       await cmdNodes(args);
       break;

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",
+  "version": "0.2.1-staging.32",
   "type": "module",
   "license": "FSL-1.1-ALv2",
   "description": "Run coding agents on machines you own. Source-available, self-hostable agent workspace.",