refactor: Updated the sisyphus agent to use the built-in user interaction tools instead of custom bash-based tools
This commit is contained in:
@@ -7,7 +7,7 @@ export AUTO_CONFIRM=true
|
||||
|
||||
# @env LLM_OUTPUT=/dev/stdout
|
||||
# @env LLM_AGENT_VAR_PROJECT_DIR=.
|
||||
# @describe Sisyphus orchestrator tools (project info, build, test, user interaction)
|
||||
# @describe Sisyphus orchestrator tools (project info, build, test)
|
||||
|
||||
_project_dir() {
|
||||
local dir="${LLM_AGENT_VAR_PROJECT_DIR:-.}"
|
||||
@@ -95,169 +95,3 @@ run_tests() {
|
||||
fi
|
||||
}
|
||||
|
||||
# @cmd Quick file search in the project
|
||||
# @option --pattern! File name pattern to search for (e.g., "*.rs", "config*")
|
||||
search_files() {
|
||||
# shellcheck disable=SC2154
|
||||
local pattern="${argc_pattern}"
|
||||
local project_dir
|
||||
project_dir=$(_project_dir)
|
||||
|
||||
info "Searching for: ${pattern}" >> "$LLM_OUTPUT"
|
||||
echo "" >> "$LLM_OUTPUT"
|
||||
|
||||
local results
|
||||
results=$(search_files "${pattern}" "${project_dir}")
|
||||
|
||||
if [[ -n "${results}" ]]; then
|
||||
echo "${results}" >> "$LLM_OUTPUT"
|
||||
else
|
||||
warn "No files found matching: ${pattern}" >> "$LLM_OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
# @cmd Search for content in files
|
||||
# @option --pattern! Text pattern to search for
|
||||
# @option --file-type File extension to search in (e.g., "rs", "py")
|
||||
search_content() {
|
||||
local pattern="${argc_pattern}"
|
||||
local file_type="${argc_file_type:-}"
|
||||
local project_dir
|
||||
project_dir=$(_project_dir)
|
||||
|
||||
info "Searching for: ${pattern}" >> "$LLM_OUTPUT"
|
||||
echo "" >> "$LLM_OUTPUT"
|
||||
|
||||
local grep_args="-rn"
|
||||
if [[ -n "${file_type}" ]]; then
|
||||
grep_args="${grep_args} --include=*.${file_type}"
|
||||
fi
|
||||
|
||||
local results
|
||||
# shellcheck disable=SC2086
|
||||
results=$(grep ${grep_args} "${pattern}" "${project_dir}" 2>/dev/null | \
|
||||
grep -v '/target/' | grep -v '/node_modules/' | grep -v '/.git/' | \
|
||||
head -30) || true
|
||||
|
||||
if [[ -n "${results}" ]]; then
|
||||
echo "${results}" >> "$LLM_OUTPUT"
|
||||
else
|
||||
warn "No matches found for: ${pattern}" >> "$LLM_OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
# @cmd Ask the user to select ONE option from a list. The first option should be your recommended choice; append '(Recommended)' to its label. Returns the selected option's label text.
|
||||
# @option --question! The question to present to the user
|
||||
# @option --options! The JSON array of options to present (first option = recommended, append '(Recommended)' to its label)
|
||||
ask_user() {
|
||||
# shellcheck disable=SC2154
|
||||
local question="${argc_question}"
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
local options_json="${argc_options}"
|
||||
|
||||
local opts=()
|
||||
|
||||
# Convert JSON array string -> Bash array
|
||||
if ! mapfile -t opts < <(jq -r '.[]' <<<"$options_json"); then
|
||||
error "Invalid JSON in argc_options" >> "$LLM_OUTPUT"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local opts_count="${#opts[@]}"
|
||||
|
||||
if [[ "$opts_count" -eq 0 ]]; then
|
||||
error "No options provided for ask_user" >> "$LLM_OUTPUT"
|
||||
return 1
|
||||
fi
|
||||
|
||||
info "Asking user: ${question}" >> "$LLM_OUTPUT"
|
||||
|
||||
local selected_index
|
||||
selected_index=$(list "$question" "${opts[@]}" 2>/dev/tty)
|
||||
|
||||
local selected_label="${opts[$selected_index]}"
|
||||
|
||||
cat <<-EOF >> "$LLM_OUTPUT"
|
||||
User selected: ${selected_label}
|
||||
EOF
|
||||
}
|
||||
|
||||
# @cmd Ask the user a yes/no confirmation question. Returns 'yes' or 'no'.
|
||||
# @option --question! The yes/no question to present to the user
|
||||
ask_user_confirm() {
|
||||
# shellcheck disable=SC2154
|
||||
local question="${argc_question}"
|
||||
|
||||
info "Asking user: ${question}" >> "$LLM_OUTPUT"
|
||||
|
||||
local result
|
||||
result=$(confirm "${question}" 2>/dev/tty)
|
||||
|
||||
if [[ "${result}" == "1" ]]; then
|
||||
echo "User confirmed: yes" >> "$LLM_OUTPUT"
|
||||
else
|
||||
echo "User confirmed: no" >> "$LLM_OUTPUT"
|
||||
fi
|
||||
}
|
||||
|
||||
# @cmd Ask the user to select MULTIPLE options from a list (checkbox). Returns the labels of all selected items.
|
||||
# @option --question! The question to present to the user
|
||||
# @option --options! The JSON array of options to present
|
||||
ask_user_checkbox() {
|
||||
# shellcheck disable=SC2154
|
||||
local question="${argc_question}"
|
||||
# shellcheck disable=SC2154
|
||||
local options_json="${argc_options}"
|
||||
|
||||
local opts=()
|
||||
|
||||
# Convert JSON array string -> Bash array
|
||||
if ! mapfile -t opts < <(jq -r '.[]' <<<"$options_json"); then
|
||||
error "Invalid JSON in argc_options" >> "$LLM_OUTPUT"
|
||||
return 1
|
||||
fi
|
||||
local opts_count="${#opts[@]}"
|
||||
|
||||
if [[ "${opts_count}" -eq 0 ]]; then
|
||||
error "No options provided for ask_user_checkbox" >> "$LLM_OUTPUT"
|
||||
return 1
|
||||
fi
|
||||
|
||||
info "Asking user (select multiple): ${question}" >> "$LLM_OUTPUT"
|
||||
|
||||
local checked_indices
|
||||
checked_indices=$(checkbox "${question}" "${opts[@]}" 2>/dev/tty)
|
||||
|
||||
local selected_labels=()
|
||||
for idx in ${checked_indices}; do
|
||||
if [[ -n "${idx}" ]] && [[ "${idx}" =~ ^[0-9]+$ ]]; then
|
||||
selected_labels+=("${opts[$idx]}")
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ "${#selected_labels[@]}" -eq 0 ]]; then
|
||||
echo "User selected: (none)" >> "$LLM_OUTPUT"
|
||||
else
|
||||
echo "User selected:" >> "$LLM_OUTPUT"
|
||||
for label in "${selected_labels[@]}"; do
|
||||
echo " - ${label}" >> "$LLM_OUTPUT"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
# @cmd Ask the user for free-text input. Returns whatever the user typed.
|
||||
# @option --question! The prompt/question to present to the user
|
||||
ask_user_input() {
|
||||
# shellcheck disable=SC2154
|
||||
local question="${argc_question}"
|
||||
|
||||
info "Asking user: ${question}" >> "$LLM_OUTPUT"
|
||||
|
||||
local user_text
|
||||
user_text=$(input "${question}" 2>/dev/tty)
|
||||
|
||||
cat <<-EOF >> "$LLM_OUTPUT"
|
||||
User input: ${user_text}
|
||||
EOF
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user