Merge branch 'main' into copilot/support-restarting-shell

Author: swissspidy

.github/workflows/copilot-setup-steps.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Check existence of composer.json file
         id: check_composer_file

features/shell.feature

@@ -97,3 +97,20 @@ Feature: WordPress REPL
       """
       exit
       """
+
+  Scenario: Input starting with dash
+    Given a WP install
+    And a session file:
+      """
+      -1
+      """
+
+    When I run `wp shell --basic < session`
+    Then STDOUT should contain:
+      """
+      int(-1)
+      """
+    And STDERR should not contain:
+      """
+      history: -1: invalid option
+      """

src/WP_CLI/Shell/REPL.php

@@ -169,7 +169,7 @@ private static function create_prompt_cmd( $prompt, $history_path ) {
 			. 'LINE=""; '
 			. "read -re -p {$prompt} LINE; "
 			. '[ $? -eq 0 ] || exit; '
-			. 'history -s "$LINE"; '
+			. 'history -s -- "$LINE"; '
 			. "history -w {$history_path}; "
 			. 'echo $LINE; ';