@piecemaker-legal/piecemaker 1.0.0

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

@@ -0,0 +1,172 @@
+// cross-spawn: drop-in spawn with Windows .cmd/PATHEXT resolution (same choice as routes/git.js).
+import spawn from 'cross-spawn';
+import { AppError, normalizeProjectPath } from '../../../shared/utils.js';
+/**
+ * Default `GitCommandRunner`: spawns `git <args>` in `cwd` and captures output.
+ * Rejects with an `AppError` carrying git's stderr when the command fails, so
+ * callers (and ultimately the API client) see the real git diagnostic.
+ */
+export function runGitCommand(args, cwd) {
+    return new Promise((resolve, reject) => {
+        const child = spawn('git', args, { cwd, shell: false });
+        let stdout = '';
+        let stderr = '';
+        child.stdout?.on('data', (data) => {
+            stdout += data.toString();
+        });
+        child.stderr?.on('data', (data) => {
+            stderr += data.toString();
+        });
+        child.on('error', (error) => {
+            reject(new AppError(`Failed to run git: ${error.message}`, {
+                code: 'GIT_SPAWN_FAILED',
+                statusCode: 500,
+            }));
+        });
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve({ stdout, stderr });
+                return;
+            }
+            reject(new AppError(`git ${args.join(' ')} failed`, {
+                code: 'GIT_COMMAND_FAILED',
+                statusCode: 500,
+                details: (stderr || stdout).trim(),
+            }));
+        });
+    });
+}
+/**
+ * Defense-in-depth branch-name validation (mirrors routes/git.js), tightened to
+ * also reject the leading-dash / lone-dot forms git itself refuses.
+ */
+export function validateWorktreeBranchName(branch) {
+    const trimmed = branch.trim();
+    const components = trimmed.split('/');
+    if (!trimmed ||
+        trimmed.startsWith('-') ||
+        trimmed.startsWith('/') ||
+        trimmed.endsWith('/') ||
+        trimmed.endsWith('.') ||
+        trimmed === '.' ||
+        trimmed === '..' ||
+        trimmed.includes('..') ||
+        trimmed.includes('//') ||
+        components.some((component) => component.startsWith('.') || component.toLowerCase().endsWith('.lock')) ||
+        !/^[a-zA-Z0-9._/-]+$/.test(trimmed)) {
+        throw new AppError('Invalid branch name', {
+            code: 'INVALID_BRANCH_NAME',
+            statusCode: 400,
+        });
+    }
+    return trimmed;
+}
+/**
+ * Parses `git worktree list --porcelain` output. Entries are separated by blank
+ * lines; the first entry is always the main worktree. Paths come back with
+ * forward slashes even on Windows, so they are normalized here for stable
+ * comparisons against DB-stored project paths.
+ */
+export function parseWorktreeListPorcelain(output) {
+    const entries = [];
+    let current = null;
+    const flush = () => {
+        if (current) {
+            entries.push(current);
+            current = null;
+        }
+    };
+    for (const rawLine of output.split('\n')) {
+        const line = rawLine.trimEnd();
+        if (!line) {
+            flush();
+            continue;
+        }
+        if (line.startsWith('worktree ')) {
+            flush();
+            current = {
+                path: normalizeProjectPath(line.slice('worktree '.length)),
+                headSha: null,
+                branch: null,
+                isDetached: false,
+                isLocked: false,
+                isPrunable: false,
+            };
+            continue;
+        }
+        if (!current) {
+            continue;
+        }
+        if (line.startsWith('HEAD ')) {
+            current.headSha = line.slice('HEAD '.length).trim() || null;
+        }
+        else if (line.startsWith('branch ')) {
+            // Porcelain reports the full ref, e.g. "branch refs/heads/feature/x".
+            current.branch = line.slice('branch '.length).replace(/^refs\/heads\//, '').trim() || null;
+        }
+        else if (line === 'detached') {
+            current.isDetached = true;
+        }
+        else if (line === 'locked' || line.startsWith('locked ')) {
+            current.isLocked = true;
+        }
+        else if (line === 'prunable' || line.startsWith('prunable ')) {
+            current.isPrunable = true;
+        }
+    }
+    flush();
+    return entries;
+}
+/**
+ * Lists the repository's worktrees (main worktree first) for the repo that
+ * contains `projectPath`. Throws a 400 `AppError` when the directory is not
+ * inside a git repository.
+ */
+export async function listWorktreePorcelainEntries(projectPath, runGit) {
+    let output;
+    try {
+        const result = await runGit(['worktree', 'list', '--porcelain'], projectPath);
+        output = result.stdout;
+    }
+    catch (error) {
+        throw new AppError('Not a git repository', {
+            code: 'NOT_A_GIT_REPOSITORY',
+            statusCode: 400,
+            details: error instanceof AppError ? error.details : String(error),
+        });
+    }
+    const entries = parseWorktreeListPorcelain(output);
+    if (entries.length === 0) {
+        throw new AppError('No worktrees found for repository', {
+            code: 'WORKTREE_LIST_EMPTY',
+            statusCode: 500,
+        });
+    }
+    return entries;
+}
+/**
+ * Finds the worktree entry matching `worktreePath` (normalized comparison).
+ * Throws a 404 `AppError` when the path is not a registered worktree of the
+ * repository — this is the guard that stops arbitrary paths reaching git.
+ */
+export function findWorktreeEntryByPath(entries, worktreePath) {
+    const normalized = normalizeProjectPath(worktreePath);
+    const comparable = (value) => process.platform === 'win32' ? value.toLowerCase() : value;
+    const match = entries.find((entry) => comparable(entry.path) === comparable(normalized));
+    if (!match) {
+        throw new AppError('Path is not a worktree of this repository', {
+            code: 'WORKTREE_NOT_FOUND',
+            statusCode: 404,
+        });
+    }
+    return match;
+}
+/**
+ * Counts dirty paths (`git status --porcelain`) inside one worktree. Status
+ * failures propagate so callers never mistake an unreadable worktree for clean.
+ */
+export async function countChangedFiles(worktreePath, runGit) {
+    const { stdout } = await runGit(['status', '--porcelain'], worktreePath);
+    return stdout.split('\n').filter((line) => line.trim().length > 0).length;
+}
+//# sourceMappingURL=worktree-git.service.js.map

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

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

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

@@ -0,0 +1,91 @@
+import { normalizeProjectPath } from '../../../shared/utils.js';
+import { countChangedFiles, listWorktreePorcelainEntries, } from '../../../modules/worktrees/services/worktree-git.service.js';
+const WORKTREE_LIST_CONCURRENCY = 4;
+async function mapWithConcurrency(inputs, concurrency, mapper) {
+    const results = new Array(inputs.length);
+    let nextIndex = 0;
+    async function worker() {
+        while (nextIndex < inputs.length) {
+            const index = nextIndex;
+            nextIndex += 1;
+            results[index] = await mapper(inputs[index], index);
+        }
+    }
+    await Promise.all(Array.from({ length: Math.min(concurrency, inputs.length) }, () => worker()));
+    return results;
+}
+/**
+ * Computes how many commits `branch` is ahead/behind `baseBranch`. Runs in the
+ * main worktree so both refs are resolvable regardless of which worktree has
+ * them checked out. Returns zeros when the comparison is impossible (same
+ * branch, detached HEAD, unborn refs).
+ */
+async function countAheadBehind(repositoryRoot, baseBranch, branch, runGit) {
+    if (!baseBranch || !branch || baseBranch === branch) {
+        return { ahead: 0, behind: 0 };
+    }
+    try {
+        const { stdout } = await runGit(['rev-list', '--left-right', '--count', `${baseBranch}...${branch}`], repositoryRoot);
+        const [behindRaw, aheadRaw] = stdout.trim().split(/\s+/);
+        return {
+            ahead: Number.parseInt(aheadRaw ?? '0', 10) || 0,
+            behind: Number.parseInt(behindRaw ?? '0', 10) || 0,
+        };
+    }
+    catch {
+        return { ahead: 0, behind: 0 };
+    }
+}
+/** Reads the last commit subject + ISO date of a worktree's HEAD (null on unborn branches). */
+async function readLastCommit(worktreePath, runGit) {
+    try {
+        const { stdout } = await runGit(['log', '-1', '--format=%s%x00%cI'], worktreePath);
+        const [subject, date] = stdout.trim().split('\0');
+        return { subject: subject || null, date: date || null };
+    }
+    catch {
+        return { subject: null, date: null };
+    }
+}
+/**
+ * Builds the full Worktrees panel payload for the repository containing
+ * `projectPath`: every worktree with dirty count, ahead/behind vs the base
+ * branch, last commit info, and the linked CloudCLI project (when registered).
+ */
+export async function listWorktrees(input, dependencies) {
+    const { runGit, getProjectByPath } = dependencies;
+    const entries = await listWorktreePorcelainEntries(input.projectPath, runGit);
+    // The first porcelain entry is always the main worktree; its checked-out
+    // branch is the merge target ("base branch") offered by the UI.
+    const mainEntry = entries[0];
+    const repositoryRoot = mainEntry.path;
+    const baseBranch = mainEntry.branch;
+    const requestedPath = normalizeProjectPath(input.projectPath);
+    const comparable = (value) => process.platform === 'win32' ? value.toLowerCase() : value;
+    const worktrees = await mapWithConcurrency(entries, WORKTREE_LIST_CONCURRENCY, async (entry, index) => {
+        const [changedFileCount, aheadBehind, lastCommit] = await Promise.all([
+            countChangedFiles(entry.path, runGit),
+            countAheadBehind(repositoryRoot, baseBranch, index === 0 ? null : entry.branch, runGit),
+            readLastCommit(entry.path, runGit),
+        ]);
+        const linkedProject = getProjectByPath(entry.path);
+        return {
+            path: entry.path,
+            branch: entry.branch,
+            headSha: entry.headSha,
+            isMain: index === 0,
+            isCurrent: comparable(entry.path) === comparable(requestedPath),
+            isLocked: entry.isLocked,
+            isDetached: entry.isDetached,
+            changedFileCount,
+            ahead: aheadBehind.ahead,
+            behind: aheadBehind.behind,
+            lastCommitSubject: lastCommit.subject,
+            lastCommitDate: lastCommit.date,
+            linkedProjectId: linkedProject?.project_id ?? null,
+            linkedProjectArchived: Boolean(linkedProject?.isArchived),
+        };
+    });
+    return { repositoryRoot, baseBranch, worktrees };
+}
+//# sourceMappingURL=worktree-list.service.js.map

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

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

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