docs: optimize printing information

Author: zhufuyi

cmd/sponge/commands/assistant/common.go

@@ -512,7 +512,7 @@ func deleteGenFiles(files []string, assistantType string) {
 	}
 
 	if len(doneFiles) > 0 {
-		fmt.Printf("Clean up code files generated by [%s] assistant:\n", assistantType)
+		fmt.Printf("Removed temporary files generated by AI Assistant (%s):\n", assistantType)
 		for _, file := range doneFiles {
 			fmt.Printf("    %s\n", color.HiGreenString(cutFilePath(file)))
 		}

cmd/sponge/commands/assistant/generate.go

@@ -161,8 +161,11 @@ func (g *assistantGenerator) generateCode() error {
 	}
 	workerPool.Start()
 
-	fmt.Printf("\n[INFO] Detected %s files for code generation. Processing concurrently with %s AI assistants (%s).\n\n",
-		color.HiCyanString(strconv.Itoa(fileCount)), color.HiCyanString(strconv.Itoa(g.maxAssistantNum)), g.asst.model)
+	fmt.Printf("\n%s [INFO] Detected %s files for code generation. Processing concurrently with %s AI assistants (%s).\n\n",
+		time.Now().Format(time.DateTime),
+		color.HiCyanString(strconv.Itoa(fileCount)),
+		color.HiCyanString(strconv.Itoa(g.maxAssistantNum)),
+		g.asst.model)
 
 	jobID := 0
 
@@ -235,7 +238,8 @@ func (g *assistantGenerator) generateCode() error {
 				newFiles = append(newFiles, cutFilePath(newFile))
 				outputFiles = append(outputFiles, newFile)
 			}
-			l := fmt.Sprintf("\n[SUCCESS] Job %s - File: [%s] | Functions: [%s] | Output: [%s] | Time: %s\n",
+			l := fmt.Sprintf("\n%s [SUCCESS] Job %s - File: [%s] | Functions: [%s] | Output: [%s] | Time: %s\n",
+				time.Now().Format(time.DateTime),
 				color.HiCyanString(strconv.Itoa(reply.JobID)),
 				color.HiCyanString(cutFilePath(reply.SrcFile)),
 				color.HiCyanString(strings.Join(reply.Functions, ", ")),
@@ -271,7 +275,7 @@ func (g *assistantGenerator) generateCode() error {
 	}
 
 	if len(outputFiles) > 0 {
-		fmt.Println("Files Output by Successful Jobs:")
+		fmt.Println("Output Files:")
 		for _, file := range outputFiles {
 			fmt.Printf("    • %s\n", color.HiGreenString(cutFilePath(file)))
 		}
@@ -316,7 +320,8 @@ func (t *assistantTask) Execute(ctx context.Context) (interface{}, error) {
 		return taskReply, nil
 	}
 
-	fmt.Printf("[START] Job %s - File: [%s] | Functions: [%s]\n\n",
+	fmt.Printf("%s [START] Job %s - File: [%s] | Functions: [%s]\n\n",
+		time.Now().Format(time.DateTime),
 		color.HiCyanString(strconv.Itoa(t.jobID)),
 		color.HiCyanString(cutFilePath(t.file)),
 		color.HiCyanString(strings.Join(t.funcNames, ", ")),

cmd/sponge/commands/assistant/merge.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
@@ -27,14 +28,15 @@ func MergeAssistantCode() *cobra.Command {
 		Use:   "merge",
 		Short: "Merge AI assistant generated code into source Go file",
 		Long:  "Merge AI assistant generated code into source Go file.",
-		Example: color.HiBlackString(`  # Merge deepseek generated code into source Go file in specified directory
+		Example: color.HiBlackString(`  # Merge DeepSeek-generated code into Go source files under the specified directory
   sponge assistant merge --type=deepseek --dir=/path/to/directory
 
-  # Merge chatgpt generated code into source Go file in specified directory
-  sponge assistant merge --type=chatgpt --dir=/path/to/directory
+  # Merge ChatGPT-generated code into the specified Go source file
+  sponge assistant merge --type=chatgpt --dir=/path/to/xxx.go
 
-  # Merge gemini generated code into source Go file in specified directory
-  sponge assistant merge --type=gemini --dir=/path/to/directory`),
+  # Merge Gemini-generated code into Go source files under the specified directory,
+  # and remove assistant-generated code after the merge
+  sponge assistant merge --type=gemini --dir=/path/to/directory --is-clean=true`),
 		SilenceErrors: true,
 		SilenceUsage:  true,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -72,7 +74,8 @@ func MergeAssistantCode() *cobra.Command {
 			var deleteFiles []string
 			backupDir := getBackupDir()
 			if len(mergeCodes) > 0 {
-				fmt.Printf("Merged to Go files:\n")
+				fmt.Printf("Merged Time: %s\n\n", time.Now().Format(time.DateTime))
+				fmt.Printf("Merged Files:\n")
 				for srcFile, code := range mergeCodes {
 					backupFile(srcFile, backupDir)
 					if err = os.WriteFile(srcFile, []byte(code), 0666); err != nil {
@@ -90,7 +93,7 @@ func MergeAssistantCode() *cobra.Command {
 			}
 
 			if len(mergeCodes) > 0 {
-				fmt.Printf("\n[Tip] You can view the pre-merge Go code files here:\n    %s\n\n", backupDir)
+				fmt.Printf("\n[Tip] Backed up Go files, you can restore the pre merge Go code from here:\n    %s\n\n", backupDir)
 			}
 
 			return nil
@@ -99,8 +102,8 @@ func MergeAssistantCode() *cobra.Command {
 
 	cmd.Flags().StringVarP(&assistantType, "type", "t", "", "assistant type, supported types: chatgpt, deepseek, gemini")
 	_ = cmd.MarkFlagRequired("type")
-	cmd.Flags().StringVarP(&dir, "dir", "d", ".", "input directory")
-	cmd.Flags().StringSliceVarP(&files, "file", "f", nil, "specified Go files")
+	cmd.Flags().StringVarP(&dir, "dir", "d", "", "go project directory")
+	cmd.Flags().StringSliceVarP(&files, "file", "f", nil, "specified Go files or generated assistant code files")
 	cmd.Flags().BoolVarP(&isClean, "is-clean", "c", false, "clean up assistant generated code after merge")
 
 	return cmd
@@ -116,8 +119,8 @@ type mergeParams struct {
 func (m *mergeParams) parseAssistantFiles() (map[string]string, error) {
 	fileMap := make(map[string]string) // srcFile -> genFile
 
-	for _, genFile := range m.specifiedFiles {
-		srcFile, ok := m.getSourceFile(genFile)
+	for _, file := range m.specifiedFiles {
+		srcFile, genFile, ok := m.getGoAndMDFile(file, m.assistantType)
 		if ok {
 			fileMap[srcFile] = genFile
 		}
@@ -152,6 +155,30 @@ func (m *mergeParams) getSourceFile(file string) (string, bool) {
 	return "", false
 }
 
+func (m *mergeParams) getGoAndMDFile(file string, assistantType string) (goFile string, mdFile string, ok bool) {
+	if strings.HasSuffix(file, ".go") {
+		goFile = file
+		mdFile = file + "." + assistantType + ".md"
+		if gofile.IsExists(mdFile) {
+			ok = true
+		} else {
+			ok = false
+		}
+		return goFile, mdFile, ok
+	} else if strings.HasSuffix(file, getAssistantSuffixed(m.assistantType)) {
+		mdFile = file
+		goFile = strings.TrimSuffix(file, getAssistantSuffixed(m.assistantType)) + ".go"
+		if gofile.IsExists(goFile) {
+			ok = true
+		} else {
+			ok = false
+		}
+		return goFile, mdFile, ok
+	}
+
+	return "", "", false
+}
+
 func (m *mergeParams) mergeGoFile(srcFile string, genFile string) (string, error) {
 	srcCode, err := os.ReadFile(srcFile)
 	if err != nil {