wind-agent-cli 1.37.2

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

@@ -0,0 +1,137 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { mergeWorktree } from '../../../modules/worktrees/services/worktree-merge.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/feature-login',
+    'HEAD 2222222222222222222222222222222222222222',
+    'branch refs/heads/feature/login',
+    '',
+].join('\n');
+function createFakeRunner(options = {}) {
+    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] === 'status') {
+            const isDirty = (options.dirtyPaths ?? []).some((dirtyPath) => cwd.includes(dirtyPath));
+            return { stdout: isDirty ? ' M file.txt\n' : '', stderr: '' };
+        }
+        if (args[0] === 'merge' && options.mergeConflicts) {
+            throw new AppError('git merge failed', {
+                code: 'GIT_COMMAND_FAILED',
+                details: 'CONFLICT (content): Merge conflict in file.txt',
+            });
+        }
+        if (args[0] === 'diff' && args.includes('--diff-filter=U')) {
+            return { stdout: options.mergeConflicts ? 'file.txt\n' : '', stderr: '' };
+        }
+        if (args[0] === 'reset' && options.rollbackFails) {
+            throw new AppError('git reset failed', {
+                code: 'GIT_COMMAND_FAILED',
+                details: 'index.lock permission denied',
+            });
+        }
+        return { stdout: '', stderr: '' };
+    };
+    return { calls, runner };
+}
+function createDependencies(runner) {
+    return {
+        runGit: runner,
+        removeWorktree: async () => {
+            throw new Error('removeWorktree should not be called by this test');
+        },
+    };
+}
+test('mergeWorktree squash-merges into the main worktree branch', async () => {
+    const { calls, runner } = createFakeRunner();
+    const result = await mergeWorktree({
+        projectPath: '/home/user/repo-worktrees/feature-login',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+        squash: true,
+    }, createDependencies(runner));
+    assert.equal(result.mergedBranch, 'feature/login');
+    assert.equal(result.targetBranch, 'main');
+    assert.equal(result.squash, true);
+    assert.equal(result.removedWorktree, null);
+    assert.equal(result.cleanupError, null);
+    const mergeCall = calls.find((call) => call.args[0] === 'merge');
+    assert.ok(mergeCall, 'expected a merge call');
+    assert.deepEqual(mergeCall.args, ['merge', '--squash', 'feature/login']);
+    // Squash merges run in the main worktree, never in the source worktree.
+    assert.ok(mergeCall.cwd.endsWith('repo'));
+    const commitCall = calls.find((call) => call.args[0] === 'commit');
+    assert.ok(commitCall, 'expected a commit call after squash');
+    assert.equal(commitCall.args[2], "Squash merge branch 'feature/login'");
+});
+test('mergeWorktree performs a regular --no-ff merge with a custom message', async () => {
+    const { calls, runner } = createFakeRunner();
+    await mergeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+        squash: false,
+        message: 'Land the login feature',
+    }, createDependencies(runner));
+    const mergeCall = calls.find((call) => call.args[0] === 'merge');
+    assert.ok(mergeCall);
+    assert.deepEqual(mergeCall.args, ['merge', '--no-ff', 'feature/login', '-m', 'Land the login feature']);
+});
+test('mergeWorktree rejects when the source worktree is dirty', async () => {
+    const { runner } = createFakeRunner({ dirtyPaths: ['feature-login'] });
+    await assert.rejects(mergeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+    }, createDependencies(runner)), (error) => error instanceof AppError && error.code === 'WORKTREE_SOURCE_DIRTY' && error.statusCode === 409);
+});
+test('mergeWorktree aborts and reports conflicted files on merge conflict', async () => {
+    const { calls, runner } = createFakeRunner({ mergeConflicts: true });
+    await assert.rejects(mergeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+    }, createDependencies(runner)), (error) => error instanceof AppError &&
+        error.code === 'WORKTREE_MERGE_CONFLICT' &&
+        error.statusCode === 409 &&
+        Array.isArray(error.details) &&
+        error.details.includes('file.txt'));
+    const resetCall = calls.find((call) => call.args[0] === 'reset');
+    assert.ok(resetCall, 'expected the merge to be rolled back');
+    assert.deepEqual(resetCall.args, ['reset', '--merge']);
+});
+test('mergeWorktree reports rollback failure instead of claiming a conflict was aborted', async () => {
+    const { runner } = createFakeRunner({ mergeConflicts: true, rollbackFails: true });
+    await assert.rejects(mergeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+    }, createDependencies(runner)), (error) => error instanceof AppError
+        && error.code === 'WORKTREE_MERGE_ROLLBACK_FAILED'
+        && typeof error.details === 'object');
+});
+test('mergeWorktree preserves merge success when optional worktree cleanup fails', async () => {
+    const { runner } = createFakeRunner();
+    const result = await mergeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+        removeAfterMerge: true,
+    }, {
+        runGit: runner,
+        removeWorktree: async () => { throw new Error('cleanup unavailable'); },
+    });
+    assert.equal(result.mergedBranch, 'feature/login');
+    assert.equal(result.removedWorktree, null);
+    assert.equal(result.cleanupError, 'cleanup unavailable');
+});
+test('mergeWorktree refuses to merge the main worktree into itself', async () => {
+    const { runner } = createFakeRunner();
+    await assert.rejects(mergeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo',
+    }, createDependencies(runner)), (error) => error instanceof AppError && error.code === 'WORKTREE_MERGE_MAIN');
+});
+//# sourceMappingURL=worktree-merge.service.test.js.map

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

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

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

