wind-agent-cli 1.37.2

package/dist-server/server/modules/worktrees/services/worktree-merge.service.js

@@ -0,0 +1,118 @@
+import { AppError } from '../../../shared/utils.js';
+import { countChangedFiles, findWorktreeEntryByPath, listWorktreePorcelainEntries, } from '../../../modules/worktrees/services/worktree-git.service.js';
+/** Reads the paths currently in conflict inside the main worktree (best effort). */
+async function readConflictedFiles(repositoryRoot, runGit) {
+    try {
+        const { stdout } = await runGit(['diff', '--name-only', '--diff-filter=U'], repositoryRoot);
+        return stdout.split('\n').filter((line) => line.trim().length > 0);
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Merges a worktree's branch back into the base branch (the branch checked out
+ * in the main worktree). Runs entirely inside the main worktree, so the user's
+ * current worktree never changes underneath them.
+ *
+ * Both worktrees must be clean: the source so no work is silently left behind,
+ * the target so a conflict can be rolled back without touching user changes.
+ * On conflict the merge is fully aborted and the conflicting paths are
+ * reported back to the client.
+ */
+export async function mergeWorktree(input, dependencies) {
+    const { removeWorktree, runGit } = dependencies;
+    const entries = await listWorktreePorcelainEntries(input.projectPath, runGit);
+    const entry = findWorktreeEntryByPath(entries, input.worktreePath);
+    const repositoryRoot = entries[0].path;
+    const targetBranch = entries[0].branch;
+    if (entry.path === repositoryRoot) {
+        throw new AppError('The main worktree cannot be merged into itself', {
+            code: 'WORKTREE_MERGE_MAIN',
+            statusCode: 400,
+        });
+    }
+    if (!entry.branch) {
+        throw new AppError('Worktree is on a detached HEAD — check out a branch first', {
+            code: 'WORKTREE_DETACHED_HEAD',
+            statusCode: 400,
+        });
+    }
+    if (!targetBranch) {
+        throw new AppError('The main worktree is on a detached HEAD — cannot determine merge target', {
+            code: 'WORKTREE_TARGET_DETACHED',
+            statusCode: 400,
+        });
+    }
+    const sourceChangedCount = await countChangedFiles(entry.path, runGit);
+    if (sourceChangedCount > 0) {
+        throw new AppError(`Worktree has ${sourceChangedCount} uncommitted change${sourceChangedCount === 1 ? '' : 's'} — commit or discard them first`, { code: 'WORKTREE_SOURCE_DIRTY', statusCode: 409 });
+    }
+    const targetChangedCount = await countChangedFiles(repositoryRoot, runGit);
+    if (targetChangedCount > 0) {
+        throw new AppError(`The base worktree (${targetBranch}) has uncommitted changes — commit or stash them first`, { code: 'WORKTREE_TARGET_DIRTY', statusCode: 409 });
+    }
+    const squash = Boolean(input.squash);
+    const message = input.message?.trim() ||
+        (squash ? `Squash merge branch '${entry.branch}'` : `Merge branch '${entry.branch}'`);
+    try {
+        if (squash) {
+            await runGit(['merge', '--squash', entry.branch], repositoryRoot);
+            await runGit(['commit', '-m', message], repositoryRoot);
+        }
+        else {
+            await runGit(['merge', '--no-ff', entry.branch, '-m', message], repositoryRoot);
+        }
+    }
+    catch (error) {
+        const conflictedFiles = await readConflictedFiles(repositoryRoot, runGit);
+        // Roll the main worktree back to its pre-merge state. `--merge` also
+        // clears a half-applied squash since the target was verified clean above.
+        try {
+            await runGit(['reset', '--merge'], repositoryRoot);
+        }
+        catch (rollbackError) {
+            throw new AppError(`Merge of '${entry.branch}' into '${targetBranch}' failed and could not be rolled back`, {
+                code: 'WORKTREE_MERGE_ROLLBACK_FAILED',
+                statusCode: 500,
+                details: {
+                    mergeError: error instanceof Error ? error.message : String(error),
+                    rollbackError: rollbackError instanceof AppError
+                        ? rollbackError.details ?? rollbackError.message
+                        : rollbackError instanceof Error ? rollbackError.message : String(rollbackError),
+                },
+            });
+        }
+        if (conflictedFiles.length > 0) {
+            throw new AppError(`Merge of '${entry.branch}' into '${targetBranch}' has conflicts — the merge was aborted`, {
+                code: 'WORKTREE_MERGE_CONFLICT',
+                statusCode: 409,
+                details: conflictedFiles,
+            });
+        }
+        throw error;
+    }
+    let removedWorktree = null;
+    let cleanupError = null;
+    if (input.removeAfterMerge) {
+        try {
+            removedWorktree = await removeWorktree({
+                projectPath: repositoryRoot,
+                worktreePath: entry.path,
+                force: false,
+                deleteBranch: true,
+            });
+        }
+        catch (error) {
+            cleanupError = error instanceof Error ? error.message : String(error);
+        }
+    }
+    return {
+        mergedBranch: entry.branch,
+        targetBranch,
+        squash,
+        removedWorktree,
+        cleanupError,
+    };
+}
+//# sourceMappingURL=worktree-merge.service.js.map

package/dist-server/server/modules/worktrees/services/worktree-merge.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-merge.service.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/services/worktree-merge.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/worktrees/services/worktree-open.service.js

@@ -0,0 +1,58 @@
+import path from 'node:path';
+import { AppError, normalizeProjectPath } from '../../../shared/utils.js';
+import { findWorktreeEntryByPath, listWorktreePorcelainEntries, } from '../../../modules/worktrees/services/worktree-git.service.js';
+function mapRowToProjectView(row) {
+    return {
+        projectId: row.project_id,
+        path: row.project_path,
+        fullPath: row.project_path,
+        displayName: row.custom_project_name || path.basename(row.project_path),
+        isStarred: Boolean(row.isStarred),
+        sessions: [],
+        sessionMeta: { hasMore: false, total: 0 },
+    };
+}
+/**
+ * Ensures a CloudCLI project exists (and is active) for a worktree directory
+ * and returns it, so the caller can switch the UI into that worktree.
+ *
+ * The path is only accepted when it is a registered worktree of the repository
+ * that contains `projectPath` — this endpoint must never become a generic
+ * "create project anywhere" backdoor.
+ */
+export async function openWorktreeAsProject(input, dependencies) {
+    const { projects, runGit } = dependencies;
+    const entries = await listWorktreePorcelainEntries(input.projectPath, runGit);
+    const entry = findWorktreeEntryByPath(entries, input.worktreePath);
+    const normalizedWorktreePath = normalizeProjectPath(entry.path);
+    const repoName = path.basename(entries[0].path);
+    // "repo · branch" keeps worktree projects visually grouped next to their
+    // parent repository in the sidebar.
+    const displayName = entry.branch ? `${repoName} · ${entry.branch}` : repoName;
+    const existingRow = projects.getProjectByPath(normalizedWorktreePath);
+    if (existingRow) {
+        if (existingRow.isArchived) {
+            await projects.restoreProject(existingRow.project_id);
+        }
+        const refreshedRow = projects.getProjectByPath(normalizedWorktreePath) ?? existingRow;
+        return mapRowToProjectView(refreshedRow);
+    }
+    const created = await projects.createProject({
+        projectPath: normalizedWorktreePath,
+        customName: displayName,
+    });
+    // `createProject` intentionally keeps reactivated archived rows archived;
+    // an opened worktree must be active so it shows up in the sidebar.
+    if (created.outcome === 'reactivated_archived') {
+        await projects.restoreProject(created.project.projectId);
+    }
+    const row = projects.getProjectByPath(normalizedWorktreePath);
+    if (!row) {
+        throw new AppError('Failed to resolve project for worktree', {
+            code: 'WORKTREE_PROJECT_RESOLVE_FAILED',
+            statusCode: 500,
+        });
+    }
+    return mapRowToProjectView(row);
+}
+//# sourceMappingURL=worktree-open.service.js.map

package/dist-server/server/modules/worktrees/services/worktree-open.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-open.service.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/services/worktree-open.service.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAS7B,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACL,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,sDAAsD,CAAC;AAE9D,SAAS,mBAAmB,CAAC,GAAyB;IACpD,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,IAAI,EAAE,GAAG,CAAC,YAAY;QACtB,QAAQ,EAAE,GAAG,CAAC,YAAY;QAC1B,WAAW,EAAE,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC;QACvE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QACjC,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;KAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAwB,EACxB,YAMC;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,4BAA4B,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnE,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChD,yEAAyE;IACzE,oCAAoC;IACpC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE9E,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IACtE,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;YAC3B,MAAM,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,IAAI,WAAW,CAAC;QACtF,OAAO,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC;QAC3C,WAAW,EAAE,sBAAsB;QACnC,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,0EAA0E;IAC1E,mEAAmE;IACnE,IAAI,OAAO,CAAC,OAAO,KAAK,sBAAsB,EAAE,CAAC;QAC/C,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,GAAG,GAAG,QAAQ,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,QAAQ,CAAC,wCAAwC,EAAE;YAC3D,IAAI,EAAE,iCAAiC;YACvC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC"}

package/dist-server/server/modules/worktrees/services/worktree-remove.service.js

@@ -0,0 +1,65 @@
+import { AppError } from '../../../shared/utils.js';
+import { countChangedFiles, findWorktreeEntryByPath, listWorktreePorcelainEntries, } from '../../../modules/worktrees/services/worktree-git.service.js';
+/**
+ * Removes a linked worktree (never the main one), optionally deletes its
+ * branch, and archives the CloudCLI project registered for the directory so it
+ * disappears from the sidebar while its chat history stays recoverable.
+ */
+export async function removeWorktree(input, dependencies) {
+    const { projects, runGit } = dependencies;
+    const entries = await listWorktreePorcelainEntries(input.projectPath, runGit);
+    const entry = findWorktreeEntryByPath(entries, input.worktreePath);
+    const repositoryRoot = entries[0].path;
+    if (entry.path === repositoryRoot) {
+        throw new AppError('The main worktree cannot be removed', {
+            code: 'WORKTREE_MAIN_NOT_REMOVABLE',
+            statusCode: 400,
+        });
+    }
+    if (!input.force) {
+        const changedFileCount = await countChangedFiles(entry.path, runGit);
+        if (changedFileCount > 0) {
+            throw new AppError(`Worktree has ${changedFileCount} uncommitted change${changedFileCount === 1 ? '' : 's'}`, {
+                code: 'WORKTREE_DIRTY',
+                statusCode: 409,
+            });
+        }
+    }
+    const removeArgs = ['worktree', 'remove'];
+    if (input.force) {
+        removeArgs.push('--force');
+    }
+    removeArgs.push(entry.path);
+    await runGit(removeArgs, repositoryRoot);
+    let branchDeleted = false;
+    if (input.deleteBranch && entry.branch) {
+        try {
+            await runGit(['branch', '-D', entry.branch], repositoryRoot);
+            branchDeleted = true;
+        }
+        catch {
+            // Branch deletion is best-effort cleanup — the worktree itself is gone,
+            // which is the operation the user asked for.
+        }
+    }
+    let archivedProjectId = null;
+    let archivalError = null;
+    try {
+        const linkedProject = projects.getProjectByPath(entry.path);
+        if (linkedProject && !linkedProject.isArchived) {
+            await projects.archiveProject(linkedProject.project_id);
+            archivedProjectId = linkedProject.project_id;
+        }
+    }
+    catch (error) {
+        archivalError = error instanceof Error ? error.message : String(error);
+    }
+    return {
+        removedPath: entry.path,
+        branch: entry.branch,
+        branchDeleted,
+        archivedProjectId,
+        archivalError,
+    };
+}
+//# sourceMappingURL=worktree-remove.service.js.map

package/dist-server/server/modules/worktrees/services/worktree-remove.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-remove.service.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/services/worktree-remove.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/worktrees/tests/worktree-create-and-open.service.test.js

@@ -0,0 +1,58 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { createAndOpenWorktree } from '../../../modules/worktrees/services/worktree-create-and-open.service.js';
+const input = {
+    projectPath: '/workspace/repo',
+    branch: 'feature/login',
+};
+test('createAndOpenWorktree returns the registered project', async () => {
+    const result = await createAndOpenWorktree(input, {
+        createWorktree: async () => ({
+            worktreePath: '/workspace/repo-worktrees/feature-login',
+            branch: 'feature/login',
+            createdBranch: true,
+        }),
+        openWorktree: async ({ worktreePath }) => ({
+            projectId: 'project-2',
+            path: worktreePath,
+            fullPath: worktreePath,
+            displayName: 'feature/login',
+            isStarred: false,
+            sessions: [],
+            sessionMeta: { hasMore: false, total: 0 },
+        }),
+        removeWorktree: async () => {
+            throw new Error('unexpected cleanup');
+        },
+    });
+    assert.equal(result.project.projectId, 'project-2');
+});
+test('createAndOpenWorktree compensates registration failure without deleting an existing branch', async () => {
+    const removals = [];
+    const registrationError = new Error('registration failed');
+    await assert.rejects(createAndOpenWorktree(input, {
+        createWorktree: async () => ({
+            worktreePath: '/workspace/repo-worktrees/feature-login',
+            branch: 'feature/login',
+            createdBranch: false,
+        }),
+        openWorktree: async () => { throw registrationError; },
+        removeWorktree: async (removeInput) => {
+            removals.push(removeInput);
+            return {
+                removedPath: removeInput.worktreePath,
+                branch: 'feature/login',
+                branchDeleted: false,
+                archivedProjectId: null,
+                archivalError: null,
+            };
+        },
+    }), registrationError);
+    assert.deepEqual(removals, [{
+            projectPath: input.projectPath,
+            worktreePath: '/workspace/repo-worktrees/feature-login',
+            force: true,
+            deleteBranch: false,
+        }]);
+});
+//# sourceMappingURL=worktree-create-and-open.service.test.js.map

package/dist-server/server/modules/worktrees/tests/worktree-create-and-open.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-create-and-open.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/tests/worktree-create-and-open.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,kEAAkE,CAAC;AAGzG,MAAM,KAAK,GAAG;IACZ,WAAW,EAAE,iBAAiB;IAC9B,MAAM,EAAE,eAAe;CACxB,CAAC;AAEF,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;IACtE,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,KAAK,EAAE;QAChD,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YAC3B,YAAY,EAAE,yCAAyC;YACvD,MAAM,EAAE,eAAe;YACvB,aAAa,EAAE,IAAI;SACpB,CAAC;QACF,YAAY,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;YACzC,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,eAAe;YAC5B,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE;SAC1C,CAAC;QACF,cAAc,EAAE,KAAK,IAAI,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxC,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;IAC5G,MAAM,QAAQ,GAA0B,EAAE,CAAC;IAC3C,MAAM,iBAAiB,GAAG,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAE3D,MAAM,MAAM,CAAC,OAAO,CAClB,qBAAqB,CAAC,KAAK,EAAE;QAC3B,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YAC3B,YAAY,EAAE,yCAAyC;YACvD,MAAM,EAAE,eAAe;YACvB,aAAa,EAAE,KAAK;SACrB,CAAC;QACF,YAAY,EAAE,KAAK,IAAI,EAAE,GAAG,MAAM,iBAAiB,CAAC,CAAC,CAAC;QACtD,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YACpC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3B,OAAO;gBACL,WAAW,EAAE,WAAW,CAAC,YAAY;gBACrC,MAAM,EAAE,eAAe;gBACvB,aAAa,EAAE,KAAK;gBACpB,iBAAiB,EAAE,IAAI;gBACvB,aAAa,EAAE,IAAI;aACpB,CAAC;QACJ,CAAC;KACF,CAAC,EACF,iBAAiB,CAClB,CAAC;IAEF,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC1B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,YAAY,EAAE,yCAAyC;YACvD,KAAK,EAAE,IAAI;YACX,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC,CAAC;AACN,CAAC,CAAC,CAAC"}

package/dist-server/server/modules/worktrees/tests/worktree-create.service.test.js

@@ -0,0 +1,85 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { createWorktree } from '../../../modules/worktrees/services/worktree-create.service.js';
+import { AppError } from '../../../shared/utils.js';
+const PORCELAIN = [
+    'worktree /home/user/repo',
+    'HEAD 1111111111111111111111111111111111111111',
+    'branch refs/heads/main',
+    '',
+    'worktree /home/user/repo-worktrees/existing',
+    'HEAD 2222222222222222222222222222222222222222',
+    'branch refs/heads/existing-branch',
+    '',
+].join('\n');
+/**
+ * Fake GitCommandRunner: records every call and answers `worktree list` /
+ * `branch --list` from canned data; everything else succeeds with no output.
+ */
+function createFakeRunner(existingBranches) {
+    const calls = [];
+    const runner = async (args, cwd) => {
+        calls.push({ args, cwd });
+        if (args[0] === 'worktree' && args[1] === 'list') {
+            return { stdout: PORCELAIN, stderr: '' };
+        }
+        if (args[0] === 'branch' && args[1] === '--list') {
+            const requested = args[2];
+            const matches = existingBranches.filter((branch) => branch === requested);
+            return { stdout: matches.join('\n'), stderr: '' };
+        }
+        return { stdout: '', stderr: '' };
+    };
+    return { calls, runner };
+}
+function createDependencies(runner, pathExists = false) {
+    return {
+        runGit: runner,
+        fileSystem: {
+            pathExists: async () => pathExists,
+        },
+    };
+}
+test('createWorktree creates a new branch from the main branch by default', async () => {
+    const { calls, runner } = createFakeRunner([]);
+    const result = await createWorktree({ projectPath: '/home/user/repo', branch: 'feature/login' }, createDependencies(runner));
+    assert.equal(result.branch, 'feature/login');
+    assert.equal(result.createdBranch, true);
+    // Slashes in the branch become dashes in the folder name.
+    assert.ok(result.worktreePath.endsWith('feature-login'));
+    assert.ok(result.worktreePath.includes('repo-worktrees'));
+    const addCall = calls.find((call) => call.args[0] === 'worktree' && call.args[1] === 'add');
+    assert.ok(addCall, 'expected a worktree add call');
+    assert.deepEqual(addCall.args.slice(3), ['-b', 'feature/login', 'main']);
+});
+test('createWorktree checks out an existing branch without -b', async () => {
+    const { calls, runner } = createFakeRunner(['bugfix']);
+    const result = await createWorktree({ projectPath: '/home/user/repo', branch: 'bugfix' }, createDependencies(runner));
+    assert.equal(result.createdBranch, false);
+    const addCall = calls.find((call) => call.args[0] === 'worktree' && call.args[1] === 'add');
+    assert.ok(addCall, 'expected a worktree add call');
+    assert.ok(!addCall.args.includes('-b'));
+    assert.equal(addCall.args.at(-1), 'bugfix');
+});
+test('createWorktree honors an explicit base branch', async () => {
+    const { calls, runner } = createFakeRunner([]);
+    await createWorktree({ projectPath: '/home/user/repo', branch: 'hotfix', baseBranch: 'release/1.0' }, createDependencies(runner));
+    const addCall = calls.find((call) => call.args[0] === 'worktree' && call.args[1] === 'add');
+    assert.ok(addCall);
+    assert.equal(addCall.args.at(-1), 'release/1.0');
+});
+test('createWorktree rejects a branch already checked out in another worktree', async () => {
+    const { runner } = createFakeRunner(['existing-branch']);
+    await assert.rejects(createWorktree({ projectPath: '/home/user/repo', branch: 'existing-branch' }, createDependencies(runner)), (error) => error instanceof AppError && error.code === 'BRANCH_ALREADY_CHECKED_OUT' && error.statusCode === 409);
+});
+test('createWorktree rejects invalid branch names before touching git state', async () => {
+    const { calls, runner } = createFakeRunner([]);
+    await assert.rejects(createWorktree({ projectPath: '/home/user/repo', branch: '-rf' }, createDependencies(runner)), (error) => error instanceof AppError && error.code === 'INVALID_BRANCH_NAME');
+    assert.equal(calls.length, 0);
+});
+test('createWorktree rejects an occupied destination without running a mutating git command', async () => {
+    const { calls, runner } = createFakeRunner([]);
+    await assert.rejects(createWorktree({ projectPath: '/home/user/repo', branch: 'feature/login' }, createDependencies(runner, true)), (error) => error instanceof AppError && error.code === 'WORKTREE_FOLDER_EXISTS');
+    assert.equal(calls.some((call) => call.args[0] === 'worktree' && call.args[1] === 'add'), false);
+});
+//# sourceMappingURL=worktree-create.service.test.js.map

package/dist-server/server/modules/worktrees/tests/worktree-create.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-create.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/tests/worktree-create.service.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/worktrees/tests/worktree-git.service.test.js

@@ -0,0 +1,58 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { findWorktreeEntryByPath, parseWorktreeListPorcelain, validateWorktreeBranchName, } from '../../../modules/worktrees/services/worktree-git.service.js';
+import { AppError } from '../../../shared/utils.js';
+const SAMPLE_PORCELAIN = [
+    'worktree /home/user/repo',
+    'HEAD 1111111111111111111111111111111111111111',
+    'branch refs/heads/main',
+    '',
+    'worktree /home/user/repo-worktrees/feature-login',
+    'HEAD 2222222222222222222222222222222222222222',
+    'branch refs/heads/feature/login',
+    '',
+    'worktree /home/user/repo-worktrees/spike',
+    'HEAD 3333333333333333333333333333333333333333',
+    'detached',
+    'locked reason text',
+    '',
+].join('\n');
+test('parseWorktreeListPorcelain parses main, branch, detached and locked entries', () => {
+    const entries = parseWorktreeListPorcelain(SAMPLE_PORCELAIN);
+    assert.equal(entries.length, 3);
+    assert.equal(entries[0].branch, 'main');
+    assert.equal(entries[0].headSha, '1111111111111111111111111111111111111111');
+    assert.equal(entries[0].isDetached, false);
+    assert.equal(entries[1].branch, 'feature/login');
+    assert.ok(entries[1].path.endsWith('feature-login'));
+    assert.equal(entries[2].branch, null);
+    assert.equal(entries[2].isDetached, true);
+    assert.equal(entries[2].isLocked, true);
+});
+test('parseWorktreeListPorcelain handles output without a trailing blank line', () => {
+    const entries = parseWorktreeListPorcelain('worktree /home/user/repo\nHEAD 1111111111111111111111111111111111111111\nbranch refs/heads/main');
+    assert.equal(entries.length, 1);
+    assert.equal(entries[0].branch, 'main');
+});
+test('findWorktreeEntryByPath matches normalized paths', () => {
+    const entries = parseWorktreeListPorcelain(SAMPLE_PORCELAIN);
+    const found = findWorktreeEntryByPath(entries, '/home/user/repo-worktrees/feature-login/');
+    assert.equal(found.branch, 'feature/login');
+});
+test('findWorktreeEntryByPath throws a 404 AppError for unknown paths', () => {
+    const entries = parseWorktreeListPorcelain(SAMPLE_PORCELAIN);
+    assert.throws(() => findWorktreeEntryByPath(entries, '/home/user/elsewhere'), (error) => error instanceof AppError && error.code === 'WORKTREE_NOT_FOUND' && error.statusCode === 404);
+});
+test('validateWorktreeBranchName accepts slash-separated branch names', () => {
+    assert.equal(validateWorktreeBranchName(' feature/login-form '), 'feature/login-form');
+});
+test('validateWorktreeBranchName rejects unsafe names', () => {
+    for (const invalidName of [
+        '', '   ', '-oops', '.', '..', 'bad name', 'bad;name', 'bad$(name)',
+        'foo..bar', 'foo.', 'foo//bar', 'foo.lock', 'feature/foo.LOCK', '/feature', 'feature/',
+        '.hidden', 'feature/.hidden', 'feature/./name',
+    ]) {
+        assert.throws(() => validateWorktreeBranchName(invalidName), (error) => error instanceof AppError && error.code === 'INVALID_BRANCH_NAME', `expected "${invalidName}" to be rejected`);
+    }
+});
+//# sourceMappingURL=worktree-git.service.test.js.map

package/dist-server/server/modules/worktrees/tests/worktree-git.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-git.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/tests/worktree-git.service.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/worktrees/tests/worktree-list.service.test.js

@@ -0,0 +1,34 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { listWorktrees } from '../../../modules/worktrees/services/worktree-list.service.js';
+test('listWorktrees bounds concurrent per-worktree Git inspection and preserves ordering', async () => {
+    const entryCount = 10;
+    const porcelain = Array.from({ length: entryCount }, (_, index) => [
+        `worktree /workspace/repo-${index}`,
+        `HEAD ${String(index).padStart(40, '0')}`,
+        `branch refs/heads/${index === 0 ? 'main' : `feature/${index}`}`,
+        '',
+    ].join('\n')).join('\n');
+    let activeCommands = 0;
+    let maximumActiveCommands = 0;
+    const runGit = async (args) => {
+        if (args[0] === 'worktree') {
+            return { stdout: porcelain, stderr: '' };
+        }
+        activeCommands += 1;
+        maximumActiveCommands = Math.max(maximumActiveCommands, activeCommands);
+        await new Promise((resolve) => setTimeout(resolve, 5));
+        activeCommands -= 1;
+        if (args[0] === 'log') {
+            return { stdout: 'subject\0' + '2026-01-01T00:00:00Z', stderr: '' };
+        }
+        if (args[0] === 'rev-list') {
+            return { stdout: '0 1', stderr: '' };
+        }
+        return { stdout: '', stderr: '' };
+    };
+    const result = await listWorktrees({ projectPath: '/workspace/repo-0' }, { runGit, getProjectByPath: () => null });
+    assert.equal(maximumActiveCommands <= 12, true);
+    assert.deepEqual(result.worktrees.map((worktree) => worktree.path.replace(/\\/g, '/')), Array.from({ length: entryCount }, (_, index) => `/workspace/repo-${index}`));
+});
+//# sourceMappingURL=worktree-list.service.test.js.map

package/dist-server/server/modules/worktrees/tests/worktree-list.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-list.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/tests/worktree-list.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,uDAAuD,CAAC;AAGtF,IAAI,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;IACpG,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACjE,4BAA4B,KAAK,EAAE;QACnC,QAAQ,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE;QACzC,qBAAqB,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,KAAK,EAAE,EAAE;QAChE,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAE9B,MAAM,MAAM,GAAG,KAAK,EAAE,IAAc,EAA6B,EAAE;QACjE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAC3C,CAAC;QAED,cAAc,IAAI,CAAC,CAAC;QACpB,qBAAqB,GAAG,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;QACxE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,cAAc,IAAI,CAAC,CAAC;QAEpB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;YACtB,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,sBAAsB,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACtE,CAAC;QACD,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,EAAE,WAAW,EAAE,mBAAmB,EAAE,EACpC,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CACzC,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,qBAAqB,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;IAChD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,EACpF,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC"}