borgmcp 2.6.1 → 2.7.1

package/src/repository-cube-init.ts

@@ -33,6 +33,17 @@ export interface RepositoryCubeCreation {
   cube: RepositoryCubeDetail;
 }
 
+type NewCubeTemplate = Exclude<CubeTemplate, 'default'>;
+
+const NEW_CUBE_TEMPLATE_NAMES: readonly NewCubeTemplate[] =
+  NEW_CUBE_TEMPLATE_PRESENTATIONS.map(({ name }) => name);
+const NEW_CUBE_TEMPLATE_OPTIONS = NEW_CUBE_TEMPLATE_NAMES.join('|');
+const NEW_CUBE_TEMPLATE_LIST = NEW_CUBE_TEMPLATE_NAMES.join(', ');
+
+function parseNewCubeTemplate(value: string): NewCubeTemplate | undefined {
+  return NEW_CUBE_TEMPLATE_PRESENTATIONS.find(({ name }) => name === value)?.name;
+}
+
 export type RepositoryCubeResolution = ResolveRepositoryCubeResponse;
 
 export interface RepositoryCubeInitFlags {
@@ -63,7 +74,7 @@ export interface RepositoryCubeInitDeps {
     name: string;
     workingRepoName: string;
     repository: CreateCubeRepository;
-    template: Exclude<CubeTemplate, 'default'>;
+    template: NewCubeTemplate;
   }): Promise<RepositoryCubeCreation>;
 }
 
@@ -158,7 +169,7 @@ function renderResult(
       `Next: borg assimilate --host ${shellEscape(input.serverOrigin)}`,
     );
   } else {
-    lines.push('Continuing with role and seat setup...');
+    lines.push('Continuing with role and seat setup…');
   }
   resultWriter(`${lines.join('\n')}\n`);
 }
