Skip to content

fix(hooks): quote plugin paths with spaces #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewDongminYoo wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −11
Open

fix(hooks): quote plugin paths with spaces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions plugins/orchestration/hooks/hooks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-session-start.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-session-start.sh\""
}
]
}
Expand All @@ -15,7 +15,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/drain-mailbox.sh UserPromptSubmit"
"command": "\"${PLUGIN_ROOT}/scripts/drain-mailbox.sh\" UserPromptSubmit"
}
]
}
Expand All @@ -26,7 +26,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/drain-mailbox.sh PostToolUse"
"command": "\"${PLUGIN_ROOT}/scripts/drain-mailbox.sh\" PostToolUse"
}
]
}
Expand All @@ -36,7 +36,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-stop.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-stop.sh\""
}
]
}
Expand All @@ -46,7 +46,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-session-end.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-session-end.sh\""
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions plugins/warp/hooks/hooks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-session-start.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-session-start.sh\""
}
]
}
Expand All @@ -15,7 +15,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-stop.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-stop.sh\""
}
]
}
Expand All @@ -25,7 +25,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-permission-request.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-permission-request.sh\""
}
]
}
Expand All @@ -35,7 +35,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-prompt-submit.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-prompt-submit.sh\""
}
]
}
Expand All @@ -45,7 +45,7 @@
"hooks": [
{
"type": "command",
"command": "${PLUGIN_ROOT}/scripts/on-post-tool-use.sh"
"command": "\"${PLUGIN_ROOT}/scripts/on-post-tool-use.sh\""
}
]
}
Expand Down
29 changes: 28 additions & 1 deletion tests/test-hooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,36 @@ assert_json_field "oz plugin name" "$(cat "$REPO_ROOT/plugins/orchestration/.cod
assert_contains "warp hooks use PLUGIN_ROOT" "$(cat "$REPO_ROOT/plugins/warp/hooks/hooks.json")" '${PLUGIN_ROOT}/scripts/on-session-start.sh'
assert_contains "warp hooks include prompt submit" "$(cat "$REPO_ROOT/plugins/warp/hooks/hooks.json")" '${PLUGIN_ROOT}/scripts/on-prompt-submit.sh'
assert_contains "warp hooks include post tool use" "$(cat "$REPO_ROOT/plugins/warp/hooks/hooks.json")" '${PLUGIN_ROOT}/scripts/on-post-tool-use.sh'
assert_contains "oz hooks use PLUGIN_ROOT" "$(cat "$REPO_ROOT/plugins/orchestration/hooks/hooks.json")" '${PLUGIN_ROOT}/scripts/drain-mailbox.sh UserPromptSubmit'
assert_contains "oz hooks quote PLUGIN_ROOT" "$(cat "$REPO_ROOT/plugins/orchestration/hooks/hooks.json")" '\"${PLUGIN_ROOT}/scripts/drain-mailbox.sh\" UserPromptSubmit'
assert_contains "oz hooks include session end" "$(cat "$REPO_ROOT/plugins/orchestration/hooks/hooks.json")" '${PLUGIN_ROOT}/scripts/on-session-end.sh'

echo ""
echo "=== plugin roots with spaces ==="
for plugin_name in warp orchestration; do
plugin_root="$TEST_TMP/$plugin_name plugin"
ln -s "$REPO_ROOT/plugins/$plugin_name" "$plugin_root"

while IFS=$'\t' read -r event_name hook_command; do
command_output=$(printf '%s' "$HOOK_INPUT" | env \
-u WARP_CLI_AGENT_PROTOCOL_VERSION \
-u WARP_CLIENT_VERSION \
-u OZ_PARENT_RUN_ID \
PLUGIN_ROOT="$plugin_root" \
sh -c "$hook_command" 2>&1)
command_exit=$?
assert_eq "$plugin_name $event_name resolves a plugin root containing spaces" "0" "$command_exit"
assert_eq "$plugin_name $event_name stays silent outside its host" "" "$command_output"
done < <(jq -r '
.hooks
| to_entries[]
| .key as $event
| .value[]
| .hooks[]
| select(.type == "command")
| [$event, .command]
| @tsv
' "$REPO_ROOT/plugins/$plugin_name/hooks/hooks.json")
done

echo ""
echo "=== Results: $PASSED passed, $FAILED failed ==="
Expand Down