mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-21 21:39:33 +01:00
feat(files): follow the agent into a worktree outside the session folder
#772 made the Files panel follow an agent into a worktree inside the session's folder. A worktree beside the repository (git worktree add ../feature, or an EnterWorktree into one that already exists there) stayed unfollowed, since serving it needs a second confinement root. findOutsideWorktree() answers that case without running git. The nearest .git above the pane must name <common dir>/worktrees/<id> of the session's own repository, and that registry entry must name the candidate back (or the .git folder must be the common dir itself). It refuses /, the home folder and above, any folder holding workingDir and Docker case workspaces, and multi-user mode applies the owner's folderAllowedForUser rule. The answer is liveWorktree with outside: true and the folder's real path. The file routes serve an absolute path inside that worktree, and only while the folder still resolves to the recorded path. A relative path still resolves against workingDir alone. The browser routes such paths to the editable preview, and root-relative markdown refs resolve from the top of the worktree. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e9b2ecd552
commit
c9b79097b0
18 files changed
+1030
-56
No files matched your search
@@ -101,6 +101,42 @@ export function validateSessionFilePath(
|
||||
return confineToRoot(resolvedWorkingDir, resolvedPath);
|
||||
}
|
||||
|
||||
/**
|
||||
* The outside worktree (#765) a LOCAL session's file routes may serve `filePath` from, else null:
|
||||
* a recorded worktree with `outside` set, an absolute `filePath` lexically inside it, and a
|
||||
* folder that still resolves to the very path that was recorded. `findOutsideWorktree()` records
|
||||
* the real path, so a symlink that took the folder's place (or a parent's) since then fails the
|
||||
* last check and the path is judged against `workingDir` alone.
|
||||
*/
|
||||
export function outsideWorktreeRootFor(
|
||||
liveWorktree: { path: string; outside?: true } | undefined,
|
||||
filePath: string
|
||||
): string | null {
|
||||
if (!liveWorktree?.outside || !isAbsolute(filePath)) return null;
|
||||
const root = liveWorktree.path;
|
||||
const rel = relative(root, resolve(filePath));
|
||||
if (rel.startsWith('..') || isAbsolute(rel)) return null;
|
||||
try {
|
||||
return realpathSync(root) === root ? root : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link validateSessionFilePath} for a LOCAL session that may have a worktree outside its folder
|
||||
* (`liveWorktree.outside`): an absolute path inside that worktree is confined to it, and, when
|
||||
* that refuses it (a worktree file that is a symlink into the session's own folder), to
|
||||
* `workingDir`, which is served anyway. Every other path is judged against `workingDir` alone.
|
||||
*/
|
||||
export function validateLocalSessionFilePath(
|
||||
scope: { workingDir: string; liveWorktree?: { path: string; outside?: true } },
|
||||
filePath: string
|
||||
): { resolvedPath: string; relativePath: string } | null {
|
||||
const root = outsideWorktreeRootFor(scope.liveWorktree, filePath);
|
||||
return (root && validateSessionFilePath(root, filePath)) || validateSessionFilePath(scope.workingDir, filePath);
|
||||
}
|
||||
|
||||
/**
|
||||
* The lexical half of {@link validateSessionFilePath}: same containment rule, but
|
||||
* WITHOUT touching the filesystem.
|
||||
|
||||
Reference in new issue
Block a user