@@ -0,0 +1,99 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { openWorktreeAsProject } from '../../../modules/worktrees/services/worktree-open.service.js';
+import { normalizeProjectPath } from '../../../shared/utils.js';
+const MAIN_PATH = normalizeProjectPath('/home/user/repo');
+const WORKTREE_PATH = normalizeProjectPath('/home/user/repo-worktrees/feature-login');
+const 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',
+    '',
+].join('\n');
+function createFakeRunner() {
+    return async (args) => {
+        if (args[0] === 'worktree' && args[1] === 'list') {
+            return { stdout: PORCELAIN, stderr: '' };
+        }
+        return { stdout: '', stderr: '' };
+    };
+}
+function createProjectRow(isArchived = false) {
+    return {
+        project_id: 'project-1',
+        project_path: WORKTREE_PATH,
+        custom_project_name: 'repo · feature/login',
+        isStarred: 0,
+        isArchived: isArchived ? 1 : 0,
+    };
+}
+test('openWorktreeAsProject returns an already-active linked project', async () => {
+    const projectRow = createProjectRow();
+    let createCalls = 0;
+    let restoreCalls = 0;
+    const result = await openWorktreeAsProject({ projectPath: MAIN_PATH, worktreePath: WORKTREE_PATH }, {
+        runGit: createFakeRunner(),
+        projects: {
+            getProjectByPath: () => projectRow,
+            createProject: async () => {
+                createCalls += 1;
+                return { outcome: 'created', project: { projectId: 'unexpected' } };
+            },
+            restoreProject: () => {
+                restoreCalls += 1;
+            },
+        },
+    });
+    assert.equal(result.projectId, 'project-1');
+    assert.equal(result.path, WORKTREE_PATH);
+    assert.equal(createCalls, 0);
+    assert.equal(restoreCalls, 0);
+});
+test('openWorktreeAsProject restores an archived linked project', async () => {
+    const projectRow = createProjectRow(true);
+    const restoredProjectIds = [];
+    const result = await openWorktreeAsProject({ projectPath: MAIN_PATH, worktreePath: WORKTREE_PATH }, {
+        runGit: createFakeRunner(),
+        projects: {
+            getProjectByPath: () => projectRow,
+            createProject: async () => ({
+                outcome: 'created',
+                project: { projectId: 'unexpected' },
+            }),
+            restoreProject: (projectId) => {
+                restoredProjectIds.push(projectId);
+                projectRow.isArchived = 0;
+            },
+        },
+    });
+    assert.equal(result.projectId, 'project-1');
+    assert.deepEqual(restoredProjectIds, ['project-1']);
+});
+test('openWorktreeAsProject registers a worktree that has no project record', async () => {
+    let projectRow = null;
+    const createInputs = [];
+    const result = await openWorktreeAsProject({ projectPath: MAIN_PATH, worktreePath: WORKTREE_PATH }, {
+        runGit: createFakeRunner(),
+        projects: {
+            getProjectByPath: () => projectRow,
+            createProject: async (input) => {
+                createInputs.push(input);
+                projectRow = createProjectRow();
+                return { outcome: 'created', project: { projectId: 'project-1' } };
+            },
+            restoreProject: () => {
+                throw new Error('restoreProject should not be called for a new project');
+            },
+        },
+    });
+    assert.equal(result.projectId, 'project-1');
+    assert.deepEqual(createInputs, [{
+            projectPath: WORKTREE_PATH,
+            customName: 'repo · feature/login',
+        }]);
+});
+//# sourceMappingURL=worktree-open.service.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-open.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/worktrees/tests/worktree-open.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAE9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,SAAS,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;AAC1D,MAAM,aAAa,GAAG,oBAAoB,CAAC,yCAAyC,CAAC,CAAC;AACtF,MAAM,SAAS,GAAG;IAChB,0BAA0B;IAC1B,+CAA+C;IAC/C,wBAAwB;IACxB,EAAE;IACF,kDAAkD;IAClD,+CAA+C;IAC/C,iCAAiC;IACjC,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,SAAS,gBAAgB;IACvB,OAAO,KAAK,EAAE,IAAc,EAA6B,EAAE;QACzD,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YACjD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAU,GAAG,KAAK;IAC1C,OAAO;QACL,UAAU,EAAE,WAAW;QACvB,YAAY,EAAE,aAAa;QAC3B,mBAAmB,EAAE,sBAAsB;QAC3C,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC/B,CAAC;AACJ,CAAC;AAED,IAAI,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,EACvD;QACE,MAAM,EAAE,gBAAgB,EAAE;QAC1B,QAAQ,EAAE;YACR,gBAAgB,EAAE,GAAG,EAAE,CAAC,UAAU;YAClC,aAAa,EAAE,KAAK,IAAI,EAAE;gBACxB,WAAW,IAAI,CAAC,CAAC;gBACjB,OAAO,EAAE,OAAO,EAAE,SAAkB,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,CAAC;YAC/E,CAAC;YACD,cAAc,EAAE,GAAG,EAAE;gBACnB,YAAY,IAAI,CAAC,CAAC;YACpB,CAAC;SACF;KACF,CACF,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACzC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,kBAAkB,GAAa,EAAE,CAAC;IAExC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,EACvD;QACE,MAAM,EAAE,gBAAgB,EAAE;QAC1B,QAAQ,EAAE;YACR,gBAAgB,EAAE,GAAG,EAAE,CAAC,UAAU;YAClC,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;gBAC1B,OAAO,EAAE,SAAkB;gBAC3B,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE;aACrC,CAAC;YACF,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE;gBAC5B,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACnC,UAAU,CAAC,UAAU,GAAG,CAAC,CAAC;YAC5B,CAAC;SACF;KACF,CACF,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,MAAM,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;IACvF,IAAI,UAAU,GAAgC,IAAI,CAAC;IACnD,MAAM,YAAY,GAAuD,EAAE,CAAC;IAE5E,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,EACvD;QACE,MAAM,EAAE,gBAAgB,EAAE;QAC1B,QAAQ,EAAE;YACR,gBAAgB,EAAE,GAAG,EAAE,CAAC,UAAU;YAClC,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC7B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzB,UAAU,GAAG,gBAAgB,EAAE,CAAC;gBAChC,OAAO,EAAE,OAAO,EAAE,SAAkB,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC;YAC9E,CAAC;YACD,cAAc,EAAE,GAAG,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAC3E,CAAC;SACF;KACF,CACF,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;YAC9B,WAAW,EAAE,aAAa;YAC1B,UAAU,EAAE,sBAAsB;SACnC,CAAC,CAAC,CAAC;AACN,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,157 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { removeWorktree } from '../../../modules/worktrees/services/worktree-remove.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/feature-login',
+    'HEAD 2222222222222222222222222222222222222222',
+    'branch refs/heads/feature/login',
+    '',
+].join('\n');
+function createFakeRunner(options = {}) {
+    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] === 'status') {
+            if (options.statusFails) {
+                throw new AppError('status failed', { code: 'GIT_COMMAND_FAILED' });
+            }
+            return { stdout: options.dirty ? '?? new-file.txt\n' : '', stderr: '' };
+        }
+        if (args[0] === 'branch' && args[1] === '-D' && options.branchDeleteFails) {
+            throw new AppError('branch delete failed', { code: 'GIT_COMMAND_FAILED' });
+        }
+        return { stdout: '', stderr: '' };
+    };
+    return { calls, runner };
+}
+function createDependencies(runner, linkedProject = null, archiveError = null) {
+    const archivedProjectIds = [];
+    return {
+        archivedProjectIds,
+        dependencies: {
+            runGit: runner,
+            projects: {
+                getProjectByPath: () => linkedProject,
+                archiveProject: async (projectId) => {
+                    if (archiveError) {
+                        throw archiveError;
+                    }
+                    archivedProjectIds.push(projectId);
+                },
+            },
+        },
+    };
+}
+test('removeWorktree removes a clean worktree and deletes its branch', async () => {
+    const { calls, runner } = createFakeRunner();
+    const { dependencies } = createDependencies(runner);
+    const result = await removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+        deleteBranch: true,
+    }, dependencies);
+    assert.equal(result.branch, 'feature/login');
+    assert.equal(result.branchDeleted, true);
+    assert.equal(result.archivedProjectId, null);
+    assert.equal(result.archivalError, null);
+    const removeCall = calls.find((call) => call.args[0] === 'worktree' && call.args[1] === 'remove');
+    assert.ok(removeCall, 'expected a worktree remove call');
+    assert.ok(!removeCall.args.includes('--force'));
+    const branchDeleteCall = calls.find((call) => call.args[0] === 'branch' && call.args[1] === '-D');
+    assert.ok(branchDeleteCall, 'expected the branch to be deleted');
+    assert.equal(branchDeleteCall.args[2], 'feature/login');
+});
+test('removeWorktree rejects a dirty worktree unless forced', async () => {
+    const { runner } = createFakeRunner({ dirty: true });
+    const { dependencies } = createDependencies(runner);
+    await assert.rejects(removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+    }, dependencies), (error) => error instanceof AppError && error.code === 'WORKTREE_DIRTY' && error.statusCode === 409);
+});
+test('removeWorktree does not remove when status cannot confirm the worktree is clean', async () => {
+    const { calls, runner } = createFakeRunner({ statusFails: true });
+    const { dependencies } = createDependencies(runner);
+    await assert.rejects(removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+    }, dependencies));
+    assert.equal(calls.some((call) => call.args[0] === 'worktree' && call.args[1] === 'remove'), false);
+});
+test('removeWorktree passes --force through and skips the dirty check', async () => {
+    const { calls, runner } = createFakeRunner({ dirty: true });
+    const { dependencies } = createDependencies(runner);
+    await removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+        force: true,
+    }, dependencies);
+    const removeCall = calls.find((call) => call.args[0] === 'worktree' && call.args[1] === 'remove');
+    assert.ok(removeCall);
+    assert.ok(removeCall.args.includes('--force'));
+});
+test('removeWorktree reports branchDeleted=false when branch deletion fails', async () => {
+    const { runner } = createFakeRunner({ branchDeleteFails: true });
+    const { dependencies } = createDependencies(runner);
+    const result = await removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: '/home/user/repo-worktrees/feature-login',
+        deleteBranch: true,
+    }, dependencies);
+    assert.equal(result.branchDeleted, false);
+});
+test('removeWorktree archives an active project linked to the removed path', async () => {
+    const { runner } = createFakeRunner();
+    const linkedProject = {
+        project_id: 'project-1',
+        project_path: '/home/user/repo-worktrees/feature-login',
+        custom_project_name: 'repo · feature/login',
+        isStarred: 0,
+        isArchived: 0,
+    };
+    const { archivedProjectIds, dependencies } = createDependencies(runner, linkedProject);
+    const result = await removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: linkedProject.project_path,
+    }, dependencies);
+    assert.equal(result.archivedProjectId, 'project-1');
+    assert.equal(result.archivalError, null);
+    assert.deepEqual(archivedProjectIds, ['project-1']);
+});
+test('removeWorktree reports archival failure after successful Git removal', async () => {
+    const { runner } = createFakeRunner();
+    const linkedProject = {
+        project_id: 'project-1',
+        project_path: '/home/user/repo-worktrees/feature-login',
+        custom_project_name: 'feature/login',
+        isStarred: 0,
+        isArchived: 0,
+    };
+    const { dependencies } = createDependencies(runner, linkedProject, new Error('archive failed'));
+    const result = await removeWorktree({
+        projectPath: '/home/user/repo',
+        worktreePath: linkedProject.project_path,
+    }, dependencies);
+    assert.equal(result.removedPath.replace(/\\/g, '/'), linkedProject.project_path);
+    assert.equal(result.archivedProjectId, null);
+    assert.equal(result.archivalError, 'archive failed');
+});
+test('removeWorktree never removes the main worktree', async () => {
+    const { runner } = createFakeRunner();
+    const { dependencies } = createDependencies(runner);
+    await assert.rejects(removeWorktree({
+        projectPath: '/home/user/repo-worktrees/feature-login',
+        worktreePath: '/home/user/repo',
+    }, dependencies), (error) => error instanceof AppError
+        && error.code === 'WORKTREE_MAIN_NOT_REMOVABLE'
+        && error.statusCode === 400);
+});
+//# sourceMappingURL=worktree-remove.service.test.js.map

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

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

