Robust fs operationsHEADmain

1 files changed, 27 insertions, 19 deletions

diff --git a/tools/fs_write.sh b/tools/fs_write.sh
index 746c24b..3ff38d4 100755
--- a/tools/fs_write.sh
+++ b/tools/fs_write.sh
@@ -2,6 +2,8 @@
 set -uo pipefail
 
 # @describe Write the full file contents to a file at the specified path.
+# This tool NEVER requests user interaction and NEVER exits with a non-zero code.
+# Any error is reported in the tool output so the model can react within the same cycle.
 # @option --path! The path of the file to write to
 # @option --contents! The full contents to write to the file
 # @env LLM_OUTPUT=/dev/stdout The output path
@@ -9,6 +11,7 @@ set -uo pipefail
 ROOT_DIR="${LLM_ROOT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
 OUT="${LLM_OUTPUT:-/dev/stdout}"
 
+# Report an error in the tool output and finish successfully (exit 0).
 err() {
   echo "ERROR: $*" >> "$OUT"
   exit 0
@@ -19,31 +22,26 @@ main() {
   contents="${argc_contents:-}"
 
   [[ -z "$path" ]] && err "missing --path"
-  # contents darf leer sein – das ist erlaubt (File leeren)
-  dir="$(dirname "$path")"
+  # empty contents are allowed (used to truncate a file)
 
   if [[ -e "$path" && ! -f "$path" ]]; then
     err "target exists but is not a regular file: $path"
   fi
 
+  # Show the diff (if any) so the model sees what is written.
+  # NOTE: no guard_operation.sh / guard_path.sh here -> no user interaction.
   if [[ -f "$path" ]]; then
-    # Diff in Output schreiben (damit LLM es sieht)
     printf "%s" "$contents" | git diff --no-index "$path" - >> "$OUT" 2>/dev/null || true
-    if ! "$ROOT_DIR/utils/guard_operation.sh" "Apply changes?" >>"$OUT" 2>&1; then
-      err "operation cancelled by user"
-    fi
-  else
-    if ! "$ROOT_DIR/utils/guard_path.sh" "$path" "Write '$path'?" >>"$OUT" 2>&1; then
-      err "operation cancelled by user"
-    fi
-    if ! mkdir -p "$dir" 2>/tmp/fs_write_mkdir.err; then
-      msg="$(cat /tmp/fs_write_mkdir.err 2>/dev/null || true)"
-      err "failed to create parent dir $dir: ${msg:-unknown error}"
-    fi
   fi
 
-  if ! printf "%s" "$contents" > "$path" 2>/tmp/fs_write.err; then
-    msg="$(cat /tmp/fs_write.err 2>/dev/null || true)"
+  dir="$(dirname "$path")"
+  if ! mkdir -p "$dir" 2>/tmp/fs_write_new_mkdir.err; then
+    msg="$(cat /tmp/fs_write_new_mkdir.err 2>/dev/null || true)"
+    err "failed to create parent dir $dir: ${msg:-unknown error}"
+  fi
+
+  if ! printf "%s" "$contents" > "$path" 2>/tmp/fs_write_new.err; then
+    msg="$(cat /tmp/fs_write_new.err 2>/dev/null || true)"
     err "failed to write file $path: ${msg:-unknown error}"
   fi
 
@@ -51,6 +49,16 @@ main() {
   exit 0
 }
 
-eval "$(argc --argc-eval "$0" "$@")"
-main
-
+# Parse arguments with argc and run the tool in a subshell:
+# - argc calls `main`, which always ends with `exit 0`.
+# - If argc itself fails (missing/invalid arguments) its generated code prints the
+#   error to stderr and calls `exit 1`; running it in a subshell keeps that from
+#   terminating this script, and the message is captured into the tool output.
+# - The script itself always finishes with exit 0.
+argc_err="$(mktemp)"
+( eval "$(argc --argc-eval "$0" "$@" 2>/dev/null)" ) 2>"$argc_err"
+if [[ -s "$argc_err" ]]; then
+  { echo "ERROR: argument parsing failed:"; cat "$argc_err"; } >> "$OUT"
+fi
+rm -f "$argc_err"
+exit 0
\ No newline at end of file