From 1e8f23d47117b541a80cf331400fde9341d3693d Mon Sep 17 00:00:00 2001 From: Jean Mertz Date: Thu, 19 Mar 2026 09:08:57 +0100 Subject: [PATCH] build: Fix arg handling in just recipes The `commit` and `rfd-this` just recipes were missing the `elif [ -n "$args" ]` branch, leaving them unable to handle the case where positional arguments are provided without a leading `-`. Both recipes now match the `stage` recipe's behavior. Additionally, the `stage` recipe was joining the default message and user-provided context with a single space. This has been updated to use `\n\n` for proper paragraph separation, and the same separator is now used consistently across all three recipes. Also adds `/.jp/conversations/.trash` to `.gitignore` and removes a stale conversation directory exception. Signed-off-by: Jean Mertz --- .gitignore | 2 +- .../events.json | 1 - .../events.json | 1 - .../events.json | 1 - .../events.json | 1 - .../events.json | 1 - justfile | 8 ++++++-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0f9fdfbe..f759e8b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /.jp/**/QUERY_MESSAGE.md +/.jp/conversations/.trash # Conversations, until encrypted. # /.jp/conversations/* -!/.jp/conversations/17462040864/ # Rust specific **/target diff --git a/.jp/conversations/17727391057-managing-jp-conversations-in-git-worktrees/events.json b/.jp/conversations/17727391057-managing-jp-conversations-in-git-worktrees/events.json index e12db944..a5f871cd 100644 --- a/.jp/conversations/17727391057-managing-jp-conversations-in-git-worktrees/events.json +++ b/.jp/conversations/17727391057-managing-jp-conversations-in-git-worktrees/events.json @@ -1294,7 +1294,6 @@ }, "style": { "code": { - "theme": "base16-mocha.dark", "color": true, "line_numbers": false, "file_link": "osc8", diff --git a/.jp/conversations/17727484633-preventing-rfd-summary-regeneration-churn/events.json b/.jp/conversations/17727484633-preventing-rfd-summary-regeneration-churn/events.json index 6b929102..b3a51501 100644 --- a/.jp/conversations/17727484633-preventing-rfd-summary-regeneration-churn/events.json +++ b/.jp/conversations/17727484633-preventing-rfd-summary-regeneration-churn/events.json @@ -1215,7 +1215,6 @@ }, "style": { "code": { - "theme": "base16-mocha.dark", "color": true, "line_numbers": false, "file_link": "osc8", diff --git a/.jp/conversations/17727496665-rfd-index-mobile-responsiveness/events.json b/.jp/conversations/17727496665-rfd-index-mobile-responsiveness/events.json index 1d0ea948..d8d9b78b 100644 --- a/.jp/conversations/17727496665-rfd-index-mobile-responsiveness/events.json +++ b/.jp/conversations/17727496665-rfd-index-mobile-responsiveness/events.json @@ -1215,7 +1215,6 @@ }, "style": { "code": { - "theme": "base16-mocha.dark", "color": true, "line_numbers": false, "file_link": "osc8", diff --git a/.jp/conversations/17727523543-vitepress-syntax-highlighting-for-wit-and-abnf/events.json b/.jp/conversations/17727523543-vitepress-syntax-highlighting-for-wit-and-abnf/events.json index d2ef8c75..21139827 100644 --- a/.jp/conversations/17727523543-vitepress-syntax-highlighting-for-wit-and-abnf/events.json +++ b/.jp/conversations/17727523543-vitepress-syntax-highlighting-for-wit-and-abnf/events.json @@ -1215,7 +1215,6 @@ }, "style": { "code": { - "theme": "base16-mocha.dark", "color": true, "line_numbers": false, "file_link": "osc8", diff --git a/.jp/conversations/17732257364-stack-overflow-in-recursive-path-test-on-windows/events.json b/.jp/conversations/17732257364-stack-overflow-in-recursive-path-test-on-windows/events.json index a786a85f..fe4768ca 100644 --- a/.jp/conversations/17732257364-stack-overflow-in-recursive-path-test-on-windows/events.json +++ b/.jp/conversations/17732257364-stack-overflow-in-recursive-path-test-on-windows/events.json @@ -1579,7 +1579,6 @@ }, "style": { "code": { - "theme": "base16-mocha.dark", "color": true, "line_numbers": false, "file_link": "osc8", diff --git a/justfile b/justfile index f332e313..7493cb08 100644 --- a/justfile +++ b/justfile @@ -86,6 +86,8 @@ commit *ARGS: _install-jp if starts_with "-- " "$@"; then elif starts_with "-" "$@" && ! contains "-- " "$@"; then args="$* -- $msg" + elif [ -n "$args" ]; then + args="$msg\n\n Here is additional context: $args" elif [ -z "$args" ]; then args="$msg" fi @@ -107,7 +109,7 @@ stage *ARGS: _install-jp elif starts_with "-" "$@" && ! contains "-- " "$@"; then args="$* -- $msg" elif [ -n "$args" ]; then - args="$msg Here is additional context: $args" + args="$msg\n\n Here is additional context: $args" elif [ -z "$args" ]; then args="$msg" fi @@ -136,13 +138,15 @@ profile-heap *ARGS: rfd-this *ARGS: _install-jp #!/usr/bin/env sh args="$@" - msg="I gave you the RFD skill, use it to codify all that we just discussed and concluded in a feature request RFD" + msg="I gave you the RFD skill, use it to codify all that we just discussed and concluded in a feature request RFD." starts_with() { case $2 in "$1"*) true;; *) false;; esac; } contains() { case $2 in *"$1"*) true;; *) false;; esac; } if starts_with "-- " "$@"; then elif starts_with "-" "$@" && ! contains "-- " "$@"; then args="$* -- $msg" + elif [ -n "$args" ]; then + args="$msg\n\n Here is additional context: $args" elif [ -z "$args" ]; then args="$msg" fi