fix(console): align help suggestions with demo mode

Author: 404tk

runner/console/completer.go

@@ -54,19 +54,19 @@ func completeForMode(d prompt.Document, mode HelpMode) []prompt.Suggest {
 	case HelpModeProvider:
 		return providerSuggestions(ctx, args, word)
 	case HelpModeShell:
-		return shellSuggestions(args, word)
+		return shellSuggestions(ctx, args, word)
 	default:
-		return rootSuggestions(args, word)
+		return rootSuggestions(ctx, args, word)
 	}
 }
 
-func rootSuggestions(args []string, word string) []prompt.Suggest {
+func rootSuggestions(ctx CompletionContext, args []string, word string) []prompt.Suggest {
 	if len(args) <= 1 {
-		return prompt.FilterHasPrefix(rootCommandSuggestions, word, true)
+		return prompt.FilterHasPrefix(commandSuggestionsForContext(ctx), word, true)
 	}
 	switch args[0] {
 	case "help":
-		return helpSuggestions(args, word)
+		return helpSuggestions(ctx, args, word)
 	case "use":
 		if len(args) == 2 {
 			return prompt.FilterContains(modules, word, true)
@@ -81,14 +81,11 @@ func rootSuggestions(args []string, word string) []prompt.Suggest {
 
 func providerSuggestions(ctx CompletionContext, args []string, word string) []prompt.Suggest {
 	if len(args) <= 1 {
-		if ctx.DemoReplay {
-			return prompt.FilterHasPrefix(mockCommandSuggestions(), word, true)
-		}
-		return prompt.FilterHasPrefix(providerCommandSuggestionsData, word, true)
+		return prompt.FilterHasPrefix(commandSuggestionsForContext(ctx), word, true)
 	}
 	switch args[0] {
 	case "help":
-		return helpSuggestions(args, word)
+		return helpSuggestions(ctx, args, word)
 	case "use":
 		if len(args) == 2 {
 			return prompt.FilterContains(modules, word, true)
@@ -107,13 +104,13 @@ func providerSuggestions(ctx CompletionContext, args []string, word string) []pr
 	return []prompt.Suggest{}
 }
 
-func shellSuggestions(args []string, word string) []prompt.Suggest {
+func shellSuggestions(ctx CompletionContext, args []string, word string) []prompt.Suggest {
 	if len(args) <= 1 {
-		return prompt.FilterHasPrefix(shellCommandSuggestions, word, true)
+		return prompt.FilterHasPrefix(commandSuggestionsForContext(ctx), word, true)
 	}
 	switch args[0] {
 	case "help":
-		return helpSuggestions(args, word)
+		return helpSuggestions(ctx, args, word)
 	}
 	return []prompt.Suggest{}
 }
@@ -163,19 +160,20 @@ func completionArgs(d prompt.Document) []string {
 	return args
 }
 
-func helpSuggestions(args []string, word string) []prompt.Suggest {
+func helpSuggestions(ctx CompletionContext, args []string, word string) []prompt.Suggest {
 	if len(args) == 2 {
-		return prompt.FilterContains(helpTopicSuggestions(), word, true)
+		return prompt.FilterContains(helpTopicSuggestions(ctx), word, true)
 	}
 	if len(args) == 3 && (args[1] == "payload" || args[1] == "metadata") {
 		return prompt.FilterContains(payloadSuggestions(), word, true)
 	}
 	return []prompt.Suggest{}
 }
 
-func helpTopicSuggestions() []prompt.Suggest {
-	suggestions := make([]prompt.Suggest, 0, len(helpTopicOrder))
-	for _, key := range helpTopicOrder {
+func helpTopicSuggestions(ctx CompletionContext) []prompt.Suggest {
+	keys := helpTopicKeysForContext(ctx)
+	suggestions := make([]prompt.Suggest, 0, len(keys))
+	for _, key := range keys {
 		if topic, ok := helpTopics[key]; ok {
 			suggestions = append(suggestions, prompt.Suggest{
 				Text:        key,
@@ -186,6 +184,36 @@ func helpTopicSuggestions() []prompt.Suggest {
 	return suggestions
 }
 
+func helpTopicKeysForContext(ctx CompletionContext) []string {
+	keys := make([]string, 0, len(helpTopicOrder))
+	seen := make(map[string]struct{}, len(helpTopicOrder))
+
+	appendKey := func(key string) {
+		if _, ok := helpTopics[key]; !ok {
+			return
+		}
+		if _, ok := seen[key]; ok {
+			return
+		}
+		seen[key] = struct{}{}
+		keys = append(keys, key)
+	}
+
+	for _, key := range commandNamesForContext(ctx.Mode, ctx.DemoReplay) {
+		appendKey(key)
+	}
+	if ctx.Mode == HelpModeProvider && ctx.DemoReplay {
+		appendKey("demo")
+	}
+	appendKey("payload")
+	appendKey("metadata")
+
+	for _, key := range helpTopicOrder {
+		appendKey(key)
+	}
+	return keys
+}
+
 func optionSuggestions(ctx CompletionContext) []prompt.Suggest {
 	keys := []string{utils.Payload, utils.Metadata}
 	seen := map[string]struct{}{

runner/console/completion_data.go

@@ -46,28 +46,28 @@ var commandSuggestionDescriptions = map[string]string{
 	"shell": "open an authorized instance shell",
 }
 
-var rootCommandSuggestions = buildCommandSuggestions([]string{
+var rootCommandNames = []string{
 	"help",
 	"use",
 	"sessions",
 	"note",
 	"clear",
 	"exit",
-})
+}
 
-var shellCommandSuggestions = buildCommandSuggestions([]string{
+var shellCommandNames = []string{
 	"help",
 	"clear",
 	"exit",
-})
+}
 
 var sessionsCommandSuggestions = []prompt.Suggest{
 	{Text: "-i", Description: "interact with a cached session by ID"},
 	{Text: "-k", Description: "delete a cached session by ID"},
 	{Text: "-c", Description: "check one cached session or all sessions"},
 }
 
-var providerCommandSuggestionsData = buildCommandSuggestions([]string{
+var providerCommandNames = []string{
 	"help",
 	"show",
 	"set",
@@ -79,7 +79,7 @@ var providerCommandSuggestionsData = buildCommandSuggestions([]string{
 	"use",
 	"clear",
 	"exit",
-})
+}
 
 var showTopicSuggestionsData = []prompt.Suggest{
 	{Text: "options", Description: "display provider configuration"},
@@ -191,6 +191,7 @@ func completionContextForMode(mode HelpMode) CompletionContext {
 		ctx.Provider = ""
 		ctx.Payload = ""
 		ctx.InstanceID = ""
+		ctx.DemoReplay = false
 	case HelpModeShell:
 		if ctx.Payload == "" {
 			ctx.Payload = "instance-cmd-check"
@@ -211,17 +212,44 @@ func buildCommandSuggestions(commands []string) []prompt.Suggest {
 	return suggestions
 }
 
-func mockCommandSuggestions() []prompt.Suggest {
-	return buildCommandSuggestions([]string{
-		"help",
-		"show",
-		"set",
-		"run",
-		"shell",
-		"note",
-		"clear",
-		"exit",
-	})
+func commandNamesForContext(mode HelpMode, demoReplay bool) []string {
+	switch mode {
+	case HelpModeProvider:
+		return providerCommandNamesForState(demoReplay)
+	case HelpModeShell:
+		return append([]string(nil), shellCommandNames...)
+	default:
+		return append([]string(nil), rootCommandNames...)
+	}
+}
+
+func providerCommandNamesForState(demoReplay bool) []string {
+	if !demoReplay {
+		return append([]string(nil), providerCommandNames...)
+	}
+
+	names := make([]string, 0, len(providerCommandNames))
+	for _, name := range providerCommandNames {
+		switch name {
+		case "demo", "note", "use":
+			continue
+		}
+		names = append(names, name)
+	}
+	return names
+}
+
+func commandSuggestionsForContext(ctx CompletionContext) []prompt.Suggest {
+	return buildCommandSuggestions(commandNamesForContext(ctx.Mode, ctx.DemoReplay))
+}
+
+func commandAvailable(mode HelpMode, demoReplay bool, command string) bool {
+	for _, name := range commandNamesForContext(mode, demoReplay) {
+		if name == command {
+			return true
+		}
+	}
+	return false
 }
 
 func noteSuggestions(args []string, word string) []prompt.Suggest {

runner/console/help_topics.go

@@ -445,6 +445,9 @@ func renderProviderHelp(ctx HelpContext) {
 		required = []string{"No provider is currently selected."}
 	}
 	writeLines(&b, "Required options:", required)
+	writeLines(&b, "Available commands:", []string{
+		commandListSummary(HelpModeProvider, ctx.DemoReplay),
+	})
 	writeLines(&b, "Next recommended commands:", providerRecommendedCommands(ctx))
 	writeLines(&b, "Responsible use:", []string{
 		"Validate only in owned, lab, or explicitly authorized environments.",
@@ -614,6 +617,9 @@ func providerRequiredOptionLines() []string {
 }
 
 func providerRecommendedCommands(ctx HelpContext) []string {
+	canExit := commandAvailable(HelpModeProvider, ctx.DemoReplay, "exit")
+	canDemo := commandAvailable(HelpModeProvider, ctx.DemoReplay, "demo")
+
 	if config == nil {
 		return []string{
 			"use <provider>",
@@ -632,13 +638,13 @@ func providerRecommendedCommands(ctx HelpContext) []string {
 	}
 	if len(missing) > 0 {
 		commands := []string{"show options"}
-		if ctx.DemoReplay {
+		if canExit {
 			commands = append(commands, "exit")
 		}
 		for _, key := range missing {
 			commands = append(commands, fmt.Sprintf("set %s <value>", key))
 		}
-		if !ctx.DemoReplay {
+		if canDemo {
 			commands = append(commands, "demo")
 		}
 		commands = append(commands,
@@ -653,10 +659,10 @@ func providerRecommendedCommands(ctx HelpContext) []string {
 		"set payload <payload-name>",
 		"help payload <payload-name>",
 	}
-	if ctx.DemoReplay {
+	if canExit {
 		commands = append([]string{"exit"}, commands...)
 	}
-	if !ctx.DemoReplay {
+	if canDemo {
 		commands = append(commands, "demo")
 	}
 	if ctx.Payload == "instance-cmd-check" {
@@ -731,6 +737,10 @@ func demoReplayStatus(enabled bool) string {
 	return "disabled"
 }
 
+func commandListSummary(mode HelpMode, demoReplay bool) string {
+	return strings.Join(commandNamesForContext(mode, demoReplay), ", ")
+}
+
 func providerHelpModeLabel(ctx HelpContext) string {
 	if ctx.DemoReplay {
 		return "provider[mock]"