package/dist-server/server/modules/worktrees/tests/worktrees.routes.test.js

@@ -0,0 +1,167 @@
+import assert from 'node:assert/strict';
+import { once } from 'node:events';
+import test from 'node:test';
+import express from 'express';
+import { createWorktreesRouter } from '../../../modules/worktrees/worktrees.routes.js';
+import { AppError } from '../../../shared/utils.js';
+function createFakeServices(overrides = {}) {
+    const unused = async () => {
+        throw new Error('Unexpected Worktrees service call');
+    };
+    return {
+        resolveProjectPath: () => {
+            throw new Error('Unexpected project resolution');
+        },
+        list: unused,
+        create: unused,
+        createAndOpen: unused,
+        open: unused,
+        merge: unused,
+        remove: unused,
+        ...overrides,
+    };
+}
+async function withWorktreesServer(services, run) {
+    const app = express();
+    app.use(express.json());
+    app.use('/api/worktrees', createWorktreesRouter(services));
+    app.use((error, _req, res, _next) => {
+        if (error instanceof AppError) {
+            res.status(error.statusCode).json({ error: error.code });
+            return;
+        }
+        res.status(500).json({ error: 'INTERNAL_ERROR' });
+    });
+    const server = app.listen(0, '127.0.0.1');
+    await once(server, 'listening');
+    try {
+        const address = server.address();
+        await run(`http://127.0.0.1:${address.port}`);
+    }
+    finally {
+        await new Promise((resolve, reject) => {
+            server.close((error) => error ? reject(error) : resolve());
+        });
+    }
+}
+test('create route parses input and invokes the create-and-open application service', async () => {
+    const createInputs = [];
+    const services = createFakeServices({
+        resolveProjectPath: (projectId) => {
+            assert.equal(projectId, 'project-1');
+            return '/workspace/repo';
+        },
+        createAndOpen: async (input) => {
+            createInputs.push(input);
+            return {
+                worktreePath: '/workspace/repo-worktrees/feature-login',
+                branch: input.branch,
+                createdBranch: true,
+                project: {
+                    projectId: 'worktree-project-1',
+                    path: '/workspace/repo-worktrees/feature-login',
+                    fullPath: '/workspace/repo-worktrees/feature-login',
+                    displayName: 'repo worktree',
+                    isStarred: false,
+                    sessions: [],
+                    sessionMeta: { hasMore: false, total: 0 },
+                },
+            };
+        },
+    });
+    await withWorktreesServer(services, async (baseUrl) => {
+        const response = await fetch(`${baseUrl}/api/worktrees/create`, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({
+                project: ' project-1 ',
+                branch: ' feature/login ',
+                baseBranch: 'main',
+            }),
+        });
+        const payload = await response.json();
+        assert.equal(response.status, 200);
+        assert.equal(payload.success, true);
+        assert.equal(payload.data.project.projectId, 'worktree-project-1');
+    });
+    assert.deepEqual(createInputs, [{
+            projectPath: '/workspace/repo',
+            branch: 'feature/login',
+            baseBranch: 'main',
+        }]);
+});
+test('create route rejects missing branch before calling a mutation service', async () => {
+    let createCalled = false;
+    const services = createFakeServices({
+        resolveProjectPath: () => '/workspace/repo',
+        createAndOpen: async () => {
+            createCalled = true;
+            throw new Error('create should not run for invalid input');
+        },
+    });
+    await withWorktreesServer(services, async (baseUrl) => {
+        const response = await fetch(`${baseUrl}/api/worktrees/create`, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ project: 'project-1' }),
+        });
+        const payload = await response.json();
+        assert.equal(response.status, 400);
+        assert.equal(payload.error, 'INVALID_REQUEST_BODY');
+    });
+    assert.equal(createCalled, false);
+});
+test('merge and remove routes do not coerce string booleans to true', async () => {
+    const mergeInputs = [];
+    const removeInputs = [];
+    const services = createFakeServices({
+        resolveProjectPath: () => '/workspace/repo',
+        merge: async (input) => {
+            mergeInputs.push(input);
+            return {
+                mergedBranch: 'feature/login',
+                targetBranch: 'main',
+                squash: false,
+                removedWorktree: null,
+                cleanupError: null,
+            };
+        },
+        remove: async (input) => {
+            removeInputs.push(input);
+            return {
+                removedPath: input.worktreePath,
+                branch: 'feature/login',
+                branchDeleted: false,
+                archivedProjectId: null,
+                archivalError: null,
+            };
+        },
+    });
+    await withWorktreesServer(services, async (baseUrl) => {
+        const body = {
+            project: 'project-1',
+            worktreePath: '/workspace/repo-worktrees/feature-login',
+            squash: 'false',
+            removeAfterMerge: 'false',
+            force: 'false',
+            deleteBranch: 'false',
+        };
+        const mergeResponse = await fetch(`${baseUrl}/api/worktrees/merge`, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(body),
+        });
+        const removeResponse = await fetch(`${baseUrl}/api/worktrees/remove`, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(body),
+        });
+        assert.equal(mergeResponse.status, 200);
+        assert.equal(removeResponse.status, 200);
+    });
+    assert.equal(mergeInputs[0].squash, false);
+    assert.equal(mergeInputs[0].removeAfterMerge, false);
+    assert.equal(removeInputs[0].force, false);
+    assert.equal(removeInputs[0].deleteBranch, false);
+});
+//# sourceMappingURL=worktrees.routes.test.js.map

package/dist-server/server/modules/worktrees/tests/worktrees.routes.test.js.map

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