@sealant/mend 0.36.0-next.643 → 0.36.0-next.646

package/README.md

@@ -171,6 +171,8 @@ mend refresh [project]                fetch origin's branches into the store
 mend land <session> [--branch b] [--no-pr] [--title t] | --check
                                       push the change to origin, open or update its pull request
 mend pull <session> [--force]         fetch the change into this clone as mend/<name>
+mend workspace replace <session> [--yes]
+                                      replace a workspace that started before Mend 0.36
 
 services
 mend service run|add|connect|list|logs|restart|stop|init
@@ -193,7 +195,8 @@ mend members                          who belongs to your organization, and thei
 mend invite [--role member|owner] [--email <address>] [--days <n>]
                                       print a one-time invitation link
 mend folder list|create|push|rm       your organization's folders
-mend session share <session> on|off   shared control: let everyone who can see a session steer it
+mend session share <session> on|off [--yes]
+                                      shared control: each turn runs on its sender's login
 
 this machine
 mend operator org list|create|rename|invite-owner

package/dist/{chunk-2TDRYRGO.js → chunk-ASHAV3UV.js}

@@ -28038,6 +28038,12 @@ var NativeIngestCursor = Schema_exports.Struct({
   lastEntryUuid: Schema_exports.NullOr(Schema_exports.String),
   lineCount: Schema_exports.Int
 });
