borgmcp 4.4.0 → 4.5.0

package/src/seats.ts

@@ -50,6 +50,7 @@ export interface SeatRecord {
   sessionId?: string;
   // binding + display (set atomically at FINALIZE; absent while pending)
   worktree?: string;
+  commonDir?: string;
   name?: string;
   droneLabel?: string;
   roleName?: string;
@@ -149,6 +150,7 @@ function isValidSeatRecord(ref: string, value: unknown): value is SeatRecord {
   if (r.roleClass !== undefined && (typeof r.roleClass !== 'string' || !ROLE_CLASSES.has(r.roleClass))) return false;
   if (r.isHumanSeat !== undefined && typeof r.isHumanSeat !== 'boolean') return false;
   if (r.worktree !== undefined && typeof r.worktree !== 'string') return false;
+  if (r.commonDir !== undefined && !isNonEmptyString(r.commonDir)) return false;
   if (r.droneId !== undefined && (typeof r.droneId !== 'string' || !UUID_RE.test(r.droneId))) return false;
   if (r.sessionId !== undefined && (typeof r.sessionId !== 'string' || !UUID_RE.test(r.sessionId))) return false;
   // State-consistency invariants (no inconsistent active|pending).
@@ -447,6 +449,7 @@ export type ActivateSeatOutcome = 'activated' | 'missing' | 'replaced';
  *  worktree is decided). Merged atomically with activation by activateAndBindSeat. */
 export interface SeatBinding {
   worktree: string;
+  commonDir?: string;
   name: string;
   droneLabel: string;
   roleName?: string;
@@ -475,6 +478,7 @@ export async function activateAndBindSeat(input: {
   sessionId: string;
   expectedPendingDigest: string;
   worktree: string;
+  commonDir?: string;
   name: string;
   droneLabel: string;
   roleName?: string;
@@ -496,6 +500,7 @@ export async function activateAndBindSeat(input: {
       droneId: input.droneId,
       sessionId: input.sessionId,
       worktree: input.worktree,
+      ...(input.commonDir !== undefined ? { commonDir: input.commonDir } : {}),
       name: input.name,
       droneLabel: input.droneLabel,
       ...(input.roleName !== undefined ? { roleName: input.roleName } : {}),
@@ -675,6 +680,16 @@ export async function readAllActiveSeats(): Promise<Array<{ worktree: string; re
   return out;
 }
 
+/** Whether this cube has an active seat from another canonical Git clone family. */
+export async function hasActiveSeatInDifferentCloneFamily(cubeId: string, commonDir: string): Promise<boolean> {
+  const seats = await readAllActiveSeats();
+  return seats.some(({ record }) =>
+    record.cubeId === cubeId &&
+    record.commonDir !== undefined &&
+    record.commonDir !== commonDir
+  );
+}
+
 /** All valid worktree-bound registry entries, including a PENDING seat whose
  * interrupted finalize preserved its worktree for a later resume. Read-only:
  * pending records remain non-hydratable and getActiveSeatForWorktree stays

package/src/server-handshake.ts

@@ -410,6 +410,7 @@ export async function sendBorgServerAttach(
           sessionId: decoded.session.id,
           expectedPendingDigest: pendingBearerDigest,
           worktree: binding.worktree,
+          ...(binding.commonDir !== undefined ? { commonDir: binding.commonDir } : {}),
           name: binding.name,
           droneLabel: binding.droneLabel,
           ...(binding.roleName !== undefined ? { roleName: binding.roleName } : {}),

package/src/terminal-title.ts

@@ -32,6 +32,8 @@
  *     populated," so the assimilated path is the common case.
  */
 
+import { escapeSyncDisplay } from './sync-roles-render.js';
+
 /**
  * Pure: compose the title string for a session. Exported so tests can
  * exercise every branch without TTY / process / fs dependencies.
@@ -46,9 +48,9 @@ export function composeTerminalTitle(
   repoBasename: string
 ): string {
   if (activeDrone) {
-    return `borg · ${activeDrone.label} · ${activeDrone.cubeName}`;
+    return `borg · ${escapeSyncDisplay(activeDrone.label)} · ${escapeSyncDisplay(activeDrone.cubeName)}`;
   }
-  return `borg · ${repoBasename}`;
+  return `borg · ${escapeSyncDisplay(repoBasename)}`;
 }
 
 /**