Refactor: restructure app architecture, simplify internals, and improve UX

.gitignore

@@ -17,10 +17,14 @@ gen_*
 # OS
 .DS_Store
 
+# Dependencies
+vendor/
+
 # Local config
 .gen/*
 !.gen/skills/
 .claude/
 .mcp.json
 CLAUDE.md
 CLAUDE.local.md
+.autodev/

README.md

@@ -104,16 +104,16 @@ GenCode stores configuration in `~/.gen/`:
 
 ## 📊 Benchmark: GenCode vs Claude Code
 
-Compared with [Claude Code](https://claude.ai/code) v2.1.96 on Apple Silicon, same model (`claude-sonnet-4-20250514`):
+Compared with [Claude Code](https://claude.ai/code) v2.1.112 on Apple Silicon, same model (`claude-sonnet-4-6`):
 
 | Metric | GenCode | Claude Code | Advantage |
 |--------|---------|-------------|-----------|
-| Download size | 12 MB | 62 MB (+ Node.js 112 MB) | **5x smaller** |
-| Disk footprint | 38 MB | 174 MB | **4.6x smaller** |
-| Startup time | ~0.02s | ~0.18s | **9x faster** |
-| Startup memory | ~33 MB | ~185 MB | **5.6x less** |
-| Simple task | ~5.2s / 39 MB | ~11.9s / 282 MB | **2.3x faster, 7.2x less memory** |
-| Tool-use task | ~3.6s / 40 MB | ~14.6s / 281 MB | **4.1x faster, 7.1x less memory** |
+| Download size | 12 MB | 63 MB (+ Node.js 112 MB) | **5x smaller** |
+| Disk footprint | 38 MB | 175 MB | **4.6x smaller** |
+| Startup time | ~0.01s | ~0.20s | **20x faster** |
+| Startup memory | ~32 MB | ~189 MB | **5.8x less** |
+| Simple task | ~2.4s / 39 MB | ~10.4s / 286 MB | **4.3x faster, 7.3x less memory** |
+| Tool-use task | ~3.3s / 39 MB | ~26.0s / 285 MB | **7.9x faster, 7.2x less memory** |
 
 Both tools have comparable features (hooks, skills, plugins, session, MCP, etc.). The performance gap comes from Go's native compilation vs Node.js V8/JIT/GC runtime overhead.
 

cmd/gen/agent.go

@@ -9,13 +9,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/yanmxa/gencode/internal/agent"
-	"github.com/yanmxa/gencode/internal/client"
-	"github.com/yanmxa/gencode/internal/config"
-	"github.com/yanmxa/gencode/internal/runtime"
-	"github.com/yanmxa/gencode/internal/message"
-	"github.com/yanmxa/gencode/internal/provider"
-	"github.com/yanmxa/gencode/internal/system"
+	"github.com/yanmxa/gencode/internal/core"
+	"github.com/yanmxa/gencode/internal/core/system"
+	"github.com/yanmxa/gencode/internal/llm"
+	"github.com/yanmxa/gencode/internal/setting"
+	"github.com/yanmxa/gencode/internal/subagent"
 	"github.com/yanmxa/gencode/internal/tool"
 )
 
@@ -75,16 +73,16 @@ func runHeadlessAgent() error {
 	}()
 
 	// Initialize provider
-	store, _ := provider.NewStore()
+	store, _ := llm.NewStore()
 	if store == nil {
 		return fmt.Errorf("no provider store available")
 	}
 
 	currentModel := store.GetCurrentModel()
-	var llmProvider provider.LLMProvider
+	var llmProvider llm.Provider
 
 	if currentModel != nil {
-		p, err := provider.GetProvider(ctx, currentModel.Provider, currentModel.AuthMethod)
+		p, err := llm.GetProvider(ctx, currentModel.Provider, currentModel.AuthMethod)
 		if err != nil {
 			return fmt.Errorf("failed to connect provider: %w", err)
 		}
@@ -103,12 +101,12 @@ func runHeadlessAgent() error {
 	}
 
 	// Initialize agent registry
-	if err := agent.Initialize(cwd); err != nil {
+	if err := subagent.Initialize(subagent.Options{CWD: cwd}); err != nil {
 		return fmt.Errorf("failed to initialize agent registry: %w", err)
 	}
 
 	// Get agent configuration
-	agentCfg, ok := agent.DefaultRegistry.Get(agentRunOpts.agentType)
+	agentCfg, ok := subagent.Default().Get(agentRunOpts.agentType)
 	if !ok {
 		return fmt.Errorf("unknown agent type: %s", agentRunOpts.agentType)
 	}
@@ -119,68 +117,46 @@ func runHeadlessAgent() error {
 		toolSet.Allow = []string(agentCfg.Tools)
 	}
 
-	// Set up the loop
-	sys := &system.System{
+	sys := system.Build(system.Config{
 		Cwd:   cwd,
-		IsGit: config.IsGitRepo(cwd),
-	}
-
-	loop := &runtime.Loop{
-		Client: &client.Client{
-			Provider:  llmProvider,
-			Model:     modelID,
-			MaxTokens: 16384,
-		},
-		System: sys,
-		Tool:   toolSet,
-	}
+		IsGit: setting.IsGitRepo(cwd),
+	})
 
-	// Add user prompt
-	loop.AddUser(agentRunOpts.prompt, nil)
+	client := llm.NewClient(llmProvider, modelID, 16384)
 
-	// Print status
-	fmt.Printf("Agent: %s\n", agentRunOpts.agentType)
-	fmt.Printf("Prompt: %s\n", agentRunOpts.prompt)
-	fmt.Println("---")
+	schemas := toolSet.Tools()
+	tools := tool.AdaptToolRegistry(schemas, func() string { return cwd })
 
-	// Run turns
 	maxTurns := agentRunOpts.maxTurns
 	if maxTurns <= 0 {
 		maxTurns = 50
 	}
 
-	totalTurns := 0
-	for totalTurns < maxTurns {
-		if ctx.Err() != nil {
-			break
-		}
+	ag := core.NewAgent(core.Config{
+		LLM:      client,
+		System:   sys,
+		Tools:    tools,
+		CWD:      cwd,
+		MaxTurns: maxTurns,
+		OutboxBuf: -1,
+	})
 
-		// Run one turn
-		result, err := loop.Run(ctx, runtime.RunOptions{
-			MaxTurns: 1,
-			OnResponse: func(resp *message.CompletionResponse) {
-				if resp.Content != "" {
-					fmt.Println(resp.Content)
-				}
-			},
-			OnToolStart: func(tc message.ToolCall) bool {
-				fmt.Printf("[%s] %s\n", tc.Name, tc.ID)
-				return true
-			},
-		})
-		totalTurns++
+	ag.Append(ctx, core.UserMessage(agentRunOpts.prompt, nil))
 
-		if err != nil {
-			return fmt.Errorf("agent failed: %w", err)
-		}
+	fmt.Printf("Agent: %s\n", agentRunOpts.agentType)
+	fmt.Printf("Prompt: %s\n", agentRunOpts.prompt)
+	fmt.Println("---")
 
-		// Check for end_turn (agent completed its work)
-		if result.StopReason == "end_turn" {
-			break
-		}
+	result, err := ag.ThinkAct(ctx)
+	if err != nil {
+		return fmt.Errorf("agent failed: %w", err)
+	}
+
+	if result.Content != "" {
+		fmt.Println(result.Content)
 	}
 
-	fmt.Printf("\n---\nDone: %d turns\n", totalTurns)
+	fmt.Printf("\n---\nDone: %d turns, %d tool uses\n", result.Turns, result.ToolUses)
 	return nil
 }
 

cmd/gen/main.go

@@ -12,47 +12,42 @@ import (
 
 	"github.com/yanmxa/gencode/internal/app"
 	"github.com/yanmxa/gencode/internal/log"
-	"github.com/yanmxa/gencode/internal/config"
+	"github.com/yanmxa/gencode/internal/setting"
 	"github.com/yanmxa/gencode/internal/session"
 
 	// Import providers for registration
-	_ "github.com/yanmxa/gencode/internal/provider/alibaba"
-	_ "github.com/yanmxa/gencode/internal/provider/anthropic"
-	_ "github.com/yanmxa/gencode/internal/provider/google"
-	_ "github.com/yanmxa/gencode/internal/provider/moonshot"
-	_ "github.com/yanmxa/gencode/internal/provider/openai"
+	_ "github.com/yanmxa/gencode/internal/llm/alibaba"
+	_ "github.com/yanmxa/gencode/internal/llm/anthropic"
+	_ "github.com/yanmxa/gencode/internal/llm/google"
+	_ "github.com/yanmxa/gencode/internal/llm/moonshot"
+	_ "github.com/yanmxa/gencode/internal/llm/openai"
 )
 
 var version = "1.13.2"
 
 // cliOpts holds all CLI flag values in one place.
 var cliOpts struct {
 	print  string // -p/--print: non-interactive print mode
-	plan   bool
-	cont   bool // --continue
-	resume bool // --resume
+	cont   bool   // --continue
+	resume bool   // --resume
 
-	fork      bool // --fork: fork from continued/resumed session
 	pluginDir string
 }
 
 func init() {
 	// Load .env file if it exists (silent fail if not found)
 	_ = godotenv.Load()
-
 	// Initialize logging (enabled via GEN_DEBUG=1)
 	_ = log.Init()
 
 	// Set app version for session entries.
-	session.AppVersion = version
+	session.SetAppVersion(version)
 
 	// Register flags
 	rootCmd.Flags().StringVarP(&cliOpts.print, "print", "p", "", "Non-interactive print mode with prompt")
-	rootCmd.Flags().BoolVar(&cliOpts.plan, "plan", false, "Enter plan mode")
 	rootCmd.Flags().BoolVarP(&cliOpts.cont, "continue", "c", false, "Resume the most recent session")
 	rootCmd.Flags().BoolVarP(&cliOpts.resume, "resume", "r", false, "Select and resume a previous session")
-	rootCmd.Flags().BoolVar(&cliOpts.fork, "fork", false, "Fork from the continued/resumed session into a new session")
-	rootCmd.Flags().StringVar(&cliOpts.pluginDir, "plugin-dir", "", "Load plugins from a specific directory")
+	rootCmd.PersistentFlags().StringVar(&cliOpts.pluginDir, "plugin-dir", "", "Load plugins from a specific directory")
 
 	// Register subcommands
 	rootCmd.AddCommand(versionCmd)
@@ -95,17 +90,15 @@ Non-interactive mode:
 
 		prompt := strings.Join(args, " ")
 
-		opts := config.RunOptions{
+		opts := setting.RunOptions{
 			Print:     printPrompt,
 			Prompt:    prompt,
 			PluginDir: cliOpts.pluginDir,
-			PlanMode:  cliOpts.plan,
 			Continue:  cliOpts.cont,
 			Resume:    cliOpts.resume,
 			ResumeID:  resumeID,
-			Fork:      cliOpts.fork,
 		}
-		if err := app.RunWithOptions(opts); err != nil {
+		if err := app.Run(opts); err != nil {
 			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 			os.Exit(1)
 		}
@@ -159,14 +152,11 @@ Print Mode (non-interactive):
 Interactive Mode:
   gen                        Start chat
   gen "Explain this code"    Start chat with initial prompt
-  gen --plan "design login"  Start in plan mode
 
 Session:
   gen -c, --continue         Resume the most recent session
   gen -r, --resume           Select and resume a previous session
   gen -r <session-id>        Resume a specific session by ID
-  gen -c --fork              Fork the most recent session into a new one
-  gen -r --fork              Select a session and fork it
   gen --plugin-dir <path>    Load plugins from a specific directory
 
 Commands:
@@ -192,7 +182,6 @@ Examples:
   gen                        Start interactive chat
   gen "Explain this code"    Interactive with initial prompt
   gen -p "Explain this code" Print response and exit
-  gen --plan "design login"  Plan mode
   gen -c                     Resume previous session
   gen version                Show version
 

cmd/gen/mcp.go

@@ -8,8 +8,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/yanmxa/gencode/internal/app/mcpui"
-	appmemory "github.com/yanmxa/gencode/internal/app/memory"
+	"github.com/yanmxa/gencode/internal/app/kit"
 	"github.com/yanmxa/gencode/internal/mcp"
 )
 
@@ -102,18 +101,18 @@ Examples:
 				return fmt.Errorf("%s transport requires a URL: gen mcp add --transport %s <name> <url>", mcpTransport, mcpTransport)
 			}
 			config.URL = args[1]
-			config.Headers = parseKeyValues(mcpHeaders, ":")
+			config.Headers = mcp.ParseKeyValues(mcpHeaders, ":")
 
 		default:
 			return fmt.Errorf("unsupported transport type: %s", mcpTransport)
 		}
 
-		config.Env = parseKeyValues(mcpEnvVars, "=")
+		config.Env = mcp.ParseKeyValues(mcpEnvVars, "=")
 
 		// Save configuration
 		cwd, _ := os.Getwd()
 		loader := mcp.NewConfigLoader(cwd)
-		scope := parseScope(mcpScope)
+		scope := mcp.ParseScope(mcpScope)
 
 		if err := loader.SaveServer(name, config, scope); err != nil {
 			return fmt.Errorf("failed to save server: %w", err)
@@ -143,7 +142,7 @@ Example:
 
 		cwd, _ := os.Getwd()
 		loader := mcp.NewConfigLoader(cwd)
-		scope := parseScope(mcpScope)
+		scope := mcp.ParseScope(mcpScope)
 
 		if err := loader.SaveServer(name, config, scope); err != nil {
 			return fmt.Errorf("failed to save server: %w", err)
@@ -162,16 +161,16 @@ var mcpEditCmd = &cobra.Command{
 		name := args[0]
 		cwd, _ := os.Getwd()
 
-		if err := mcp.Initialize(cwd); err != nil {
+		if err := mcp.Initialize(mcp.Options{CWD: cwd}); err != nil {
 			return fmt.Errorf("failed to load MCP configs: %w", err)
 		}
 
-		info, err := mcpui.PrepareServerEdit(name)
+		info, err := mcp.Default().EditConfig(name)
 		if err != nil {
 			return err
 		}
 
-		editor := appmemory.GetEditor()
+		editor := kit.GetEditor()
 		editorCmd := exec.Command(editor, info.TempFile)
 		editorCmd.Stdin = os.Stdin
 		editorCmd.Stdout = os.Stdout
@@ -182,7 +181,7 @@ var mcpEditCmd = &cobra.Command{
 			return fmt.Errorf("editor failed: %w", err)
 		}
 
-		if err := mcpui.ApplyServerEdit(info); err != nil {
+		if err := mcp.Default().SaveConfig(info); err != nil {
 			return err
 		}
 
@@ -280,27 +279,3 @@ var mcpRemoveCmd = &cobra.Command{
 	},
 }
 
-func parseScope(s string) mcp.Scope {
-	switch strings.ToLower(s) {
-	case "user", "global":
-		return mcp.ScopeUser
-	case "project":
-		return mcp.ScopeProject
-	default:
-		return mcp.ScopeLocal
-	}
-}
-
-// parseKeyValues parses a slice of "key=value" or "key:value" strings into a map
-func parseKeyValues(items []string, sep string) map[string]string {
-	if len(items) == 0 {
-		return nil
-	}
-	result := make(map[string]string, len(items))
-	for _, item := range items {
-		if key, value, ok := strings.Cut(item, sep); ok {
-			result[strings.TrimSpace(key)] = strings.TrimSpace(value)
-		}
-	}
-	return result
-}