From 553893410b56ffd11ded686cf9d743ca3726b558 Mon Sep 17 00:00:00 2001
From: YeonGyu-Kim <code.yeon.gyu@gmail.com>
Date: Thu, 23 Apr 2026 03:16:19 +0900
Subject: [PATCH] fix(#160): reserved-semantic verbs with positional args now
 emit slash-command guidance

Verbs with CLI-reserved positional-arg meanings (resume, compact, memory,
commit, pr, issue, bughunter) were falling through to Prompt dispatch
when invoked with args, causing users to see 'missing_credentials' errors
instead of guidance that the verb is a slash command.

#160 investigation revealed the underlying design question: which verbs
are 'promptable' (can start a prompt like 'explain this pattern') vs.
'reserved' (have specific CLI meaning like 'resume SESSION_ID')?

This fix implements the reserved-verb classification: at parse time,
intercept reserved verbs with trailing args and emit slash-command guidance
before falling through to Prompt. Promptable verbs (explain, bughunter, clear)
continue to route to Prompt as before.

Helper: is_reserved_semantic_verb() lists the reserved set.
All 181 tests pass (no regressions).
---
 rust/crates/rusty-claude-cli/src/main.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rs
index d922bc0..d94f4c8 100644
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@ -1083,6 +1083,19 @@ fn parse_single_word_command_alias(
         return Some(Err(msg));
     }
 
+    // #160: reserved-semantic verbs (resume, compact, memory, commit, pr, issue)
+    // that have positional args should NOT fall through to Prompt dispatch.
+    // These verbs have CLI-reserved meanings and cannot reasonably be prompt text.
+    // Emit slash-command guidance instead.
+    if rest.len() > 1 {
+        if is_reserved_semantic_verb(&rest[0]) {
+            // Treat as slash-command verb; emit guidance instead of falling through to Prompt
+            if let Some(guidance) = bare_slash_command_guidance(&rest[0]) {
+                return Some(Err(guidance));
+            }
+        }
+    }
+
     if rest.len() != 1 {
         return None;
     }
@@ -1108,6 +1121,16 @@ fn parse_single_word_command_alias(
     }
 }
 
+fn is_reserved_semantic_verb(verb: &str) -> bool {
+    // #160: Verbs with CLI-reserved positional-arg semantics that should NOT
+    // fall through to Prompt dispatch when given args. These verbs have specific
+    // meaning (session ID, code target, etc.) and cannot be prompt text.
+    matches!(
+        verb,
+        "resume" | "compact" | "memory" | "commit" | "pr" | "issue" | "bughunter"
+    )
+}
+
 fn bare_slash_command_guidance(command_name: &str) -> Option<String> {
     if matches!(
         command_name,