@cloudcli-ai/cloudcli 1.36.3 → 1.37.1

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":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,uBAAuB,EACvB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,gBAAgB,GAAG;IACvB,0BAA0B;IAC1B,+CAA+C;IAC/C,wBAAwB;IACxB,EAAE;IACF,kDAAkD;IAClD,+CAA+C;IAC/C,iCAAiC;IACjC,EAAE;IACF,0CAA0C;IAC1C,+CAA+C;IAC/C,UAAU;IACV,oBAAoB;IACpB,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,IAAI,CAAC,6EAA6E,EAAE,GAAG,EAAE;IACvF,MAAM,OAAO,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;IAE7D,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAEhC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,0CAA0C,CAAC,CAAC;IAC7E,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAE3C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACjD,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;IAErD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yEAAyE,EAAE,GAAG,EAAE;IACnF,MAAM,OAAO,GAAG,0BAA0B,CACxC,iGAAiG,CAClG,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,OAAO,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,uBAAuB,CAAC,OAAO,EAAE,0CAA0C,CAAC,CAAC;IAC3F,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;IAC3E,MAAM,OAAO,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,uBAAuB,CAAC,OAAO,EAAE,sBAAsB,CAAC,EAC9D,CAAC,KAAc,EAAE,EAAE,CACjB,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,IAAI,KAAK,CAAC,UAAU,KAAK,GAAG,CAC/F,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;IAC3E,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,sBAAsB,CAAC,EAAE,oBAAoB,CAAC,CAAC;AACzF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,GAAG,EAAE;IAC3D,KAAK,MAAM,WAAW,IAAI;QACxB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY;QACnE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU;QACtF,SAAS,EAAE,iBAAiB,EAAE,gBAAgB;KAC/C,EAAE,CAAC;QACF,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAC7C,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EACrF,aAAa,WAAW,kBAAkB,CAC3C,CAAC;IACJ,CAAC;AACH,CAAC,CAAC,CAAC"}

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"}

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":"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"}