borgmcp 2.16.1 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "2.16.1",
+  "version": "3.0.0",
   "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code, Codex, and OpenCode.",
   "type": "module",
   "main": "./dist/index.js",

package/src/assimilate-cmd.ts

@@ -615,7 +615,7 @@ function reportServerFailure(
     );
     return 1;
   }
-  if (/seat store lock file .* is stale/i.test(message)) {
+  if (/(?:private|seat) store lock file .* is stale/i.test(message)) {
     // RULED option (b): a lock whose recorded holder is DEAD (or whose payload is
     // corrupt) is NEVER auto-removed. Surface the fail-closed guidance verbatim —
     // it already names the exact lockfile path and the delete-only-if-no-borg
@@ -626,16 +626,16 @@ function reportServerFailure(
     );
     return 1;
   }
-  if (/(?:seat|credential) store is busy/i.test(message)) {
+  if (/(?:private|seat|credential) store is busy/i.test(message)) {
     deps.stderr(
-      `Borg's local seat store is busy for ${apiUrl} because another Borg process is ` +
-        `creating or resuming saved seat state. Wait for it to finish, then rerun ${retryCommand}.\n`,
+      `Borg's private store is busy for ${apiUrl} because another Borg process is ` +
+        `creating or resuming saved connection state. Wait for it to finish, then rerun ${retryCommand}.\n`,
     );
     return 1;
   }
-  if (/(?:local )?seat store|(?:secure )?credential (?:store|storage)/i.test(message)) {
+  if (/(?:(?:local )?(?:private|seat) store|(?:secure )?credential (?:store|storage))/i.test(message)) {
     deps.stderr(
-      `Borg could not access its local seat store for ${apiUrl}. ` +
+      `Borg could not access its private store for ${apiUrl}. ` +
         `Ensure its directory on this machine is readable and writable, then rerun ${retryCommand}.\n`,
     );
     return 1;
@@ -680,7 +680,7 @@ function reportServerFailure(
 }
 
 function resetLocalSeatCommand(apiUrl: string): string {
-  return `\`borg reset-local-seat --host ${apiUrl}\``;
+  return `\`borg reset-local-connection --host ${apiUrl}\``;
 }
 
 // Pin-matched terminal session diagnosis. This is intentionally output-only:
@@ -699,7 +699,7 @@ function diagnoseSessionTermination(
     : `borg assimilate --host ${apiUrl} --enroll`;
   deps.stderr(
     `${message}\n` +
-      `Next: run borg reset-local-seat, then ${recovery}.\n`,
+      `Next: run borg reset-local-connection, then ${recovery}.\n`,
   );
   return 1;
 }
@@ -1287,9 +1287,9 @@ export async function runAssimilate(
         }
       } else {
         deps.stderr(
-          `This worktree has saved seat metadata for ${authority.apiUrl}, but its local session ` +
-            'credential could not be loaded from the local seat store. No new seat was created. Run ' +
-            `${resetLocalSeatCommand(authority.apiUrl)} to clear this worktree's saved seat, then ` +
+          `This worktree has a saved connection to ${authority.apiUrl}, but its local session ` +
+            'credential could not be loaded from the private store. No drone was created. Run ' +
+            `${resetLocalSeatCommand(authority.apiUrl)} to clear this worktree's saved connection, then ` +
             `ask the operator for a new invitation and rerun ${localAssimilateCommand(authority.apiUrl, true)}.\n`,
         );
         return 1;
@@ -1301,8 +1301,8 @@ export async function runAssimilate(
         existing.serverTrustIdentity !== auth.serverTrustIdentity)
     ) {
       deps.stderr(
-        `This worktree's saved seat does not match ${authority.apiUrl}. ` +
-          'No new seat was created. Restore the expected server identity or use a fresh ' +
+        `This worktree's saved connection does not match ${authority.apiUrl}. ` +
+          'No drone was created. Restore the expected server identity or use a fresh ' +
           `worktree, then rerun ${localAssimilateCommand(authority.apiUrl)}.\n`,
       );
       return 1;
@@ -1323,7 +1323,7 @@ export async function runAssimilate(
       );
       // Canonical rotated/revoked path: a pin-matched 401 on THIS worktree's
       // saved bearer. PURE DIAGNOSIS — attach never mutates local state on a
-      // rejection; it points at the offline `borg reset-local-seat` command.
+      // rejection; it points at the offline `borg reset-local-connection` command.
       // Distinct from unreachable/404/5xx/trust-mismatch, which stay
       // indeterminate below.
       if (status === 'revoked') {
@@ -1338,7 +1338,7 @@ export async function runAssimilate(
         // The saved SESSION bearer was rejected WITHOUT the typed takeover code
         // (a bare/other 401). Non-destructive: re-enroll, never a seat reset.
         deps.stderr(
-          `The saved enrollment for ${authority.apiUrl} was rejected. No new seat was created ` +
+          `The saved enrollment for ${authority.apiUrl} was rejected. No drone was created ` +
             `and nothing was changed. Re-enroll with ${localAssimilateCommand(authority.apiUrl, true)} ` +
             'from the operator’s terminal.\n',
         );
@@ -1349,7 +1349,7 @@ export async function runAssimilate(
         // fix it — verify this is the expected server / re-initialization.
         deps.stderr(
           `Borg could not verify the expected server identity for ${authority.apiUrl}. ` +
-            'No new seat was created. Verify that this is the expected server; if it was ' +
+            'No drone was created. Verify that this is the expected server; if it was ' +
             're-initialized, restore the expected identity, then rerun ' +
             `${localAssimilateCommand(authority.apiUrl)}.\n`,
         );
@@ -1361,7 +1361,7 @@ export async function runAssimilate(
         // fix it; align versions. Non-destructive: no seat created, nothing reset.
         deps.stderr(
           `Borg reached ${authority.apiUrl} but it did not recognize this worktree's drone ` +
-            'endpoint — the client and server versions are likely incompatible. No new seat ' +
+            'endpoint — the client and server versions are likely incompatible. No drone ' +
             'was created and nothing was changed. Update the Borg client and/or server so ' +
             `their versions match, then rerun ${localAssimilateCommand(authority.apiUrl)}.\n`,
         );
@@ -1372,7 +1372,7 @@ export async function runAssimilate(
         // check the server, then retry. Non-destructive.
         deps.stderr(
           `Borg reached ${authority.apiUrl} but it returned a server error while verifying ` +
-            "this worktree's saved seat. No new seat was created. Check the server (its logs / " +
+            "this worktree's saved connection. No drone was created. Check the server (its logs / " +
             `\`borg-mcp-server start\`), then rerun ${localAssimilateCommand(authority.apiUrl)}.\n`,
         );
         return 1;
@@ -1381,16 +1381,16 @@ export async function runAssimilate(
         // CR5: transport failure / timeout (unreachable) or a genuinely ambiguous
         // failure (indeterminate) — both transient. Start or restart the server.
         deps.stderr(
-          `Borg could not verify this worktree's saved seat on ${authority.apiUrl}. ` +
-            'No new seat was created. Start or restart the server with ' +
+          `Borg could not verify this worktree's saved connection to ${authority.apiUrl}. ` +
+            'No drone was created. Start or restart the server with ' +
             `\`borg-mcp-server start\`, then rerun ${localAssimilateCommand(authority.apiUrl)}.\n`,
         );
         return 1;
       }
       if (status === 'live' && !savedLocalRole) {
         deps.stderr(
-          `Borg verified this worktree's saved seat on ${authority.apiUrl}, but its saved ` +
-            'role is unavailable. No new seat was created. Ask the server operator to restore ' +
+          `Borg verified this worktree's saved connection to ${authority.apiUrl}, but its saved ` +
+            'role is unavailable. No drone was created. Ask the server operator to restore ' +
             `the role, then rerun ${localAssimilateCommand(authority.apiUrl)}.\n`,
         );
         return 1;
@@ -1401,8 +1401,8 @@ export async function runAssimilate(
   } else if (existing && args.flags.here) {
     if (existing.serverTrustIdentity !== undefined || existing.apiUrl !== auth.apiUrl) {
       deps.stderr(
-        'This worktree\'s saved seat belongs to a different Borg authority. ' +
-          'No new seat was created; use a fresh worktree.\n',
+        'This worktree\'s saved connection belongs to a different Borg authority. ' +
+          'No drone was created; use a fresh worktree.\n',
       );
       return 1;
     }
@@ -1583,7 +1583,7 @@ export async function runAssimilate(
     // a non-reattach DroneEvictedError falls through to the generic message.
     if (err instanceof DroneEvictedError && reattachPriorId != null) {
       deps.stderr(
-        `This worktree's saved seat on ${authority.apiUrl} was evicted. ` +
+        `This worktree's drone on ${authority.apiUrl} was evicted. ` +
           `Remove this worktree, or from a fresh worktree run ` +
           `${localAssimilateCommand(authority.apiUrl)}.\n`,
       );
@@ -1593,7 +1593,7 @@ export async function runAssimilate(
     // Reached only after a successful pinned-TLS attach, so it is pin-matched by
     // construction — a pin mismatch throws a distinct trust error and never
     // enters this branch. Attach mutates NOTHING; it recommends the offline
-    // `borg reset-local-seat` command.
+    // `borg reset-local-connection` command.
     if (err instanceof BorgServerError && reattachPriorId != null) {
       if (err.code === 'SESSION_REVOKED') {
         return diagnoseSessionTermination(deps, authority.apiUrl, 'revoked');
@@ -1616,7 +1616,7 @@ export async function runAssimilate(
     // concurrent offline reset, or a competing enroll). No FS/network mutation
     // happened; never silently recreate.
     deps.stderr(
-      `This worktree's saved local seat on ${authority.apiUrl} changed before the attach ` +
+      `This worktree's saved connection to ${authority.apiUrl} changed before the attach ` +
         '(a concurrent reset or enroll); no credential was created or sent and nothing was ' +
         `changed. Re-run ${localAssimilateCommand(authority.apiUrl)} to attach against the ` +
         'current state.\n',
@@ -1641,16 +1641,16 @@ export async function runAssimilate(
   const assignedRole =
     cubeDetail.roles.find((r) => r.id === result.role_id) ?? resolvedRole;
   if (result.result === 'reused') {
-    // The seat's existing role is authoritative on an idempotent reattach —
+    // The drone's existing role is authoritative on an idempotent reattach —
     // a role difference is expected, not a grant fallback. The bearer is
     // reused, not rotated: no new drone minted.
     deps.stderr(
-      `re-attached to existing seat ${result.drone_label} (same session, no new drone minted)\n`
+      `re-attached as ${result.drone_label} (same session, no new drone minted)\n`
     );
   } else if (assignedRole.id !== resolvedRole.id) {
     deps.stderr(
       `The requested role "${resolvedRole.name}" was unavailable; ` +
-      `attached to the "${assignedRole.name}" seat instead.\n`
+      `attached under the "${assignedRole.name}" role instead.\n`
     );
   }
 
@@ -1814,7 +1814,7 @@ export async function runAssimilate(
     }
     deps.stderr(
       `spawned sibling worktree at ${candidate} on branch ${wtBranch} (${startRef}); ` +
-      `the original dir keeps its active drone binding — run \`borg reset-local-seat\` there if that binding is stale.\n`
+      `the original dir keeps its active drone binding — run \`borg reset-local-connection\` there if that binding is stale.\n`
     );
     deps.chdir(candidate);
     deps.stderr(renderWorktreeSteeringNote(candidate, wtBranch, projectRoot));
@@ -1903,7 +1903,7 @@ export async function runAssimilate(
   // EXACT prior binding with its live-bearer digest; eviction remint = EXACT ref
   // only, bearer intentionally replaced; fresh/sibling = ABSENT).
   if (result.finalize === undefined || deps.finalizeServerSeat === undefined) {
-    deps.stderr('Local Borg server session metadata is incomplete; no seat was saved.\n');
+    deps.stderr('Local Borg server session metadata is incomplete; no connection was saved.\n');
     rollbackWorktree();
     return 1;
   }
@@ -1959,12 +1959,12 @@ export async function runAssimilate(
         if (bindOutcome === 'bound') {
           // The worktree now owns a durable locator (the bound-pending record points
           // here). PRESERVE it. Truthful convergence copy: a rerun FROM here re-sends
-          // the identical bearer (no duplicate), and `reset-local-seat` from here now
+          // the identical bearer (no duplicate), and `reset-local-connection` from here now
           // discovers + clears the bound-pending record.
           deps.stderr(
             `This worktree's secure session on ${auth.apiUrl} did not finish activating, but ` +
-              'its resumable seat state was PRESERVED here. This worktree was NOT removed. From ' +
-              `here, re-run ${localAssimilateCommand(auth.apiUrl)} to converge (the identical seat ` +
+              'its resumable connection state was PRESERVED here. This worktree was NOT removed. From ' +
+              `here, re-run ${localAssimilateCommand(auth.apiUrl)} to converge (the identical connection ` +
               `is reused — no duplicate is minted), or run ${resetLocalSeatCommand(auth.apiUrl)} to ` +
               'clear it.\n',
           );
@@ -1977,17 +1977,17 @@ export async function runAssimilate(
         // that can silently create a duplicate server seat (#35).
         const bindFailure =
           bindOutcome === 'missing'
-            ? 'the exact pending seat record went missing locally before it could be bound'
+            ? 'the exact pending connection record went missing locally before it could be bound'
             : bindOutcome === 'replaced'
-              ? 'the exact pending seat record was replaced locally before it could be bound; the replacement was left untouched'
+              ? 'the exact pending connection record was replaced locally before it could be bound; the replacement was left untouched'
               : bindOutcome === 'threw'
-                ? 'the local seat store could not be read or written while preserving the pending seat'
-                : 'this client did not receive a pending-seat preservation handle';
+                ? 'the private store could not be read or written while preserving the pending connection'
+                : 'this client did not receive a pending-connection preservation handle';
         deps.stderr(
           `This worktree's secure session on ${auth.apiUrl} did not finish activating: ` +
             `${bindFailure}. The spawned worktree will be removed. No client-only command can ` +
-            'prove reuse or safely clear the possibly accepted server-side seat; ask the server ' +
-            'operator to inspect that seat before retrying.\n',
+            'prove reuse or safely clear the possibly accepted server-side drone; ask the server ' +
+            'operator to inspect that drone before retrying.\n',
         );
         rollbackWorktree();
         return 1;
@@ -1997,8 +1997,8 @@ export async function runAssimilate(
       // reset or enroll). The composite scrubbed only our own pending record — no
       // orphan ACTIVE credential — so a just-spawned worktree is safe to remove.
       deps.stderr(
-        `This worktree's saved local seat on ${auth.apiUrl} changed during attach ` +
-          '(a concurrent reset or enroll); no seat was created and nothing was overwritten. ' +
+        `This worktree's saved connection to ${auth.apiUrl} changed during attach ` +
+          '(a concurrent reset or enroll); no drone was created and nothing was overwritten. ' +
           `Re-run ${localAssimilateCommand(auth.apiUrl)} to attach against the current state.\n`,
       );
       rollbackWorktree();

package/src/assimilate-deps.ts

@@ -474,13 +474,13 @@ export function buildDefaultAssimilateDeps(
           if (params.remint_invalid_prior) {
             if (prepared.result !== 'created' || prepared.drone.id === params.prior_drone_id) {
               await prepared.scrubPending();
-              throw new Error('Borg server did not remint a fresh seat after eviction');
+              throw new Error('Borg server did not remint a fresh drone after eviction');
             }
           } else if (prepared.result !== 'reused' || prepared.drone.id !== params.prior_drone_id) {
             await prepared.scrubPending();
             throw new BorgServerError(
               'ATTACH_CONFLICT',
-              'Borg server did not reattach the saved seat',
+              'Borg server did not reattach the saved connection',
             );
           }
         }

package/src/assimilate-guard.ts

@@ -48,8 +48,8 @@ export function reattachOnlyRefusal(
 ): string {
   if (decision.kind === 'no-identity') {
     return (
-      `◼ This session has no drone seat for this worktree, and in-session borg_assimilate is ` +
-      `re-attach-only (it never creates seats — gh#780). To create a seat for cube ` +
+      `◼ This session has no drone for this worktree, and in-session borg_assimilate is ` +
+      `re-attach-only (it never creates drones — gh#780). To create a drone for cube ` +
       `"${requestedCubeName}", run \`borg assimilate\` in a terminal — it spawns the worktree, ` +
       `persists the identity, and launches the agent in one step.`
     );
@@ -76,9 +76,9 @@ export function reattachFailureMessage(error: {
 }): string {
   const detail = error.message ?? String(error);
   return (
-    `◼ Re-attach failed — this worktree's saved seat is unreachable (likely evicted or its ` +
+    `◼ Re-attach failed — this worktree's saved connection is unreachable (likely evicted or its ` +
     `session was revoked). Server said: ${detail}\n` +
-    `Recover by running \`borg assimilate\` in a terminal to create a fresh seat; ` +
+    `Recover by running \`borg assimilate\` in a terminal to create a fresh drone; ` +
     `in-session borg_assimilate never re-mints (gh#780).`
   );
 }

package/src/assimilate-welcome.ts

@@ -31,8 +31,8 @@ export function renderAssimilationWelcome(
   return [
     `${check} Attached \`${droneLabel}\` to \`${roleName}\` in cube \`${cubeName}\`.`,
     ``,
-    `In the launched agent, run \`borg_whoami\` and \`borg_roster\` to verify the seat`,
-    `and begin coordinating.`,
+    `In the launched agent, run \`borg_whoami\` and \`borg_roster\``,
+    `to verify the connection and begin coordinating.`,
     `Launch future sessions in this repository with \`borg\`.`,
     ...teammateLines,
     ``,

package/src/claude.ts

@@ -12,8 +12,6 @@
  *   borg setup          → Re-route to the setup wizard
  *   borg spawn <name>   → Create a sibling git worktree + launch a
  *                         fresh drone inside it (see spawn.ts)
- *   borg sync           → Advance the current worktree across the 5
- *                         lifecycle states (see sync.ts, gh#33)
  *   borg server <cmd>   → Forward a lifecycle command to borg-mcp-server
  */
 
@@ -31,7 +29,6 @@ import { handleVersionFlag, getPackageVersion } from './version.js';
 import { clientSubcommandHelpText, topLevelHelpText } from './cli-help.js';
 import { runSpawn } from './spawn.js';
 import { buildClaudeLaunchArgs } from './claude-launch-args.js';
-import { parseSyncArgs, runSync } from './sync.js';
 import { parseCleanupArgs, runCleanup } from './cleanup-cmd.js';
 import { parseAssimilateArgs } from './parse-assimilate-args.js';
 import { runAssimilate } from './assimilate-cmd.js';
@@ -216,11 +213,11 @@ async function main() {
     const code = await runAssimilateEntry(process.argv.slice(3));
     process.exit(code);
   }
-  if (process.argv[2] === 'reset-local-seat') {
+  if (process.argv[2] === 'reset-local-connection') {
     const parsed = parseResetLocalSeatArgs(process.argv.slice(3));
     if (!parsed.ok) {
       process.stderr.write(
-        chalk.red(`${consolePrefix()}◼ borg reset-local-seat: ${parsed.error}\n`)
+        chalk.red(`${consolePrefix()}◼ borg reset-local-connection: ${parsed.error}\n`)
       );
       process.stderr.write(`Run \`borg --help\` for usage.\n`);
       process.exit(1);
@@ -254,18 +251,6 @@ async function main() {
     const code = await runSpawn();
     process.exit(code);
   }
-  if (process.argv[2] === 'sync') {
-    const parsed = parseSyncArgs(process.argv.slice(3));
-    if (!parsed.ok) {
-      process.stderr.write(
-        chalk.red(`${consolePrefix()}◼ borg sync: ${parsed.error}\n`)
-      );
-      process.stderr.write(`Run \`borg --help\` for usage.\n`);
-      process.exit(1);
-    }
-    const code = await runSync({}, parsed.options);
-    process.exit(code);
-  }
   if (process.argv[2] === 'cleanup') {
     const parsed = parseCleanupArgs(process.argv.slice(3));
     if (!parsed.ok) {

package/src/cleanup-cmd.ts

@@ -74,7 +74,7 @@ export type CleanupReason =
   | 'SURVIVES-live'
   | 'SURVIVES-self'
   | 'UNKNOWN-indeterminate'
-  | 'UNKNOWN-no-seat'
+  | 'UNKNOWN-no-connection'
   | 'LEGACY-manual-review';
 
 export interface CleanupRow {
@@ -350,7 +350,7 @@ async function classifyWorktree(
     case 'revoked':
       return { reason: 'SURVIVES-revoked', detail: 'session revoked — recoverable via re-enroll, never delete' };
     case 'live':
-      return { reason: 'SURVIVES-live', detail: 'seat resolves (drone alive)' };
+      return { reason: 'SURVIVES-live', detail: 'connection resolves (drone alive)' };
     case 'indeterminate':
     default:
       return {
@@ -431,7 +431,7 @@ export async function buildCleanupReport(
       // sibling → REPORT for manual review, never auto-prune (S5). No seat →
       // an arbitrary user worktree we never touch or list.
       if (seat) {
-        rows.push({ worktreePath: wt, wtBranch: null, reason: 'LEGACY-manual-review', detail: 'borg seat outside worktreesHome (pre-gh#556 sibling)' });
+        rows.push({ worktreePath: wt, wtBranch: null, reason: 'LEGACY-manual-review', detail: 'borg connection outside worktreesHome (pre-gh#556 sibling)' });
       }
       continue;
     }
@@ -439,7 +439,7 @@ export async function buildCleanupReport(
     // Under worktreesHome but no saved seat → not eviction-orphaned
     // (pre-assimilate or hand-made). Report, never auto-prune.
     if (!seat) {
-      rows.push({ worktreePath: wt, wtBranch: null, reason: 'UNKNOWN-no-seat', detail: 'no saved seat — manual review' });
+      rows.push({ worktreePath: wt, wtBranch: null, reason: 'UNKNOWN-no-connection', detail: 'no saved connection — manual review' });
       continue;
     }
 

package/src/cli-help.ts

@@ -16,16 +16,6 @@ export function isHelpFlag(arg: string | undefined): boolean {
   return arg === '--help' || arg === '-h';
 }
 
-export function syncHelpText(version: string): string {
-  return (
-    `borg sync (borgmcp ${version}) — update this Borg worktree from origin/main\n\n` +
-    `Usage:\n` +
-    `  borg sync             Update safely; refuse if the worktree is dirty\n` +
-    `  borg sync --prune     Also delete a merged local feature branch\n` +
-    `  borg sync --help      Show this help\n`
-  );
-}
-
 export function cleanupHelpText(version: string): string {
   return (
     `borg cleanup (borgmcp ${version}) — review orphaned Borg-managed worktrees\n\n` +
@@ -63,9 +53,8 @@ export function clientSubcommandHelpText(
   switch (command) {
     case 'setup': return setupHelpText(version);
     case 'assimilate': return assimilateHelpText(version);
-    case 'reset-local-seat': return resetLocalSeatHelpText(version);
+    case 'reset-local-connection': return resetLocalSeatHelpText(version);
     case 'recover-enrollment': return recoverEnrollmentHelpText(version);
-    case 'sync': return syncHelpText(version);
     case 'cleanup': return cleanupHelpText(version);
     case 'launch-all': return launchAllHelpText(version);
     default: return null;
@@ -101,9 +90,8 @@ export function topLevelHelpText(version: string): string {
     `  borg assimilate --host <host>   Join or create on an explicit server\n` +
     `  borg assimilate --worktree <name>   Spawn a worktree drone (in ~/.borg/worktrees/<repo>/<name>)\n` +
     `  borg server cube init    Initialize this repository's cube without creating a drone\n` +
-    `  borg reset-local-seat    Clear ONLY this worktree's saved local seat (offline; after a rejection)\n` +
+    `  borg reset-local-connection  Clear ONLY this worktree's saved connection to its cube (offline; after a rejection)\n` +
     `  borg recover-enrollment  Restore or clear ONLY one failed server enrollment transaction\n` +
-    `  borg sync [--prune]      Sync this worktree's branch to origin/main\n` +
     `  borg cleanup [--prune]   Report (or --prune) worktrees orphaned by evicted drones\n` +
     `  borg launch-all [cube]   Launch all drone worktrees of a cube (default: active cube)\n` +
     `  borg launch-all [cube] --cli claude|codex|opencode\n` +
@@ -157,8 +145,8 @@ export function serverHelpText(): string {
     `  update   Verify and activate a local server artifact.\n` +
     `  invite   Create a single-use invitation in an interactive terminal.\n` +
     `  cert-reissue  Widen the server certificate to cover another address without replacing the CA.\n` +
-    `  client-list   List enrolled clients, states, and cube grants while the server is stopped.\n` +
-    `  client-grant  Grant a client read, write, or manage access to a cube while the server is stopped.\n` +
+    `  client-list   List enrolled clients, states, and cube grants while the server is live; committed changes take effect on the next request.\n` +
+    `  client-grant  Grant a client read, write, or manage access to a cube while the server is live; committed changes take effect on the next request.\n` +
     `  dashboard   View the running local server dashboard.\n` +
     `  cube init   Initialize this Git repository's cube; does not create a drone.\n\n` +
     `Run borg server <command> --help for server command options.\n`
@@ -203,7 +191,7 @@ export function assimilateHelpText(version: string): string {
     `Flags:\n` +
     `  --worktree <name>          Create + launch the drone in a sibling git worktree\n` +
     `  --here                     Stay in the current worktree (no sibling spawn)\n` +
-    `  --force                    Override a live-seat guard for a wedged monitor\n` +
+    `  --force                    Reattach despite a still-live inbox monitor in this worktree\n` +
     `  --cube-name <name>         Repository cube name (otherwise edit the proposed name)\n` +
     `  --host <host>              Borg server host or URL (bare hosts default to HTTPS)\n` +
     `  --enroll                   Prompt for a hidden enrollment invitation in the operator terminal\n` +
@@ -216,7 +204,7 @@ export function assimilateHelpText(version: string): string {
     `repository association skips all prompts. One accessible exact-name legacy cube requires\n` +
     `explicit interactive adoption; ambiguous matches fail closed. An enrolled owner client may\n` +
     `create an idempotent repository cube; ordinary clients require an explicit cube grant.\n` +
-    `Agent seats begin only after enrollment. Preview only.\n` +
+    `A drone is created only after enrollment. Preview only.\n` +
     `See docs/LOCAL_SERVER.md for self-hosted setup and current status.\n\n` +
     `For local or provider-specific models, configure the selected agent CLI directly.\n` +
     `OpenCode supports Ollama and other providers through its own model configuration.\n`
@@ -224,25 +212,25 @@ export function assimilateHelpText(version: string): string {
 }
 
 /**
- * Help text for `borg reset-local-seat --help`. The offline, network-free seat
+ * Help text for `borg reset-local-connection --help`. The offline, network-free seat
  * reset recommended by the pin-matched SESSION_REJECTED diagnostic (#1082).
  */
 export function resetLocalSeatHelpText(version: string): string {
   return (
-    `borg reset-local-seat (borgmcp ${version}) — clear ONLY this worktree's saved local seat\n\n` +
+    `borg reset-local-connection (borgmcp ${version}) — clear ONLY this worktree's saved connection to its cube\n\n` +
     `Offline and network-free: it contacts no server and revokes nothing server-side. It clears\n` +
-    `just this worktree's saved local seat — its credential and cube binding together — from the\n` +
-    `local seat store on this machine. Server, trust anchor, cube, and every sibling worktree are\n` +
+    `just this worktree's saved connection — its credential and cube binding together — from the\n` +
+    `private store on this machine. Server, trust anchor, cube, and every sibling worktree are\n` +
     `left untouched.\n\n` +
     `Use it after \`borg assimilate\` reports this worktree's session was revoked or superseded\n` +
     `(a pin-matched rejection), then ask the operator for a new invitation and re-enroll.\n\n` +
     `Usage:\n` +
-    `  borg reset-local-seat                 Reset this worktree's saved seat (TTY confirms [y/N])\n` +
-    `  borg reset-local-seat --host <host>   No-op unless this worktree's seat is on <host>\n` +
-    `  borg reset-local-seat --yes           Reset without a prompt (required when non-interactive)\n` +
-    `  borg reset-local-seat --help          Show this help\n\n` +
+    `  borg reset-local-connection                 Reset this worktree's saved connection (TTY confirms [y/N])\n` +
+    `  borg reset-local-connection --host <host>   No-op unless this worktree connects to <host>\n` +
+    `  borg reset-local-connection --yes           Reset without a prompt (required when non-interactive)\n` +
+    `  borg reset-local-connection --help          Show this help\n\n` +
     `Flags:\n` +
-    `  --host <host>              Only act if this worktree's saved seat is on <host> (else no-op)\n` +
+    `  --host <host>              Only act if this worktree connects to <host> (else no-op)\n` +
     `  --yes, -y                  Skip the confirmation prompt (required in non-TTY contexts)\n`
   );
 }

package/src/cubes.ts

@@ -110,7 +110,7 @@ let pinnedMcpSeatIdentity: {
 export class McpSeatIdentityChangedError extends Error {
   readonly code = 'SEAT_IDENTITY_CHANGED';
   constructor() {
-    super('The saved Borg seat changed after this MCP session pinned its identity. Exit this session and relaunch from the intended worktree.');
+    super('This worktree\'s saved connection changed after this MCP session pinned its identity. Exit this session and relaunch from the intended worktree.');
     this.name = 'McpSeatIdentityChangedError';
   }
 }
@@ -439,7 +439,7 @@ export async function snapshotLocalSeat(): Promise<LocalSeatSnapshot | null> {
   // CR#4: discover an ACTIVE seat OR a bound-PENDING record (a sibling whose
   // activation failed, bound to THIS worktree by the attach bind-pending step).
   // getActiveSeatForWorktree would MISS the bound-pending record (it requires
-  // state==='active' + a drone id), so `reset-local-seat` would FALSELY report
+  // state==='active' + a drone id), so `reset-local-connection` would FALSELY report
   // "nothing to reset" (exit 0) while a resumable, server-digest-bound bearer
   // persists at rest — a FALSE-SUCCESS revocation failure. getSeatForWorktree sees
   // both, and the offline reset's exact re-check + delete cover the bound-pending

package/src/docs-sections.ts

@@ -78,7 +78,7 @@ export const DOCS_SECTIONS: DocsSection[] = [
     url: SEAT_LIFECYCLE_URL,
     page: "docs/SEAT_LIFECYCLE.md",
     summary: "Saved-seat states, re-attach and reset recovery, duplicate-session guards, and deterministic multi-seat selection.",
-    keywords: ["seat", "lifecycle", "reattach", "re-attach", "reset-local-seat", "evicted", "revoked", "superseded", "inbox monitor", "multiple seats", "silent deafness"],
+    keywords: ["seat", "lifecycle", "reattach", "re-attach", "reset-local-connection", "evicted", "revoked", "superseded", "inbox monitor", "multiple seats", "silent deafness"],
   },
   {
     slug: "self-hosting",

package/src/drone-lifecycle.ts

@@ -16,7 +16,7 @@ export const CUBE_DELETED_CODE = 'CUBE_DELETED';
 
 export class DroneEvictedError extends Error {
   constructor(
-    message = 'This seat was removed from the cube.'
+    message = 'This drone was removed from the cube.'
   ) {
     super(message);
     this.name = 'DroneEvictedError';
@@ -45,8 +45,8 @@ export const CUBE_DELETED_RESULT_MARKER = '[CUBE-DELETED]';
 export function formatEvictedToolResult(cubeName?: string): string {
   const cube = cubeName ?? 'the selected cube';
   return (
-    `${EVICTED_RESULT_MARKER} This seat was removed from cube ${cube}.\n\n` +
-    'Borg has stopped listening for activity for this seat. Do not retry this request or restart the loop.\n\n' +
+    `${EVICTED_RESULT_MARKER} This drone was removed from cube ${cube}.\n\n` +
+    'Borg has stopped listening for activity for this drone. Do not retry this request or restart the loop.\n\n' +
     'Your worktree and project files are unchanged. Finish any local file safety checks, then end this agent session.\n\n' +
     'To rejoin later, start a new session and use a new invitation from the server operator. Do not re-assimilate from this evicted session.'
   );

package/src/drone-management.ts

@@ -50,7 +50,7 @@ const defaultDeps: DroneManagementDeps = {
 };
 
 export const STALE_ROLE_DISPLAY_WARNING =
-  'Local display warning: The server committed this change, but Borg could not refresh this worktree\'s saved seat metadata. Local role details may be stale. Do not retry the reassignment.\n\n' +
+  'Local display warning: The server committed this change, but Borg could not refresh this worktree\'s saved connection metadata. Local role details may be stale. Do not retry the reassignment.\n\n' +
   'Run `borg_regen` to refresh the server-authoritative role. If this session still shows the previous role, restart this agent session once. Do not re-assimilate or repeat the management request.';
 
 function opaqueNotFound(): never {

package/src/evict-drone.ts

@@ -75,8 +75,8 @@ export function formatReassignDroneSuccess(input: {
 export function formatEvictDroneSuccess(droneLabel: string, cubeName: string): string {
   return (
     `Removed ${droneLabel} from cube ${cubeName}.\n` +
-    'The seat credential is revoked. The session will stop after its next Borg request.\n' +
-    'The worktree and project files were not deleted. Activity history remains attributed to the removed seat.\n' +
+    'The drone\'s credential is revoked. The session will stop after its next Borg request.\n' +
+    'The worktree and project files were not deleted. Activity history remains attributed to the removed drone.\n' +
     'After its work is merged, run `borg cleanup` to review whether the worktree can be pruned.'
   );
 }

package/src/foreign-path-reminder.ts

@@ -17,7 +17,7 @@ import {
   BORG_LAUNCH_WORKTREE_ENV,
 } from './launch-access.js';
 
-const REMINDER = 'Reminder: this seat is scoped to its own worktree and scratch root; coordinate before working on a foreign path.';
+const REMINDER = 'Reminder: this drone is scoped to its own worktree and scratch root; coordinate before working on a foreign path.';
 
 const PATH_KEYS = new Set([
   'cwd',

package/src/inbox-monitor.ts

@@ -797,8 +797,8 @@ function liveMonitorYieldLine(
     : null;
   const holder = livePid === null ? 'another monitor instance' : `a live instance (pid ${livePid})`;
   return (
-    `borg-inbox-monitor: seat inbox ${JSON.stringify(inboxPath)} is already monitored by ${holder}; ` +
-    'yielding — another session likely holds this seat.'
+    `borg-inbox-monitor: inbox ${JSON.stringify(inboxPath)} is already monitored by ${holder}; ` +
+    'yielding — another session likely holds this worktree\'s connection.'
   );
 }
 

package/src/index.ts

@@ -561,7 +561,7 @@ export async function main() {
               `# Re-attached to cube: ${displayIdentity.cubeName}`,
               ``,
               `**Drone label:** ${displayIdentity.droneLabel}`,
-              `**Seat:** existing identity reused — no new drone minted (gh#780)`,
+              `**Drone:** existing identity reused — no new drone minted (gh#780)`,
               ``,
               ``,
             ].join('\n');