diff options
| author | sigoden <sigoden@gmail.com> | 2024-08-02 23:26:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-02 23:26:49 +0800 |
| commit | d66d8938f1f845e92966835f70bc2f97ebb8246b (patch) | |
| tree | e81b6da5ff07f1aeaa1799a314f7850c89e97d1c | |
| parent | f5c67b3eff5925e35379760d57f886f705120158 (diff) | |
| download | llm-functions-docker-d66d8938f1f845e92966835f70bc2f97ebb8246b.tar.gz | |
feat: prompt confirmation for fs write operations outside cwd (#90)
| -rwxr-xr-x | agents/coder/tools.sh | 32 | ||||
| -rwxr-xr-x | tools/fs_cat.sh | 4 | ||||
| -rwxr-xr-x | tools/fs_ls.sh | 4 | ||||
| -rwxr-xr-x | tools/fs_mkdir.sh | 6 | ||||
| -rwxr-xr-x | tools/fs_rm.sh | 22 | ||||
| -rwxr-xr-x | tools/fs_write.sh | 23 |
6 files changed, 63 insertions, 28 deletions
diff --git a/agents/coder/tools.sh b/agents/coder/tools.sh index b0c0cd4..685746a 100755 --- a/agents/coder/tools.sh +++ b/agents/coder/tools.sh @@ -1,15 +1,13 @@ #!/usr/bin/env bash set -e -# @env FS_BASE_DIR=. The base dir - # @cmd Create a new file at the specified path with content. # @option --path! The path where the file should be created # @option --content! The content of the file fs_create() { - path="$FS_BASE_DIR/$argc_path" - printf "%s" "$argc_content" > "$path" - echo "File created: $path" >> "$LLM_OUTPUT" + _guard_path "$argc_path" Create + printf "%s" "$argc_content" > "$argc_path" + echo "File created: $argc_path" >> "$LLM_OUTPUT" } # @cmd Apply changes to a file. Use this when you need to edit an existing file. @@ -20,10 +18,10 @@ fs_create() { # @option --content! The new content to apply to the file # @meta require-tools git fs_edit() { - path="$FS_BASE_DIR/$argc_path" - if [[ -f "$path" ]]; then + if [[ -f "$argc_path" ]]; then + _guard_path "$argc_path" Edit changed=0 - printf "%s" "$argc_content" | git diff --no-index "$path" - || { + printf "%s" "$argc_content" | git diff --no-index "$argc_path" - || { changed=1 } if [[ "$changed" -eq 0 ]]; then @@ -37,11 +35,25 @@ fs_edit() { exit 1 fi fi - printf "%s" "$argc_content" > "$path" + printf "%s" "$argc_content" > "$argc_path" echo "Applied changes" >> "$LLM_OUTPUT" fi else - echo "Not found file: $path" >> "$LLM_OUTPUT" + echo "Not found file: $argc_path" >> "$LLM_OUTPUT" + fi +} + +_guard_path() { + path="$(realpath "$1")" + action="$2" + if [[ ! "$path" == "$(pwd)"* ]]; then + if [ -t 1 ]; then + read -r -p "$action $path? [Y/n] " ans + if [[ "$ans" == "N" || "$ans" == "n" ]]; then + echo "Aborted!" + exit 1 + fi + fi fi } diff --git a/tools/fs_cat.sh b/tools/fs_cat.sh index bec9a12..37fe5dc 100755 --- a/tools/fs_cat.sh +++ b/tools/fs_cat.sh @@ -4,12 +4,10 @@ set -e # @describe Read the contents of a file at the specified path. # Use this when you need to examine the contents of an existing file. -# @env FS_BASE_DIR=. The base dir # @option --path! The path of the file to read main() { - path="$FS_BASE_DIR/$argc_path" - cat "$path" >> "$LLM_OUTPUT" + cat "$argc_path" >> "$LLM_OUTPUT" } eval "$(argc --argc-eval "$0" "$@")" diff --git a/tools/fs_ls.sh b/tools/fs_ls.sh index f288f77..c7deb40 100755 --- a/tools/fs_ls.sh +++ b/tools/fs_ls.sh @@ -3,12 +3,10 @@ set -e # @describe List all files and directories at the specified path. -# @env FS_BASE_DIR=. The base dir # @option --path! The path of the directory to list main() { - path="$FS_BASE_DIR/$argc_path" - ls -1 "$path" >> "$LLM_OUTPUT" + ls -1 "$argc_path" >> "$LLM_OUTPUT" } eval "$(argc --argc-eval "$0" "$@")" diff --git a/tools/fs_mkdir.sh b/tools/fs_mkdir.sh index 79d853a..8305f10 100755 --- a/tools/fs_mkdir.sh +++ b/tools/fs_mkdir.sh @@ -3,13 +3,11 @@ set -e # @describe Create a new directory at the specified path. -# @env FS_BASE_DIR=. The base dir # @option --path! The path of the directory to create main() { - path="$FS_BASE_DIR/$argc_path" - mkdir -p "$path" - echo "Directory created: $path" >> "$LLM_OUTPUT" + mkdir -p "$argc_path" + echo "Directory created: $argc_path" >> "$LLM_OUTPUT" } eval "$(argc --argc-eval "$0" "$@")" diff --git a/tools/fs_rm.sh b/tools/fs_rm.sh index 1d40295..c07c17d 100755 --- a/tools/fs_rm.sh +++ b/tools/fs_rm.sh @@ -7,9 +7,25 @@ set -e # @option --path! The path of the file or directory to remove main() { - path="$FS_BASE_DIR/$argc_path" - rm -rf "$path" - echo "Path removed: $path" >> "$LLM_OUTPUT" + if [[ -f "$argc_path" ]]; then + _guard_path "$argc_path" Remove + rm -rf "$argc_path" + fi + echo "Path removed: $argc_path" >> "$LLM_OUTPUT" +} + +_guard_path() { + path="$(realpath "$1")" + action="$2" + if [[ ! "$path" == "$(pwd)"* ]]; then + if [ -t 1 ]; then + read -r -p "$action $path? [Y/n] " ans + if [[ "$ans" == "N" || "$ans" == "n" ]]; then + echo "Aborted!" + exit 1 + fi + fi + fi } eval "$(argc --argc-eval "$0" "$@")" diff --git a/tools/fs_write.sh b/tools/fs_write.sh index 7718b8d..59ee812 100755 --- a/tools/fs_write.sh +++ b/tools/fs_write.sh @@ -6,15 +6,28 @@ set -e # If the file doesn't exist, it will be created. # Always provide the full intended contents of the file. -# @env FS_BASE_DIR=. The base dir # @option --path! The path of the file to write to # @option --contents! The full contents to write to the file main() { - path="$FS_BASE_DIR/$argc_path" - mkdir -p "$(dirname "$path")" - printf "%s" "$argc_contents" > "$path" - echo "The contents written to: $path" >> "$LLM_OUTPUT" + _guard_path "$argc_path" Write + mkdir -p "$(dirname "$argc_path")" + printf "%s" "$argc_contents" > "$argc_path" + echo "The contents written to: $argc_path" >> "$LLM_OUTPUT" +} + +_guard_path() { + path="$(realpath "$1")" + action="$2" + if [[ ! "$path" == "$(pwd)"* ]]; then + if [ -t 1 ]; then + read -r -p "$action $path? [Y/n] " ans + if [[ "$ans" == "N" || "$ans" == "n" ]]; then + echo "Aborted!" + exit 1 + fi + fi + fi } eval "$(argc --argc-eval "$0" "$@")" |
