spindb 0.50.8 → 0.51.1

package/dist/cli/commands/menu/container-handlers.js

@@ -5,6 +5,8 @@ import { stat, mkdir, rm } from 'fs/promises';
 import { dirname, basename, join, resolve } from 'path';
 import { homedir } from 'os';
 import { containerManager, updateRenameTracking, } from '../../../core/container-manager.js';
+import { branchManager } from '../../../core/branch-manager.js';
+import { initRepo as gitInitRepo, findRepoRoot, } from '../../../core/git-branch-sync.js';
 import { getMissingDependencies } from '../../../core/dependency-manager.js';
 import { platformService } from '../../../core/platform-service.js';
 import { portManager } from '../../../core/port-manager.js';
@@ -1000,6 +1002,26 @@ export async function showContainerSubmenu(containerName, showMainMenu) {
     actionChoices.push(canClone
         ? { name: `${chalk.cyan('◇')} Clone container`, value: 'clone' }
         : disabledItem('◇', 'Clone container'));
+    // Branch container - copy-on-write fork. Available even while running: a
+    // running source is briefly stopped, snapshotted, and restarted automatically.
+    actionChoices.push({
+        name: `${chalk.cyan('⎇')} Branch container`,
+        value: 'branch',
+    });
+    // Reset to parent - only for containers that are themselves branches
+    if (config.branchParent) {
+        actionChoices.push({
+            name: `${chalk.yellow('↺')} Reset branch to "${config.branchParent}"`,
+            value: 'reset_branch',
+        });
+    }
+    // Git branching - wire this container to the current git repo (server engines)
+    if (!isFileBasedDB && !config.remote) {
+        actionChoices.push({
+            name: `${chalk.magenta('⎇')} Set up git branching here`,
+            value: 'git_branch_init',
+        });
+    }
     // Detach - only for file-based DBs (unregisters without deleting file)
     if (isFileBasedDB) {
         actionChoices.push({
@@ -1084,6 +1106,15 @@ export async function showContainerSubmenu(containerName, showMainMenu) {
         case 'clone':
             await handleCloneFromSubmenu(containerName, showMainMenu);
             return;
+        case 'branch':
+            await handleBranchFromSubmenu(containerName, showMainMenu);
+            return;
+        case 'reset_branch':
+            await handleResetBranchFromSubmenu(containerName, showMainMenu);
+            return;
+        case 'git_branch_init':
+            await handleGitBranchInit(containerName, showMainMenu);
+            return;
         case 'copy':
             await handleCopyConnectionString(containerName, activeDatabase);
             await showContainerSubmenu(containerName, showMainMenu);
@@ -1847,6 +1878,111 @@ async function handleCloneFromSubmenu(sourceName, showMainMenu) {
         await pressEnterToContinue();
     }
 }
+async function handleBranchFromSubmenu(sourceName, showMainMenu) {
+    const sourceConfig = await containerManager.getConfig(sourceName);
+    if (!sourceConfig) {
+        console.log(uiError(`Container "${sourceName}" not found`));
+        return;
+    }
+    const { branchName } = await escapeablePrompt([
+        {
+            type: 'input',
+            name: 'branchName',
+            message: 'Name for the new branch:',
+            default: `${sourceName}-branch`,
+            validate: (input) => {
+                if (!input)
+                    return 'Name is required';
+                if (!/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(input)) {
+                    return 'Name must start with a letter and contain only letters, numbers, hyphens, and underscores';
+                }
+                return true;
+            },
+        },
+    ]);
+    if (await containerManager.exists(branchName, { engine: sourceConfig.engine })) {
+        console.log(uiError(`Container "${branchName}" already exists`));
+        await pressEnterToContinue();
+        return;
+    }
+    const spinner = createSpinner(`Branching ${sourceName} → ${branchName}...`);
+    spinner.start();
+    try {
+        const result = await branchManager.createBranch({
+            source: sourceName,
+            name: branchName,
+        });
+        const methodNote = result.method === 'reflink' ? ' (copy-on-write)' : '';
+        spinner.succeed(`Created branch "${branchName}" from "${sourceName}"${methodNote}`);
+        if (result.warning)
+            console.log(uiWarning(result.warning));
+        console.log();
+        console.log(connectionBox(branchName, result.connectionString, result.config.port));
+        await showContainerSubmenu(branchName, showMainMenu);
+    }
+    catch (error) {
+        spinner.fail(`Failed to branch "${sourceName}"`);
+        console.log(uiError(error.message));
+        await pressEnterToContinue();
+    }
+}
+async function handleResetBranchFromSubmenu(branchName, showMainMenu) {
+    const config = await containerManager.getConfig(branchName);
+    if (!config) {
+        console.log(uiError(`Container "${branchName}" not found`));
+        return;
+    }
+    if (!config.branchParent) {
+        console.log(uiError(`"${branchName}" is not a branch`));
+        await pressEnterToContinue();
+        return;
+    }
+    const confirmed = await promptConfirm(`Reset "${branchName}" to match "${config.branchParent}"? This discards all changes in the branch.`, false);
+    if (!confirmed) {
+        console.log(uiWarning('Cancelled'));
+        await showContainerSubmenu(branchName, showMainMenu);
+        return;
+    }
+    const spinner = createSpinner(`Resetting ${branchName}...`);
+    spinner.start();
+    try {
+        const result = await branchManager.resetBranch(branchName);
+        spinner.succeed(`Reset "${branchName}" to "${config.branchParent}"`);
+        if (result.warning)
+            console.log(uiWarning(result.warning));
+        await showContainerSubmenu(branchName, showMainMenu);
+    }
+    catch (error) {
+        spinner.fail(`Failed to reset "${branchName}"`);
+        console.log(uiError(error.message));
+        await pressEnterToContinue();
+    }
+}
+async function handleGitBranchInit(containerName, showMainMenu) {
+    const repoRoot = await findRepoRoot();
+    if (!repoRoot) {
+        console.log(uiWarning('Not a git repository. Launch spindb from your project directory to set up git branching.'));
+        await pressEnterToContinue();
+        await showContainerSubmenu(containerName, showMainMenu);
+        return;
+    }
+    const spinner = createSpinner('Setting up git branching...');
+    spinner.start();
+    try {
+        const { config } = await gitInitRepo({ baseContainer: containerName });
+        spinner.succeed(`Git branching enabled (stable port ${config.stablePort})`);
+        console.log(chalk.gray('  Switch git branches and the matching database follows automatically.'));
+        console.log(chalk.gray('  Your DATABASE_URL never changes (port stays ') +
+            chalk.green(String(config.stablePort)) +
+            chalk.gray(').'));
+    }
+    catch (error) {
+        spinner.fail('Failed to set up git branching');
+        console.log(uiError(error.message));
+    }
+    await pressEnterToContinue();
+    await showContainerSubmenu(containerName, showMainMenu);
+}
 async function handleDetachContainer(containerName, showMainMenu) {
     const config = await containerManager.getConfig(containerName);
     if (!config) {
@@ -1898,6 +2034,25 @@ async function handleDelete(containerName) {
         console.log(uiWarning(isRemote ? 'Unlink cancelled' : 'Deletion cancelled'));
         return;
     }
+    // Branch-aware: deleting a container that has child branches would orphan
+    // them. Offer to cascade (matching `spindb branch delete --cascade`).
+    if (!isRemote) {
+        const children = await branchManager.childrenOf(containerName);
+        if (children.length > 0) {
+            const cascade = await promptConfirm(`"${containerName}" has ${children.length} child branch(es): ${children.join(', ')}. Delete them too?`, false);
+            if (!cascade) {
+                console.log(uiWarning('Deletion cancelled — delete or reset the child branches first.'));
+                return;
+            }
+            const cascadeSpinner = createSpinner(`Deleting ${containerName} and its branches...`);
+            cascadeSpinner.start();
+            const result = await branchManager.deleteBranch(containerName, {
+                cascade: true,
+            });
+            cascadeSpinner.succeed(`Deleted ${result.deleted.length} container(s)`);
+            return;
+        }
+    }
     // Remote containers: skip process checks
     if (!isRemote) {
         const running = await processManager.isRunning(containerName, {