+var LivePerson = class extends Schema_exports.Class("LivePerson")({
+  accountId: Schema_exports.String,
+  /** Their name as the instance knows it. */
+  name: Schema_exports.String
+}) {
+};
 var Session = class extends Schema_exports.Class("Session")({
   id: SessionId,
   projectId: ProjectId,
@@ -28126,6 +28132,24 @@ var Session = class extends Schema_exports.Class("Session")({
     Schema_exports.withDecodingDefaultKey(Effect_exports.succeed(null)),
     Schema_exports.withConstructorDefault(Effect_exports.succeed(null))
   ),
+  /**
+   * The people with a process live in the session's executor as their own user, in a per-person
+   * executor (docs/adr/0016, decision 13): filled by the API's session list and view only, in the
+   * same query; empty everywhere else, in a shared executor, and from older servers.
+   */
+  livePeople: Schema_exports.Array(LivePerson).pipe(
+    Schema_exports.withDecodingDefaultKey(Effect_exports.succeed([])),
+    Schema_exports.withConstructorDefault(Effect_exports.succeed([]))
+  ),
+  /**
+   * The session's executor waits to be replaced (docs/adr/0016, decision 14): `marked` or
+   * `retiring`; null otherwise. Read with `livePeople`, in the same query, so a client asks for the
+   * retirement's detail only when there is one. Null everywhere else and from older servers.
+   */
+  workspaceRetirement: Schema_exports.NullOr(Schema_exports.Literals(["marked", "retiring"])).pipe(
+    Schema_exports.withDecodingDefaultKey(Effect_exports.succeed(null)),
+    Schema_exports.withConstructorDefault(Effect_exports.succeed(null))
+  ),
   /**
    * Whether the harness left a conversation behind — a transcript Mend captured at settle or
    * found in the live harness home. False is a dead end: nothing to resume, nothing to hand
@@ -28382,6 +28406,62 @@ var LinuxIdentity = class extends Schema_exports.Class("LinuxIdentity")({
   uid: Schema_exports.Number
 }) {
 };
+var WorkspaceRetirementStopKind = Schema_exports.Literals([
+  "terminal",
+  "shell",
+  "service",
+  "turn",
+  "process",
+  "container",
+  "unchecked"
+]);
+var WorkspaceRetirementStop = class extends Schema_exports.Class(
+  "WorkspaceRetirementStop"
+)({
+  kind: WorkspaceRetirementStopKind,
+  /**
+   * What it is, as observed: a session's label, a Service's name, a process's command name and
+   * pid, a container's name, or why something could not be checked. Empty for a process or a
+   * container when the viewer is not the change's owner: they see its kind only.
+   */
+  label: Schema_exports.String
+}) {
+};
+var WorkspaceRetirementState = Schema_exports.Literals(["marked", "retiring"]);
+var WorkspaceRetirement = class extends Schema_exports.Class("WorkspaceRetirement")({
+  state: WorkspaceRetirementState,
+  /** The executor started before Mend 0.36 (no layout recorded for its launch). */
+  preRelease: Schema_exports.Boolean,
+  /** The account whose launch made the executor: the only one whose joins and turns it takes. */
+  launcher: Schema_exports.NullOr(Schema_exports.String),
+  /** What would stop if it were replaced now; empty when nothing would. */
+  stops: Schema_exports.Array(WorkspaceRetirementStop),
+  /** Why the last automatic replacement did not go ahead, as observed; null when none was tried. */
+  reason: Schema_exports.NullOr(Schema_exports.String),
+  /**
+   * When what runs in the executor was last checked beyond Mend's own records (processes Mend did
+   * not start, the sidecar's containers); null when only Mend's records were read.
+   */
+  checkedAt: Schema_exports.NullOr(Timestamp),
+  /**
+   * What the viewer was shown, as one token: "Replace this workspace now" names it, so Mend ends
+   * nothing that was not listed (the replacement is refused if more would stop now).
+   */
+  fingerprint: Schema_exports.String,
+  /** The viewer may replace it now: they own the change, and no agent turn is in flight. */
+  canReplace: Schema_exports.Boolean
+}) {
+};
+var PreReleaseMemory = class extends Schema_exports.Class("PreReleaseMemory")({
+  /** The capture it read, by its place on the worktree's chain. */
+  captureN: Schema_exports.Number,
+  provisional: Schema_exports.Boolean,
+  creditedTo: Schema_exports.NullOr(Schema_exports.String),
+  decidedBy: Schema_exports.Literals(["home-record", "only-person", "nobody", "nothing"]),
+  /** Memory paths credited to nobody: two or more people's sessions shared the home. */
+  notCredited: Schema_exports.Array(Schema_exports.String)
+}) {
+};
 
 // ../../packages/domain/src/workbench/host-user-namespaces.ts
 var HOST_USER_NAMESPACE_FILES = [
@@ -29095,6 +29175,54 @@ var SlackLinkedMentionJob = Schema_exports.Struct({
   linkedAt: Schema_exports.String
 });
 
+// ../../packages/domain/src/workbench/shared-workspace.ts
+var listed = (names) => names.length <= 1 ? names[0] ?? "" : `${names.slice(0, -1).join(", ")} and ${names[names.length - 1] ?? ""}`;
+var joinWorktreeLine = (others) => others.length <= 1 ? `${others[0] ?? "Another person"}'s session is running in this worktree. You share its workspace: everything you run runs as you, on your own logins, but either of you can read the other's files, logins included.` : `${listed(others)}'s sessions are running in this worktree. You share its workspace: everything you run runs as you, on your own logins, but any of you can read the others' files, logins included.`;
+var JOIN_SHARED_HOME_LINE = "Another person's session is running in this worktree, in a workspace that shares one home: what you start there runs on the logins and Git identity of whoever started that workspace, not yours.";
+var sharedWorkspaceLine = (livePeople, viewer) => {
+  if (livePeople.length < 2) return null;
+  const others = livePeople.filter((person) => person.accountId !== viewer).map((p) => p.name);
+  if (others.length === livePeople.length) {
+    return `Shared workspace: ${listed(others)} \xB7 each runs as themselves \xB7 ${others.length === 2 ? "either can read the other's files" : "any of them can read the others' files"}.`;
+  }
+  return others.length === 1 && livePeople.length === 2 ? `Shared workspace with ${others[0]} \xB7 each of you runs as yourself \xB7 either of you can read the other's files.` : `Shared workspace with ${listed(others)} \xB7 each of you runs as yourself \xB7 any of you can read the others' files.`;
+};
+var SHARED_CONTROL_LINE = "Each turn runs on its sender's login. From now until this session ends, the agent uses no one's personal memory or instructions. The conversation so far, including what your agent loaded before, becomes visible to whoever steers.";
+var SHARED_CONTROL_LINE_OWNER_LOGINS = "Each turn runs on your provider logins and Git access, whoever sends it.";
+var sharedControlLine = (turnsOnSendersLogin) => turnsOnSendersLogin ? SHARED_CONTROL_LINE : SHARED_CONTROL_LINE_OWNER_LOGINS;
+var sharedControlConfirm = (turnsOnSendersLogin) => ({
+  title: "Turn on shared control?",
+  body: turnsOnSendersLogin ? SHARED_CONTROL_LINE : `Everyone who can see this project can send turns, answer approvals and interrupt. ${SHARED_CONTROL_LINE_OWNER_LOGINS}`,
+  confirm: "Turn on",
+  cancel: "Keep it off"
+});
+var workspaceRetirementLine = (retirement, launcherName) => {
+  if (retirement.state === "retiring") {
+    return "Replacing this workspace so that each person runs as themselves \xB7 nothing new starts until it has been saved and replaced";
+  }
+  const started = retirement.preRelease ? "This workspace started before Mend 0.36 and shares one home" : "This workspace shares one home";
+  const reason = retirement.reason === null ? "" : ` \xB7 ${retirement.reason}`;
+  return `${started} \xB7 it takes only ${launcherName}'s sessions and turns until it is replaced${reason}`;
+};
+var STOP_WORDS = {
+  terminal: "terminal session (ends resumable)",
+  shell: "shell",
+  service: "Service started by hand",
+  turn: "agent turn in flight",
+  process: "process Mend did not start",
+  container: "running container",
+  unchecked: "could not check"
+};
+var REPLACE_WORKSPACE_ACTION = "Replace this workspace now";
+var timeOf3 = (at) => `${at.toISOString().slice(11, 16)} UTC`;
+var retirementStopLines = (retirement) => {
+  const checked = retirement.checkedAt === null ? "Checked: Mend's records only \xB7 processes Mend did not start and running containers not checked yet" : `Checked at ${timeOf3(retirement.checkedAt)}: Mend's records, the processes in the workspace and its running containers`;
+  const found = retirement.stops.length === 0 ? ["Found nothing that would stop."] : retirement.stops.map(
+    (stop) => stop.label === "" ? STOP_WORDS[stop.kind] : `${STOP_WORDS[stop.kind]} \xB7 ${stop.label}`
+  );
+  return [checked, ...found, "Mend starts the launching session's mend.toml Services again."];
+};
+
 // ../../packages/domain/src/workbench/steering.ts
 var ConversationWaitWork = Schema_exports.Struct({
   kind: Schema_exports.Literals([
@@ -29547,6 +29675,120 @@ var GATEWAY_STATUSES = /* @__PURE__ */ new Set([
 ]);
 var mayStillBeWorking = (error) => error instanceof MendRequestError && (error.kind === "timeout" || error.kind === "dropped" || error.kind === "http" && error.status !== null && GATEWAY_STATUSES.has(error.status));
 
+// src/shared-workspace.ts
+var checkedAtOf = (retirement) => {
+  if (retirement.checkedAt === null) return null;
+  const at = new Date(retirement.checkedAt);
+  return Number.isNaN(at.getTime()) ? null : at;
+};
+var retirementEvidenceLines = (retirement) => retirementStopLines({ stops: retirement.stops, checkedAt: checkedAtOf(retirement) });
+var workspaceReadsOf = (session) => ({
+  waiting: (session.livePeople ?? []).length > 0 && session.sharedControlEnabledAt !== void 0 && session.sharedControlEnabledAt !== null,
+  retirement: session.workspaceRetirement !== void 0 && session.workspaceRetirement !== null
+});
+var hasPersonFacts = (sessions) => sessions.some(
+  (session) => (session.livePeople ?? []).length > 0 || session.workspaceRetirement !== void 0 && session.workspaceRetirement !== null
+);
+var worktreeListsPeople = (sessions, worktreeId) => sessions.some(
+  (session) => session.worktreeId === worktreeId && (session.livePeople ?? []).length > 0
+);
+var othersLiveInWorktree = (sessions, worktreeId, viewer) => {
+  if (viewer === null) return [];
+  const names = /* @__PURE__ */ new Map();
+  for (const session of sessions) {
+    if (session.worktreeId !== worktreeId) continue;
+    for (const person of session.livePeople ?? []) {
+      if (person.accountId !== viewer) names.set(person.accountId, person.name);
+    }
+  }
+  return [...names.values()];
+};
+var worktreeJoinLine = (sessions, worktreeId, viewer) => {
+  const others = othersLiveInWorktree(sessions, worktreeId, viewer);
+  if (others.length > 0) return joinWorktreeLine(others);
+  if (viewer === null || worktreeListsPeople(sessions, worktreeId)) return null;
+  const anotherLive = sessions.some(
+    (session) => session.worktreeId === worktreeId && session.status !== void 0 && LIVE_STATUSES.has(session.status) && session.ownerUserId !== void 0 && session.ownerUserId !== null && session.ownerUserId !== viewer
+  );
+  return anotherLive ? JOIN_SHARED_HOME_LINE : null;
+};
+var launcherNameOf = (launcher, livePeople, members) => livePeople.find((person) => person.accountId === launcher)?.name ?? members.find((member) => member.userId === launcher)?.name ?? "its launcher";
+var sessionWorkspaceLines = (facts) => {
+  const { retirement } = facts;
+  return {
+    shared: sharedWorkspaceLine(facts.livePeople, facts.viewer),
+    waiting: facts.wait?.line ?? null,
+    retirement: retirement === null ? null : workspaceRetirementLine(
+      retirement,
+      launcherNameOf(retirement.launcher, facts.livePeople, facts.members)
+    ),
+    // Only the change's owner replaces it, and only while it is marked: a retiring one is
+    // already being replaced.
+    replace: retirement === null || !retirement.canReplace || retirement.state !== "marked" ? null : {
+      action: REPLACE_WORKSPACE_ACTION,
+      command: `mend workspace replace ${facts.sessionId.slice(0, 8)}`,
+      stops: retirementEvidenceLines(retirement)
+    }
+  };
+};
+var workspaceLineList = (lines) => [
+  ...lines.shared === null ? [] : [lines.shared],
+  ...lines.waiting === null ? [] : [lines.waiting],
+  ...lines.retirement === null ? [] : [lines.retirement],
+  ...lines.replace === null ? [] : [
+    `${lines.replace.action} \xB7 ${lines.replace.command}`,
+    ...lines.replace.stops.map((stop) => `  ${stop}`)
+  ]
+];
+var wrapWords = (text, width) => {
+  const limit = Math.max(8, width);
+  const lines = [];
+  let current = "";
+  for (const raw of text.split(/\s+/)) {
+    if (raw === "") continue;
+    let word = raw;
+    while (word.length > limit) {
+      if (current !== "") {
+        lines.push(current);
+        current = "";
+      }
+      lines.push(word.slice(0, limit));
+      word = word.slice(limit);
+    }
+    if (current === "") current = word;
+    else if (current.length + 1 + word.length <= limit) current = `${current} ${word}`;
+    else {
+      lines.push(current);
+      current = word;
+    }
+  }
+  if (current !== "") lines.push(current);
+  return lines;
+};
+var confirmPlan = (args2, interactive) => args2.includes("--yes") || args2.includes("-y") ? "confirmed" : interactive ? "ask" : "refuse";
+var sharedControlConfirmLines = (turnsOnSendersLogin) => {
+  const confirm = sharedControlConfirm(turnsOnSendersLogin);
+  return [confirm.title, confirm.body];
+};
+var sharedControlQuestion = (turnsOnSendersLogin) => {
+  const confirm = sharedControlConfirm(turnsOnSendersLogin);
+  return `${confirm.confirm.toLowerCase()}? (n: ${confirm.cancel.toLowerCase()})`;
+};
+var replaceConfirmLines = (retirement) => [
+  `${REPLACE_WORKSPACE_ACTION}?`,
+  ...retirementEvidenceLines(retirement).map((stop) => `  ${stop}`)
+];
+var askYesNo = async (question) => {
+  const readline = await import("node:readline/promises");
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    const answer = (await rl.question(`${question} [y/N] `)).trim().toLowerCase();
+    return answer === "y" || answer === "yes";
+  } finally {
+    rl.close();
+  }
+};
+
 // src/workbench-events.ts
 var createSseParser = () => {
   let buffer = "";
@@ -29625,6 +29867,10 @@ export {
   servicesHoldLine,
   validateSecretFilePath,
   terminalReadOnlyLine,
+  sharedControlLine,
+  sharedControlConfirm,
+  workspaceRetirementLine,
+  REPLACE_WORKSPACE_ACTION,
   WORKTREE_REMOVAL_FORCE_HINT,
   HARNESS_COMMANDS,
   pendingId,
@@ -29654,6 +29900,19 @@ export {
   noAnswerError,
   GATEWAY_STATUSES,
   mayStillBeWorking,
+  workspaceReadsOf,
+  hasPersonFacts,
+  worktreeListsPeople,
+  worktreeJoinLine,
+  launcherNameOf,
+  sessionWorkspaceLines,
+  workspaceLineList,
+  wrapWords,
+  confirmPlan,
+  sharedControlConfirmLines,
+  sharedControlQuestion,
+  replaceConfirmLines,
+  askYesNo,
   createSseParser,
   eventFamilies
 };

package/dist/{dashboard-2HF3KTTU.js → dashboard-4J2WMT3G.js}

@@ -8,6 +8,7 @@ import {
   createSseParser,
   cwdFacts,
   eventFamilies,
+  hasPersonFacts,
   isPendingId,
   launchPhaseOf,
   matchProjectByCwd,
@@ -16,8 +17,13 @@ import {
   pendingId,
   repositoryCloneUrlIssue,
   servicesHoldLine,
-  withoutLaunchPhase
-} from "./chunk-2TDRYRGO.js";
+  sessionWorkspaceLines,
+  withoutLaunchPhase,
+  workspaceLineList,
+  workspaceReadsOf,
+  worktreeJoinLine,
+  wrapWords
+} from "./chunk-ASHAV3UV.js";
 
 // src/dashboard.tsx
 import { CliRenderEvents, createCliRenderer } from "@opentui/core";
@@ -541,6 +547,51 @@ var fitHints = (hints, width) => {
   return kept.length === 0 ? "\u2026" : `${kept.join(" \xB7 ")} \u2026`;
 };
 var clampIndex = (length, index) => length === 0 ? 0 : Math.max(0, Math.min(length - 1, index));
+var VIEWER_KEY = ["viewer"];
+var viewerNeeded = (data) => data !== void 0 && [...data.details.values()].some((detail) => hasPersonFacts(detail.sessions));
+var fetchViewer = async (ctx) => {
+  const [view, members] = await Promise.all([
+    ctx.api("GET", "/organization").catch(() => null),
+    ctx.api("GET", "/organization/members").catch(() => [])
+  ]);
+  return { userId: view?.userId ?? null, members };
+};
+var WORKSPACE_FACTS_KEY = (sessionId, reads) => [
+  "workspace-facts",
+  sessionId,
+  reads.waiting,
+  reads.retirement
+];
+var fetchWorkspaceFacts = async (api, sessionId, reads) => {
+  const [wait, retirement] = await Promise.all([
+    reads.waiting ? api("GET", `/sessions/${sessionId}/waiting`).catch(() => null) : null,
+    reads.retirement ? api(
+      "GET",
+      `/sessions/${sessionId}/workspace-retirement`
+    ).catch(() => null) : null
+  ]);
+  return { wait, retirement };
+};
+var workspaceFactRows = (session, viewer, facts, width) => workspaceLineList(
+  sessionWorkspaceLines({
+    sessionId: session.id,
+    livePeople: session.livePeople ?? [],
+    viewer: viewer?.userId ?? null,
+    wait: facts?.wait ?? null,
+    retirement: facts?.retirement ?? null,
+    members: viewer?.members ?? []
+  })
+).flatMap((line) => {
+  const indent = line.startsWith("  ") ? "  " : "";
+  return wrapWords(line, width - indent.length).map((row) => `${indent}${row}`);
+});
+var worktreeJoinRows = (data, projectId, worktree, viewerId, width) => {
+  const detail = data?.details.get(projectId);
+  const id = "id" in worktree ? worktree.id : detail?.worktrees?.find((candidate) => candidate.name === worktree.name)?.id;
+  if (detail === void 0 || id === void 0) return [];
+  const line = worktreeJoinLine(detail.sessions, id, viewerId);
+  return line === null ? [] : wrapWords(line, width);
+};
 var KEY_BINDINGS = [
   {
     verb: "moveUp",
@@ -2445,7 +2496,8 @@ var SessionFacts = ({
   group,
   item,
   rows,
-  tunnels
+  tunnels,
+  workspaceRows
 }) => {
   const { session, annotation, services } = item;
   const color = STATUS_COLOR[session.status] ?? MUTED;
@@ -2476,6 +2528,18 @@ var SessionFacts = ({
       /* @__PURE__ */ jsx3("span", { fg: MUTED, children: session.branch }),
       /* @__PURE__ */ jsx3("span", { fg: FAINT, children: session.baseSha === "" ? "" : ` vs ${session.baseRef ?? session.baseSha.slice(0, 12)}` })
     ] }, "status"),
+    // Who else is live here, what a turn waits for, a workspace waiting to be replaced: right
+    // under the status, before the facts a short pane may drop.
+    ...workspaceRows.map((row, index) => /* @__PURE__ */ jsx3(
+      "text",
+      {
+        height: 1,
+        bg: "transparent",
+        fg: row.startsWith("  ") ? MUTED : INK_2,
+        children: `  ${row}`
+      },
+      `workspace-${index}`
+    )),
     /* @__PURE__ */ jsx3("text", { height: 1, bg: "transparent", fg: FAINT, children: [
       ...timeAgo(session.createdAt) === "" ? [] : [`created ${timeAgo(session.createdAt)}`],
       isPendingId(session.id) ? "provisioning" : session.id.slice(0, 8),
@@ -2638,6 +2702,28 @@ var App = ({ ctx, onQuit }) => {
     refetchInterval: previewLive ? 8e3 : false,
     retry: 1
   });
+  const viewer = useQuery2({
+    queryKey: VIEWER_KEY,
+    queryFn: () => fetchViewer(ctx),
+    enabled: viewerNeeded(data),
+    staleTime: Number.POSITIVE_INFINITY,
+    retry: false
+  });
+  const workspaceReads = selectedSession === null ? { waiting: false, retirement: false } : workspaceReadsOf(selectedSession);
+  const workspaceFacts = useQuery2({
+    queryKey: WORKSPACE_FACTS_KEY(previewSessionId ?? "none", workspaceReads),
+    queryFn: () => fetchWorkspaceFacts(ctx.api, previewSessionId ?? "", workspaceReads),
+    enabled: previewSessionId !== null && previewLive && detailWidth > 0 && (workspaceReads.waiting || workspaceReads.retirement),
+    staleTime: 3e3,
+    refetchInterval: previewLive ? 8e3 : false,
+    retry: 1
+  });
+  const workspaceRows = selectedSession === null || !previewLive || detailWidth === 0 ? [] : workspaceFactRows(
+    selectedSession,
+    viewer.data,
+    workspaceFacts.data,
+    Math.max(16, detailWidth - 4)
+  );
   const preview = useMemo2(
     () => transcript.data === void 0 ? [] : previewLines(transcript.data, {
       width: Math.max(16, detailWidth - 6),
@@ -2646,7 +2732,10 @@ var App = ({ ctx, onQuit }) => {
     [transcript.data, detailWidth]
   );
   const [previewOffset, setPreviewOffset] = useState3(0);
-  const factRows = Math.max(0, Math.min(SESSION_FACT_ROWS, layout.detailRows - 2));
+  const factRows = Math.max(
+    0,
+    Math.min(SESSION_FACT_ROWS + workspaceRows.length, layout.detailRows - 2)
+  );
   const showFactRule = factRows > 0 && layout.detailRows - factRows > 1;
   const waiting = selectedSession !== null && (selectedSession.status === "starting" || isPendingId(selectedSession.id));
   const snake = useSnake({
@@ -3614,6 +3703,22 @@ ${tunneled}
     return COLUMN_TITLE[column];
   };
   const pickerTitle = picker === null ? "" : picker.worktree === void 0 ? picker.session === null ? "new session \xB7 pick a harness" : `resume ${sessionDisplayName(picker.session)} \xB7 pick a harness` : `new session in ${picker.worktree.name} \xB7 pick a harness`;
+  const modalWidth = Math.min(74, terminalCols - 4);
+  const pickerJoinRows = picker?.worktree?.id == null || selectedProject === null ? [] : worktreeJoinRows(
+    data,
+    selectedProject.project.id,
+    { id: picker.worktree.id },
+    viewer.data?.userId ?? null,
+    modalWidth - 4
+  );
+  const pickerJoinHeight = pickerJoinRows.length === 0 ? 0 : pickerJoinRows.length + 1;
+  const creatingJoinRows = creating === null || !creating.joins ? [] : worktreeJoinRows(
+    data,
+    creating.projectId,
+    { name: creating.name },
+    viewer.data?.userId ?? null,
+    modalWidth - 7
+  );
   const creatingHeight = 2 + 1 + 1 + 6 + 1 + deriveHarnesses(null).length;
   const footerText = adoptOffer === null ? editing === null ? creating === null ? picker === null ? ` ${fitHints(verbHints(focus), Math.max(12, terminalCols - 2))}` : " \u2191\u2193 move \xB7 enter start \xB7 esc cancel" : creating.step === "name" ? " enter continue \xB7 esc cancel" : creating.step === "base" ? " type to filter \xB7 \u2191\u2193 move \xB7 enter choose base \xB7 esc back" : " \u2191\u2193 move \xB7 enter launch \xB7 esc back" : " enter save \xB7 esc cancel" : " enter adopt \xB7 \u2190\u2192 auth mode \xB7 esc not now";
   const loadFailure = data === void 0 && failureReason !== null ? errorText(failureReason) : null;
@@ -3786,7 +3891,8 @@ ${tunneled}
         group: selectedGroup,
         item: selectedItem,
         rows: factRows,
-        tunnels: openTunnels
+        tunnels: openTunnels,
+        workspaceRows
       }
     ),
     showFactRule ? /* @__PURE__ */ jsx3("text", { height: 1, bg: "transparent", fg: FAINT, children: `  ${"\u2500".repeat(Math.max(4, detailWidth - 4))}` }) : null,
@@ -3881,15 +3987,18 @@ ${tunneled}
         ]
       }
     ) : null,
-    picker === null ? null : /* @__PURE__ */ jsx3(
+    picker === null ? null : /* @__PURE__ */ jsxs3(
       "box",
       {
         position: "absolute",
         zIndex: 12,
         left: Math.max(1, Math.floor((terminalCols - Math.min(74, terminalCols - 4)) / 2)),
-        top: Math.max(1, Math.floor((terminalRows - (2 + pickerItems.length)) / 2)),
+        top: Math.max(
+          1,
+          Math.floor((terminalRows - (2 + pickerItems.length + pickerJoinHeight)) / 2)
+        ),
         width: Math.min(74, terminalCols - 4),
-        height: 2 + pickerItems.length,
+        height: 2 + pickerItems.length + pickerJoinHeight,
         border: true,
         borderStyle: "rounded",
         borderColor: ACCENT,
@@ -3897,15 +4006,19 @@ ${tunneled}
         titleAlignment: "left",
         backgroundColor: SURFACE,
         flexDirection: "column",
-        children: pickerItems.map((item, index) => /* @__PURE__ */ jsx3(
-          HarnessRow,
-          {
-            item,
-            selected: index === pickerIndex,
-            background: SURFACE
-          },
-          String(item.harness)
-        ))
+        children: [
+          pickerJoinRows.map((row, index) => /* @__PURE__ */ jsx3("text", { height: 1, bg: SURFACE, fg: INK_2, children: `  ${row}` }, `join-${index}`)),
+          pickerJoinRows.length === 0 ? null : /* @__PURE__ */ jsx3("text", { height: 1, bg: SURFACE, children: " " }),
+          pickerItems.map((item, index) => /* @__PURE__ */ jsx3(
+            HarnessRow,
+            {
+              item,
+              selected: index === pickerIndex,
+              background: SURFACE
+            },
+            String(item.harness)
+          ))
+        ]
       }
     ),
     editing === null ? null : /* @__PURE__ */ jsx3(
@@ -4061,6 +4174,10 @@ ${tunneled}
             const branch = creating.joins || creating.branches === null ? void 0 : filterBranches(creating.branches, creating.query)[index];
             const active = creating.step === "base";
             if (branch === void 0) {
+              const joinRow = creatingJoinRows[index];
+              if (joinRow !== void 0) {
+                return /* @__PURE__ */ jsx3("text", { height: 1, bg: SURFACE, fg: INK_2, children: `     ${joinRow}` }, `slot-${index}`);
+              }
               const notice = creating.joins ? null : baseStepNotice(creating);
               return /* @__PURE__ */ jsx3(
                 "text",