fix: go to file in big non-git folders; linear reply handling
- find/git producers piped into head tolerate SIGPIPE, so hitting a cap no longer fails the command (and lets ttyd truncate its reply). - fs-find outside git skips build/cache folders and caps at 10000. - runCommand checks completion on the stream's tail instead of re-decoding the whole reply on every frame. Refs #37 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -7,6 +7,10 @@
|
||||
: "${DEVDESK_FS_LIST_MAX:=2000}" # entries per directory listing
|
||||
: "${DEVDESK_ASSETS:=$DEVDESK_SHARE/assets}"
|
||||
|
||||
# Producers piped into `head` get SIGPIPE once the cap is reached; under
|
||||
# pipefail that would fail the command and cut its reply short, so they are
|
||||
# wrapped as `{ producer || true; }`.
|
||||
|
||||
# Blob replies: a JSON header line, then base64 between markers (no body for
|
||||
# binary files the viewer can't show). The client waits for the END marker.
|
||||
DD_BLOB_BEGIN=DEVDESK-BLOB-BEGIN
|
||||
@@ -81,7 +85,7 @@ cmd_fs_list() {
|
||||
[ -d "$dir" ] || dd_die "not a folder: $rel"
|
||||
tmp=$(mktemp)
|
||||
# %y: type, %Y: type behind a symlink, %s: size, %T@: mtime, %f: name.
|
||||
find "$dir" -mindepth 1 -maxdepth 1 ! -name .git -printf '%y\t%Y\t%s\t%T@\t%f\0' 2>/dev/null |
|
||||
{ find "$dir" -mindepth 1 -maxdepth 1 ! -name .git -printf '%y\t%Y\t%s\t%T@\t%f\0' 2>/dev/null || true; } |
|
||||
head -z -n "$((DEVDESK_FS_LIST_MAX + 1))" >"$tmp"
|
||||
if git --no-optional-locks -C "$dir" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
||||
ignored=$(tr '\0' '\n' <"$tmp" | cut -f5- | git --no-optional-locks -C "$dir" check-ignore --stdin 2>/dev/null || true)
|
||||
@@ -98,16 +102,18 @@ cmd_fs_list() {
|
||||
|
||||
# --fs-find SESSION: every file under the session folder, for "go to file".
|
||||
# git ls-files in a repository (tracked + untracked, .gitignore honoured), else
|
||||
# find without node_modules and .git; capped at DEVDESK_FS_FIND_MAX.
|
||||
# find without node_modules, .git and build/cache folders; capped at
|
||||
# DEVDESK_FS_FIND_MAX (10000).
|
||||
cmd_fs_find() {
|
||||
[ $# -eq 1 ] || dd_die "usage: devdesk attach --fs-find SESSION"
|
||||
local root max=${DEVDESK_FS_FIND_MAX:-20000}
|
||||
local root max=${DEVDESK_FS_FIND_MAX:-10000}
|
||||
root=$(dd_session_root "$1")
|
||||
if git --no-optional-locks -C "$root" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
||||
git --no-optional-locks -C "$root" ls-files -co --exclude-standard -z 2>/dev/null
|
||||
git --no-optional-locks -C "$root" ls-files -co --exclude-standard -z 2>/dev/null || true
|
||||
else
|
||||
(cd "$root" && find . -maxdepth 8 \( -name node_modules -o -name .git -o -name __pycache__ -o -name .venv \) -prune \
|
||||
-o -type f -printf '%P\0' 2>/dev/null)
|
||||
(cd "$root" && find . -maxdepth 8 \( -name node_modules -o -name .git -o -name __pycache__ -o -name .venv -o -name venv \
|
||||
-o -name dist -o -name build -o -name target -o -name .cache -o -name .next -o -name coverage \) -prune \
|
||||
-o -type f -printf '%P\0' 2>/dev/null) || true
|
||||
fi | head -z -n "$((max + 1))" |
|
||||
jq -cMRs --argjson max "$max" --arg root "$root" \
|
||||
'(split("\u0000") | map(select(length > 0))) as $f | {root: $root, truncated: ($f | length > $max), files: $f[:$max]}'
|
||||
@@ -142,9 +148,9 @@ cmd_git_status() {
|
||||
branch=$("${g[@]}" symbolic-ref --short -q HEAD || echo "(detached)")
|
||||
{
|
||||
printf 'S\n'
|
||||
"${g[@]}" status --porcelain=v1 -z --untracked-files=all -- . 2>/dev/null | head -z -n 1000 | tr '\0' '\n'
|
||||
{ "${g[@]}" status --porcelain=v1 -z --untracked-files=all -- . 2>/dev/null || true; } | head -z -n 1000 | tr '\0' '\n'
|
||||
printf 'N\n'
|
||||
"${g[@]}" diff --numstat HEAD -- . 2>/dev/null | head -n 1000
|
||||
{ "${g[@]}" diff --numstat HEAD -- . 2>/dev/null || true; } | head -n 1000
|
||||
} | jq -cMRs --arg root "$root" --arg top "$top" --arg prefix "$prefix" --arg branch "$branch" \
|
||||
--rawfile e <(cat -- "$edits" 2>/dev/null || true) '
|
||||
(split("\nN\n") | .[0] | ltrimstr("S\n") | split("\n") | map(select(length > 2))) as $st
|
||||
|
||||
Reference in New Issue
Block a user