Update version to v1.4.180 and commit

chore: Fix user input handling when using raw mode and `--strategy` flag

core/chatter.go

@@ -192,17 +192,19 @@ func (o *Chatter) BuildSession(request *common.ChatRequest, raw bool) (session *
 	}
 
 	if raw {
-		if request.Message != nil {
-			if systemMessage != "" {
-				request.Message.Content = systemMessage
-				// system contains pattern which contains user input
+		// In raw mode, combine system message (potentially with strategy) and user message into a single user message
+		if systemMessage != "" {
+			if request.Message != nil {
+				// Prepend system message to user content, ensuring user input is preserved
+				request.Message.Content = fmt.Sprintf("%s\n\n%s", systemMessage, request.Message.Content)
+				request.Message.Role = goopenai.ChatMessageRoleUser // Ensure role is User in raw mode
+			} else {
+				// If no user message, create one with the system content, marked as User role
+				request.Message = &goopenai.ChatCompletionMessage{Role: goopenai.ChatMessageRoleUser, Content: systemMessage}
 			}
-		} else {
-			if systemMessage != "" {
-				request.Message = &goopenai.ChatCompletionMessage{Role: goopenai.ChatMessageRoleSystem, Content: systemMessage}
-			}
-		}
+		} // else: no system message, user message (if any) remains unchanged
 	} else {
+		// Not raw mode, append system message separately if it exists
 		if systemMessage != "" {
 			session.Append(&goopenai.ChatCompletionMessage{Role: goopenai.ChatMessageRoleSystem, Content: systemMessage})
 		}

core/plugin_registry.go

@@ -149,7 +149,7 @@ func (o *PluginRegistry) Setup() (err error) {
 			return vendor
 		})...)
 
-	groupsPlugins.AddGroupItems("Tools", o.Defaults, o.PatternsLoader, o.YouTube, o.Language, o.Jina, o.Strategies)
+	groupsPlugins.AddGroupItems("Tools", o.Defaults, o.Jina, o.Language, o.PatternsLoader, o.Strategies, o.YouTube)
 
 	for {
 		groupsPlugins.Print()

nix/pkgs/fabric/version.nix

@@ -1 +1 @@
-"1.4.178"
+"1.4.180"

plugins/ai/vendors.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"sort"
+	"strings"
 	"sync"
 
 	"github.com/danielmiessler/fabric/plugins"
@@ -95,6 +97,9 @@ func (o *VendorsManager) readModels() (err error) {
 		if result.err != nil {
 			fmt.Println(result.vendorName, result.err)
 		} else {
+			sort.Slice(result.models, func(i, j int) bool {
+				return strings.ToLower(result.models[i]) < strings.ToLower(result.models[j])
+			})
 			o.Models.AddGroupItems(result.vendorName, result.models...)
 		}
 	}

plugins/template/extension_executor.go

@@ -117,8 +117,12 @@ func (e *ExtensionExecutor) executeWithFile(cmd *exec.Cmd, ext *ExtensionDefinit
 	// Create context with timeout
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
+	// Store the original environment
+	originalEnv := cmd.Env
+	// Create a new command with context. This might reset Env, depending on the Go version.
 	cmd = exec.CommandContext(ctx, cmd.Path, cmd.Args[1:]...)
-	cmd.Env = cmd.Env
+	// Restore the environment variables explicitly
+	cmd.Env = originalEnv
 
 	fileConfig := ext.GetFileConfig()
 	if fileConfig == nil {

version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v1.4.178"
+var version = "v1.4.180"