@@ -176,6 +187,7 @@ export async function initializeRepositoryCube(input: {
     input.flags.template !== undefined || input.flags.noTemplate === true || input.flags.yes === true;
   const creationOptionsUnused = association !== null && creationOptionsRequested;
   if (association) {
+    deps.write(`Checking for this repository's cube on ${input.serverOrigin}…\n`);
     const cube = await deps.getCube(association.cubeId);
     const response: CreateCubeResponse = {
       result: 'resolved',
@@ -241,6 +253,7 @@ export async function initializeRepositoryCube(input: {
     return { kind: 'success', creation: { response, cube }, existing: true };
   };
 
+  deps.write(`Checking for this repository's cube on ${input.serverOrigin}…\n`);
   const serverAssociation = await deps.resolveAssociation(repository, input.context.derivedName);
   if (serverAssociation.result === 'resolved') {
     return saveResolvedAssociation(serverAssociation, {
@@ -263,9 +276,14 @@ export async function initializeRepositoryCube(input: {
       return { kind: 'stop', code: 1 };
     }
     if (!deps.isTTY() || input.flags.yes) {
+      const retryCommand = input.mode === 'cube-init'
+        ? `borg server cube init --host ${shellEscape(input.serverOrigin)}`
+        : `borg assimilate --host ${shellEscape(input.serverOrigin)}`;
       deps.write(
-        'Adopting an existing cube requires interactive confirmation; --yes is not accepted here.\n' +
-        'Rerun without --yes in an interactive terminal. No cube, repository binding, or drone was created.\n',
+        `Found existing cube '${matches[0].name}' on ${input.serverOrigin}.\n` +
+        'Linking a repository to an existing cube requires one interactive confirmation.\n' +
+        `Run ${retryCommand} --cube-name ${shellEscape(matches[0].name)} once in an interactive terminal to link it; scripted runs work from then on.\n` +
+        'No cube, repository binding, or drone was created.\n',
       );
       return { kind: 'stop', code: 1 };
     }
@@ -276,16 +294,17 @@ export async function initializeRepositoryCube(input: {
       `  server:     ${input.serverOrigin}\n`,
     );
     while (true) {
-      const answer = await ask(deps, 'Link this repository to that cube? [y/N]: ', 'adoption');
+      const answer = await ask(deps, 'Link this repository to that cube? [Y/n]: ', 'adoption');
       if ('stop' in answer) return { kind: 'stop', code: answer.stop };
       const confirmation = answer.value.trim().toLowerCase();
-      if (confirmation === 'y' || confirmation === 'yes') break;
-      if (confirmation === '' || confirmation === 'n' || confirmation === 'no') {
+      if (confirmation === '' || confirmation === 'y' || confirmation === 'yes') break;
+      if (confirmation === 'n' || confirmation === 'no') {
         deps.write('No cube, repository binding, or drone was created.\n');
         return { kind: 'stop', code: 0 };
       }
       deps.write('Enter y or n.\n');
     }
+    deps.write(`Linking this repository to cube '${matches[0].name}'…\n`);
     const associated = await deps.associateCube({
       cubeId: matches[0].id,
       workingRepoName: input.context.derivedName,
@@ -299,7 +318,11 @@ export async function initializeRepositoryCube(input: {
       if (confirmed.result !== 'resolved' || confirmed.cube_id !== associated.cube_id) {
         throw new RepositoryAssociationConfirmationError();
       }
-      return await saveResolvedAssociation(confirmed, { adopted: true, creationOptionsUnused: creationOptionsRequested });
+      return await saveResolvedAssociation(confirmed, {
+        adopted: true,
+        creationOptionsUnused: input.flags.template !== undefined ||
+          input.flags.noTemplate === true,
+      });
     } catch (error) {
       if (error instanceof RepositoryAssociationSaveError) throw error;
       throw new RepositoryAssociationConfirmationError();
@@ -320,16 +343,19 @@ export async function initializeRepositoryCube(input: {
   }
 
   if (input.flags.noTemplate) {
-    deps.write('--no-template is not supported for repository cube creation. Use --template software-dev or --template starter.\n');
+    deps.write(`--no-template is not supported for repository cube creation. Use --template ${NEW_CUBE_TEMPLATE_OPTIONS}.\n`);
     return { kind: 'stop', code: 1 };
   }
-  if (input.flags.template !== undefined && input.flags.template !== 'software-dev' && input.flags.template !== 'starter') {
+  const requestedTemplate = input.flags.template === undefined
+    ? undefined
+    : parseNewCubeTemplate(input.flags.template);
+  if (input.flags.template !== undefined && requestedTemplate === undefined) {
     const safe = input.flags.template.replace(/[\u0000-\u001f\u007f]/g, '?').slice(0, 120);
-    deps.write(`Unknown template '${safe}'. Use software-dev or starter.\n`);
+    deps.write(`Unknown template '${safe}'. Available templates: ${NEW_CUBE_TEMPLATE_LIST}.\n`);
     return { kind: 'stop', code: 1 };
   }
   if (!deps.isTTY() && !input.flags.yes && (!input.flags.cubeName || !input.flags.template)) {
-    deps.write('Non-interactive cube creation requires --cube-name <name> and --template software-dev|starter, or --yes to use repository defaults.\n');
+    deps.write(`Non-interactive cube creation requires --cube-name <name> and --template ${NEW_CUBE_TEMPLATE_OPTIONS}, or --yes to use repository defaults.\n`);
     return { kind: 'stop', code: 1 };
   }
 
@@ -358,7 +384,7 @@ export async function initializeRepositoryCube(input: {
     if (editedNameAdoption) return editedNameAdoption;
   }
 
-  let template = input.flags.template as 'software-dev' | 'starter' | undefined;
+  let template = requestedTemplate;
   if (!template && deps.isTTY() && !input.flags.yes) {
     let menu = 'Choose a template:\n';
     for (let i = 0; i < NEW_CUBE_TEMPLATE_PRESENTATIONS.length; i += 1) {
@@ -372,24 +398,23 @@ export async function initializeRepositoryCube(input: {
       const answer = await ask(deps, 'Template [1]: ');
       if ('stop' in answer) return { kind: 'stop', code: answer.stop };
       const selected = answer.value.trim();
-      if (selected === '' || selected === '1') template = 'software-dev';
-      else if (selected === '2') template = 'starter';
-      else deps.write('Choose 1 or 2.\n');
+      const selectedIndex = selected === ''
+        ? 0
+        : /^[1-9]\d*$/.test(selected) ? Number(selected) - 1 : -1;
+      const selectedPresentation = NEW_CUBE_TEMPLATE_PRESENTATIONS[selectedIndex];
+      if (selectedPresentation) template = selectedPresentation.name;
+      else deps.write(`Choose 1-${NEW_CUBE_TEMPLATE_PRESENTATIONS.length}.\n`);
     }
   }
-  template ??= 'software-dev';
+  template ??= NEW_CUBE_TEMPLATE_PRESENTATIONS[0].name;
 
   if (deps.isTTY() && !input.flags.yes) {
-    deps.write(
-      `Create this cube?\n` +
-      `  Name: ${name}\n` +
-      `  Template: ${presentation(template).label}\n` +
-      `  Repository: ${input.context.root}\n` +
-      `  Server: ${input.serverOrigin}\n`,
-    );
     let confirmed = false;
     while (!confirmed) {
-      const answer = await ask(deps, 'Create cube? [Y/n]: ');
+      const answer = await ask(
+        deps,
+        `Create cube '${name}' (${presentation(template).label}) on ${input.serverOrigin}? [Y/n]: `,
+      );
       if ('stop' in answer) return { kind: 'stop', code: answer.stop };
       const confirmation = answer.value.trim().toLowerCase();
       if (confirmation === '' || confirmation === 'y' || confirmation === 'yes') {
@@ -404,7 +429,7 @@ export async function initializeRepositoryCube(input: {
     }
   }
 
-  deps.write('Creating cube...\n');
+  deps.write(`Creating cube '${name}'…\n`);
   const workingRepoName = input.context.derivedName;
   let creation: RepositoryCubeCreation;
   try {

package/src/repository-identity.ts

@@ -2,7 +2,7 @@ import { createHmac, randomBytes, randomUUID } from 'node:crypto';
 import { spawnSync } from 'node:child_process';
 import { basename, isAbsolute, join } from 'node:path';
 import { realpath } from 'node:fs/promises';
-import type { CreateCubeRepository, CubeTemplate } from 'borgmcp-shared/protocol';
+import { CUBE_TEMPLATES, type CreateCubeRepository, type CubeTemplate } from 'borgmcp-shared/protocol';
 import { canonicalizeWorkingRepoIdentity } from './working-repo.js';
 import { normalizeCubeName } from './cube-name.js';
 import { borgConfigRoot, ensurePrivateBorgConfigRoot } from './private-root.js';
@@ -118,7 +118,7 @@ function parseState(raw: string | null): RepositoryIdentityState {
       !DISPLAY_NAME_RE.test(value.name) ||
       typeof value.workingRepoName !== 'string' || Buffer.byteLength(value.workingRepoName, 'utf8') > 120 ||
       !DISPLAY_NAME_RE.test(value.workingRepoName) ||
-      (value.template !== 'software-dev' && value.template !== 'starter' && value.template !== 'default')
+      !CUBE_TEMPLATES.some((template) => template === value.template)
     ) {
       throw new Error('Borg repository identity store is malformed or unsupported');
     }