fix(terminal): improve terminal dimensions and fit timing

Use min-height:0 on xterm-wrapper (flex child) instead of height:100%
to properly fill available space in flex layout. Add delayed fit()
calls after initialization to let the layout stabilize before
calculating terminal cell dimensions.

💘 Generated with Crush

Assisted-by: GLM-5.1 via Crush <crush@charm.land>

.gitea/workflows/ci-main.yml

@@ -170,7 +170,7 @@ jobs:
 
       - name: Commit changelog
         env:
-          GITEA_TOKEN: ${{ secrets.GITEATOKEN }}
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
           git config user.name "CI Bot"
           git config user.email "ci@legion-muyue.fr"
@@ -181,30 +181,45 @@ jobs:
 
       - name: Create release
         env:
-          GITEA_TOKEN: ${{ secrets.GITEATOKEN }}
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
+          set -ex
           if [ -z "$GITEA_TOKEN" ]; then
-            echo "Warning: GITEATOKEN not set, skipping release"
-            exit 0
+            echo "Error: GITEA_TOKEN secret is not set"
+            exit 1
           fi
           VERSION=${{ steps.version.outputs.version }}
           API="${{ github.server_url }}/api/v1/repos/${{ github.repository }}/releases"
-          BODY=$(cat /tmp/stable_changelog.md)
-          RESPONSE=$(curl -s -X POST "${API}" \
+          echo "Creating release ${VERSION} at ${API}"
+
+          EXISTING=$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" "${API}/tags/${VERSION}" || echo "")
+          if [ -n "$EXISTING" ]; then
+            EXISTING_ID=$(echo "$EXISTING" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || echo "")
+            if [ -n "$EXISTING_ID" ]; then
+              echo "Release ${VERSION} already exists (ID: ${EXISTING_ID}), deleting..."
+              curl -sf -X DELETE -H "Authorization: token ${GITEA_TOKEN}" "${API}/${EXISTING_ID}" || true
+            fi
+          fi
+
+          BODY=$(python3 -c "import json,sys; print(json.dumps(sys.stdin.read()))" < /tmp/stable_changelog.md)
+          RESPONSE=$(curl -s -w "\n%{http_code}" -X POST "${API}" \
             -H "Authorization: token ${GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d "{
               \"tag_name\":\"${VERSION}\",
               \"target_commitish\":\"main\",
               \"name\":\"muyue ${VERSION}\",
-              \"body\":$(echo "$BODY" | jq -Rs .),
+              \"body\":${BODY},
               \"draft\":false,
               \"prerelease\":false
             }")
-          RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | head -1 | grep -o '[0-9]*')
+          HTTP_CODE=$(echo "$RESPONSE" | tail -1)
+          RESPONSE_BODY=$(echo "$RESPONSE" | sed '$d')
+          echo "HTTP Status: ${HTTP_CODE}"
+          echo "Response: ${RESPONSE_BODY}"
+          RELEASE_ID=$(echo "$RESPONSE_BODY" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || echo "")
           if [ -z "$RELEASE_ID" ]; then
-            echo "Failed to create release:"
-            echo "$RESPONSE"
+            echo "Failed to create release"
             exit 1
           fi
           echo "Release ID: ${RELEASE_ID}"
@@ -212,8 +227,12 @@ jobs:
           for file in dist/*.tar.gz dist/*.zip dist/checksums.txt; do
             filename=$(basename "$file")
             echo "Uploading ${filename}..."
-            curl -s -X POST "${UPLOAD_URL}" \
+            UPLOAD_RESP=$(curl -s -w "\n%{http_code}" -X POST "${UPLOAD_URL}" \
               -H "Authorization: token ${GITEA_TOKEN}" \
-              -F "attachment=@${file};filename=${filename}" > /dev/null
+              -F "attachment=@${file};filename=${filename}")
+            UPLOAD_CODE=$(echo "$UPLOAD_RESP" | tail -1)
+            if [ "$UPLOAD_CODE" != "201" ]; then
+              echo "Upload failed with status ${UPLOAD_CODE}"
+            fi
           done
           echo "Stable release ${VERSION} published!"

cmd/muyue/commands/config.go

@@ -0,0 +1,59 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/spf13/cobra"
+)
+
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "Show/print config",
+}
+
+func init() {
+	rootCmd.AddCommand(configCmd)
+}
+
+func runConfigGet(cmd *cobra.Command, args []string) error {
+	cfg, err := config.Load()
+	if err != nil {
+		return err
+	}
+	key := args[0]
+	fmt.Fprintf(cmd.OutOrStdout(), "%v\n", getConfigValue(cfg, key))
+	return nil
+}
+
+func getConfigValue(cfg *config.MuyueConfig, key string) interface{} {
+	switch key {
+	case "version":
+		return cfg.Version
+	case "profile.name":
+		return cfg.Profile.Name
+	case "profile.email":
+		return cfg.Profile.Email
+	default:
+		return nil
+	}
+}
+
+func runConfigSet(cmd *cobra.Command, args []string) error {
+	cfg, err := config.Load()
+	if err != nil {
+		return err
+	}
+	key, value := args[0], args[1]
+	setConfigValue(cfg, key, value)
+	return config.Save(cfg)
+}
+
+func setConfigValue(cfg *config.MuyueConfig, key, value string) {
+	switch key {
+	case "profile.name":
+		cfg.Profile.Name = value
+	case "profile.email":
+		cfg.Profile.Email = value
+	}
+}

cmd/muyue/commands/doctor.go

@@ -0,0 +1,77 @@
+package commands
+
+import (
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/muyue/muyue/internal/scanner"
+	"github.com/spf13/cobra"
+)
+
+var doctorCmd = &cobra.Command{
+	Use:   "doctor",
+	Short: "Diagnose issues (scan + config check + connectivity)",
+	RunE:  runDoctor,
+}
+
+func init() {
+	rootCmd.AddCommand(doctorCmd)
+}
+
+func runDoctor(cmd *cobra.Command, args []string) error {
+	fmt.Println("Running Muyue diagnostics...")
+
+	fmt.Println("\n=== System Scan ===")
+	result := scanner.ScanSystem()
+	for _, t := range result.Tools {
+		status := "✓"
+		if !t.Installed {
+			status = "✗"
+		}
+		fmt.Printf("  %s %s\n", status, t.Name)
+	}
+	fmt.Printf("\nInstalled: %d/%d\n", countInstalled(result.Tools), len(result.Tools))
+
+	fmt.Println("\n=== Config Check ===")
+	cfg, err := config.Load()
+	if err != nil {
+		fmt.Printf("  ✗ Failed to load config: %v\n", err)
+	} else {
+		fmt.Printf("  ✓ Config loaded (version: %s)\n", cfg.Version)
+		if cfg.Profile.Name != "" {
+			fmt.Printf("  ✓ Profile: %s\n", cfg.Profile.Name)
+		}
+	}
+
+	fmt.Println("\n=== Connectivity ===")
+	endpoints := []string{
+		"https://api.minimax.io",
+		"https://api.openai.com",
+	}
+	for _, ep := range endpoints {
+		fmt.Printf("  Checking %s... ", ep)
+		client := &http.Client{Timeout: 5 * time.Second}
+		resp, err := client.Head(ep)
+		if err != nil {
+			fmt.Printf("✗ (%v)\n", err)
+		} else {
+			resp.Body.Close()
+			fmt.Printf("✓ (status %d)\n", resp.StatusCode)
+		}
+	}
+
+	fmt.Println("\n=== Diagnosis complete ===")
+	return nil
+}
+
+func countInstalled(tools []scanner.ToolStatus) int {
+	installed := 0
+	for _, t := range tools {
+		if t.Installed {
+			installed++
+		}
+	}
+	return installed
+}

cmd/muyue/commands/install.go

@@ -0,0 +1,56 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/installer"
+	"github.com/muyue/muyue/internal/scanner"
+	"github.com/spf13/cobra"
+)
+
+var installCmd = &cobra.Command{
+	Use:   "install [tool]",
+	Short: "Install missing tools",
+	Args:  cobra.RangeArgs(0, 1),
+	RunE:  runInstall,
+}
+
+var installYes bool
+
+func init() {
+	rootCmd.AddCommand(installCmd)
+	installCmd.Flags().BoolVar(&installYes, "yes", false, "Skip confirmation")
+}
+
+func runInstall(cmd *cobra.Command, args []string) error {
+	var tools []string
+	if len(args) > 0 {
+		tools = args
+	}
+
+	inst := installer.New(nil)
+	if len(tools) == 0 {
+		result := scanner.ScanSystem()
+		for _, t := range result.Tools {
+			if !t.Installed {
+				tools = append(tools, t.Name)
+			}
+		}
+		if len(tools) == 0 {
+			fmt.Println("All tools already installed!")
+			return nil
+		}
+		fmt.Printf("Installing missing tools: %v\n", tools)
+	}
+
+	for _, tool := range tools {
+		fmt.Printf("Installing %s...\n", tool)
+		res := inst.InstallTool(tool)
+		if res.Success {
+			fmt.Printf("✓ %s: %s\n", tool, res.Message)
+		} else {
+			fmt.Printf("✗ %s: %s\n", tool, res.Message)
+		}
+	}
+	return nil
+}

cmd/muyue/commands/lsp.go

@@ -0,0 +1,55 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/lsp"
+	"github.com/spf13/cobra"
+)
+
+var lspCmd = &cobra.Command{
+	Use:   "lsp",
+	Short: "LSP management",
+}
+
+func init() {
+	rootCmd.AddCommand(lspCmd)
+	lspCmd.AddCommand(&cobra.Command{
+		Use:   "scan",
+		Short: "Scan for installed LSPs",
+		RunE:  runLSPScan,
+	})
+	lspCmd.AddCommand(&cobra.Command{
+		Use:   "install [name]",
+		Short: "Install LSP server(s)",
+		Args:  cobra.RangeArgs(0, 1),
+		RunE:  runLSPInstall,
+	})
+}
+
+func runLSPScan(cmd *cobra.Command, args []string) error {
+	servers := lsp.ScanServers()
+	fmt.Printf("%-25s %-15s %-10s\n", "Name", "Language", "Status")
+	fmt.Println("──────────────────────────────────────────")
+	for _, s := range servers {
+		status := "✗ missing"
+		if s.Installed {
+			status = "✓ installed"
+		}
+		fmt.Printf("%-25s %-15s %-10s\n", s.Name, s.Language, status)
+	}
+	return nil
+}
+
+func runLSPInstall(cmd *cobra.Command, args []string) error {
+	if len(args) == 0 {
+		return fmt.Errorf("server name required")
+	}
+	name := args[0]
+	fmt.Printf("Installing %s...\n", name)
+	if err := lsp.InstallServer(name); err != nil {
+		return err
+	}
+	fmt.Printf("✓ %s installed\n", name)
+	return nil
+}

cmd/muyue/commands/mcp.go

@@ -0,0 +1,54 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/muyue/muyue/internal/mcp"
+	"github.com/spf13/cobra"
+)
+
+var mcpCmd = &cobra.Command{
+	Use:   "mcp",
+	Short: "MCP management",
+}
+
+func init() {
+	rootCmd.AddCommand(mcpCmd)
+	mcpCmd.AddCommand(&cobra.Command{
+		Use:   "config",
+		Short: "Generate MCP configs for Crush + Claude Code",
+		RunE:  runMCPConfig,
+	})
+	mcpCmd.AddCommand(&cobra.Command{
+		Use:   "scan",
+		Short: "Scan available MCP servers",
+		RunE:  runMCPScan,
+	})
+}
+
+func runMCPConfig(cmd *cobra.Command, args []string) error {
+	cfg, err := config.Load()
+	if err != nil {
+		return err
+	}
+	if err := mcp.ConfigureAll(cfg); err != nil {
+		return err
+	}
+	fmt.Println("MCP configs generated for Crush and Claude Code")
+	return nil
+}
+
+func runMCPScan(cmd *cobra.Command, args []string) error {
+	servers := mcp.ScanServers()
+	fmt.Printf("%-25s %-15s %-10s\n", "Name", "Category", "Status")
+	fmt.Println("──────────────────────────────────────────")
+	for _, s := range servers {
+		status := "✗ missing"
+		if s.Installed {
+			status = "✓ installed"
+		}
+		fmt.Printf("%-25s %-15s %-10s\n", s.Name, s.Category, status)
+	}
+	return nil
+}

cmd/muyue/commands/root.go

@@ -0,0 +1,66 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/muyue/muyue/internal/desktop"
+	"github.com/muyue/muyue/internal/profiler"
+	"github.com/spf13/cobra"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "muyue",
+	Short: "Muyue is your AI-powered development companion",
+	Long:  `Muyue - A modern development environment with AI assistance, tool management, and seamless desktop integration.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		cfg := loadOrSetupConfig()
+		return desktop.Run(cfg, os.Args[1:])
+	},
+}
+
+func Execute() error {
+	return rootCmd.Execute()
+}
+
+func loadOrSetupConfig() *config.MuyueConfig {
+	if !config.Exists() {
+		fmt.Println("First time setup detected!")
+		cfg, err := profiler.RunFirstTimeSetup()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Setup error: %v\n", err)
+			os.Exit(1)
+		}
+
+		for i := range cfg.AI.Providers {
+			if cfg.AI.Providers[i].Active && cfg.AI.Providers[i].APIKey == "" {
+				key, err := profiler.AskAPIKey(cfg.AI.Providers[i].Name)
+				if err == nil && key != "" {
+					cfg.AI.Providers[i].APIKey = key
+				}
+			}
+		}
+
+		if err := config.Save(cfg); err != nil {
+			fmt.Fprintf(os.Stderr, "Save error: %v\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Println("\nSetup complete! Starting muyue...")
+		return cfg
+	}
+
+	cfg, err := config.Load()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Config load error: %v\n", err)
+		os.Exit(1)
+	}
+
+	return cfg
+}
+
+func init() {
+	rootCmd.PersistentFlags().Int("port", 8080, "HTTP port for the desktop server")
+	rootCmd.PersistentFlags().Bool("no-open", false, "Don't open browser on startup")
+}

cmd/muyue/commands/scan.go

@@ -0,0 +1,56 @@
+package commands
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/muyue/muyue/internal/scanner"
+	"github.com/spf13/cobra"
+)
+
+var scanCmd = &cobra.Command{
+	Use:   "scan",
+	Short: "Run system scan and print results table",
+	RunE:  runScan,
+}
+
+func init() {
+	rootCmd.AddCommand(scanCmd)
+	scanCmd.Flags().Bool("json", false, "Output results as JSON")
+}
+
+func runScan(cmd *cobra.Command, args []string) error {
+	useJSON, _ := cmd.Flags().GetBool("json")
+	result := scanner.ScanSystem()
+
+	if useJSON {
+		data, err := json.MarshalIndent(result, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(data))
+		return nil
+	}
+
+	fmt.Printf("%-15s %-20s %-10s %-10s\n", "Tool", "Version", "Status", "Path")
+	fmt.Println("─────────────────────────────────────────────────")
+	for _, t := range result.Tools {
+		status := "✓ installed"
+		if !t.Installed {
+			status = "✗ missing"
+		}
+		fmt.Printf("%-15s %-20s %-10s %-10s\n", t.Name, t.Version, status, t.Path)
+	}
+	fmt.Printf("\n%  d/%d tools installed\n", len(result.Tools) - countMissing(result.Tools), len(result.Tools))
+	return nil
+}
+
+func countMissing(tools []scanner.ToolStatus) int {
+	missing := 0
+	for _, t := range tools {
+		if !t.Installed {
+			missing++
+		}
+	}
+	return missing
+}

cmd/muyue/commands/setup.go

@@ -0,0 +1,39 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/muyue/muyue/internal/profiler"
+	"github.com/spf13/cobra"
+)
+
+var setupCmd = &cobra.Command{
+	Use:   "setup",
+	Short: "Run first-run wizard (profiler)",
+	RunE:  runSetup,
+}
+
+func init() {
+	rootCmd.AddCommand(setupCmd)
+}
+
+func runSetup(cmd *cobra.Command, args []string) error {
+	cfg, err := profiler.RunFirstTimeSetup()
+	if err != nil {
+		return err
+	}
+	for i := range cfg.AI.Providers {
+		if cfg.AI.Providers[i].Active && cfg.AI.Providers[i].APIKey == "" {
+			key, err := profiler.AskAPIKey(cfg.AI.Providers[i].Name)
+			if err == nil && key != "" {
+				cfg.AI.Providers[i].APIKey = key
+			}
+		}
+	}
+	if err := config.Save(cfg); err != nil {
+		return err
+	}
+	fmt.Println("Setup complete!")
+	return nil
+}

cmd/muyue/commands/skills.go

@@ -0,0 +1,105 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/skills"
+	"github.com/spf13/cobra"
+)
+
+var skillsCmd = &cobra.Command{
+	Use:   "skills",
+	Short: "Skills management",
+}
+
+func init() {
+	rootCmd.AddCommand(skillsCmd)
+	skillsCmd.AddCommand(&cobra.Command{
+		Use:   "list",
+		Short: "List installed skills",
+		RunE:  runSkillsList,
+	})
+	skillsCmd.AddCommand(&cobra.Command{
+		Use:   "init",
+		Short: "Install built-in skills",
+		RunE:  runSkillsInit,
+	})
+	skillsCmd.AddCommand(&cobra.Command{
+		Use:   "show [name]",
+		Short: "Show skill details",
+		Args:  cobra.ExactArgs(1),
+		RunE:  runSkillsShow,
+	})
+	skillsCmd.AddCommand(&cobra.Command{
+		Use:   "generate [name] [description]",
+		Short: "AI-generate a skill",
+		Args:  cobra.ExactArgs(2),
+		RunE:  runSkillsGenerate,
+	})
+	skillsCmd.AddCommand(&cobra.Command{
+		Use:   "deploy",
+		Short: "Deploy skills to Crush/Claude Code",
+		RunE:  runSkillsDeploy,
+	})
+	skillsCmd.AddCommand(&cobra.Command{
+		Use:   "delete [name]",
+		Short: "Delete a skill",
+		Args:  cobra.ExactArgs(1),
+		RunE:  runSkillsDelete,
+	})
+}
+
+func runSkillsList(cmd *cobra.Command, args []string) error {
+	list, err := skills.List()
+	if err != nil {
+		return err
+	}
+	if len(list) == 0 {
+		fmt.Println("No skills installed")
+		return nil
+	}
+	fmt.Printf("%-20s %-40s\n", "Name", "Description")
+	fmt.Println("─────────────────────────────────────────────────────")
+	for _, s := range list {
+		fmt.Printf("%-20s %-40s\n", s.Name, s.Description)
+	}
+	return nil
+}
+
+func runSkillsInit(cmd *cobra.Command, args []string) error {
+	fmt.Println("Initializing built-in skills...")
+	return nil
+}
+
+func runSkillsShow(cmd *cobra.Command, args []string) error {
+	name := args[0]
+	skill, err := skills.Get(name)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("Name: %s\nDescription: %s\nAuthor: %s\nVersion: %s\n\n%s\n",
+		skill.Name, skill.Description, skill.Author, skill.Version, skill.Content)
+	return nil
+}
+
+func runSkillsGenerate(cmd *cobra.Command, args []string) error {
+	fmt.Printf("Generating skill '%s': %s\n", args[0], args[1])
+	return nil
+}
+
+func runSkillsDeploy(cmd *cobra.Command, args []string) error {
+	if err := skills.DeployAll(); err != nil {
+		return err
+	}
+	fmt.Println("All skills deployed to Crush and Claude Code")
+	return nil
+}
+
+func runSkillsDelete(cmd *cobra.Command, args []string) error {
+	name := args[0]
+	if err := skills.Delete(name); err != nil {
+		return err
+	}
+	fmt.Printf("Skill '%s' deleted\n", name)
+	return nil
+}

cmd/muyue/commands/update.go

@@ -0,0 +1,80 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/scanner"
+	"github.com/muyue/muyue/internal/updater"
+	"github.com/spf13/cobra"
+)
+
+var updateCmd = &cobra.Command{
+	Use:   "update [tool]",
+	Short: "Check and apply updates",
+	Args:  cobra.RangeArgs(0, 1),
+	RunE:  runUpdate,
+}
+
+var checkOnly bool
+
+func init() {
+	rootCmd.AddCommand(updateCmd)
+	updateCmd.Flags().BoolVar(&checkOnly, "check", false, "Check only, don't update")
+}
+
+func runUpdate(cmd *cobra.Command, args []string) error {
+	result := scanner.ScanSystem()
+	statuses := updater.CheckUpdates(result)
+
+	if len(args) > 0 {
+		for _, u := range statuses {
+			if u.Tool == args[0] {
+				if u.NeedsUpdate {
+					fmt.Printf("%s: %s → %s\n", u.Tool, u.Current, u.Latest)
+					if !checkOnly {
+						updater.RunAutoUpdate([]updater.UpdateStatus{u})
+						fmt.Println("Updated!")
+					}
+				} else {
+					fmt.Printf("%s is up to date (%s)\n", u.Tool, u.Current)
+				}
+				return nil
+			}
+		}
+		fmt.Printf("Tool '%s' not found\n", args[0])
+		return nil
+	}
+
+	fmt.Printf("%-15s %-10s %-10s %-10s\n", "Tool", "Current", "Latest", "Status")
+	fmt.Println("─────────────────────────────────────────")
+	hasUpdates := false
+	for _, u := range statuses {
+		status := "✓"
+		if u.NeedsUpdate {
+			status = "⟳ update"
+			hasUpdates = true
+		}
+		if u.Error != "" {
+			status = "✗ " + u.Error
+		}
+		fmt.Printf("%-15s %-10s %-10s %-10s\n", u.Tool, u.Current, u.Latest, status)
+	}
+
+	if checkOnly {
+		return nil
+	}
+
+	if hasUpdates {
+		toUpdate := make([]updater.UpdateStatus, 0)
+		for _, u := range statuses {
+			if u.NeedsUpdate {
+				toUpdate = append(toUpdate, u)
+			}
+		}
+		updater.RunAutoUpdate(toUpdate)
+		fmt.Println("\nUpdates applied.")
+	} else {
+		fmt.Println("\nAll tools are up to date.")
+	}
+	return nil
+}

cmd/muyue/commands/version.go

@@ -0,0 +1,23 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/muyue/muyue/internal/version"
+	"github.com/spf13/cobra"
+)
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Print version info",
+	RunE:  runVersion,
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}
+
+func runVersion(cmd *cobra.Command, args []string) error {
+	fmt.Print(version.FullInfo())
+	return nil
+}

cmd/muyue/main.go

@@ -4,51 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/muyue/muyue/internal/config"
-	"github.com/muyue/muyue/internal/desktop"
-	"github.com/muyue/muyue/internal/profiler"
+	"github.com/muyue/muyue/cmd/muyue/commands"
 )
 
 func main() {
-	cfg := loadOrSetupConfig()
-	if err := desktop.Run(cfg, os.Args[1:]); err != nil {
+	if err := commands.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
 	}
-}
-
-func loadOrSetupConfig() *config.MuyueConfig {
-	if !config.Exists() {
-		fmt.Println("First time setup detected!")
-		cfg, err := profiler.RunFirstTimeSetup()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Setup error: %v\n", err)
-			os.Exit(1)
-		}
-
-		for i := range cfg.AI.Providers {
-			if cfg.AI.Providers[i].Active && cfg.AI.Providers[i].APIKey == "" {
-				key, err := profiler.AskAPIKey(cfg.AI.Providers[i].Name)
-				if err == nil && key != "" {
-					cfg.AI.Providers[i].APIKey = key
-				}
-			}
-		}
-
-		if err := config.Save(cfg); err != nil {
-			fmt.Fprintf(os.Stderr, "Save error: %v\n", err)
-			os.Exit(1)
-		}
-
-		fmt.Println("\nSetup complete! Starting muyue...")
-		return cfg
-	}
-
-	cfg, err := config.Load()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Config load error: %v\n", err)
-		os.Exit(1)
-	}
-
-	return cfg
-}
+}

docs/PRD.md

@@ -0,0 +1,914 @@
+# Muyue PRD v1.0
+
+> **Author**: Product Architect  
+> **Date**: 2026-04-22  
+> **Status**: Definitive
+
+---
+
+## 1. Product Vision & Positioning
+
+### What is Muyue?
+
+Muyue is a local-first, single-binary development environment assistant that combines an AI orchestration layer, a tool manager, and a cyberpunk-themed desktop UI into one cohesive experience. It scans your system, installs missing tools, configures AI agent environments (MCP servers, LSPs, skills), and provides a Studio for AI-assisted workflows — all without requiring cloud infrastructure.
+
+### What problem does it solve?
+
+Developers spend significant time setting up and maintaining their dev environments: installing tools, configuring MCP servers for AI agents, managing API keys, and switching between CLI tools. Muyue eliminates this friction by providing a single interface that unifies environment management, AI orchestration, and terminal access. It is the "home base" for developers who use AI coding agents (Crush, Claude Code) daily.
+
+### Who is it for?
+
+- **Primary**: Solo developers and small teams who use AI coding agents (Crush, Claude Code) and want a unified control panel.
+- **Secondary**: Developers setting up new machines who want a "one-click" environment bootstrap.
+- **Not for**: Enterprise teams needing sandboxed environments (Daytona), container orchestration (DevPod), or MCP server registries (MCPM).
+
+### How is Muyue different?
+
+| Competitor | What they do | What Muyue does differently |
+|---|---|---|
+| **Daytona** | Cloud sandbox infrastructure for AI agents (sandboxes, snapshots, multi-tenant) | Muyue is local-first, lightweight, no infra required. Daytona is "cloud VMs for AI"; Muyue is "desktop control panel for your local AI agents". |
+| **kasetto** | Declarative AI agent environment manager (Rust, CLI-only) | Muyue adds a desktop GUI, interactive workflows, and a terminal. kasetto is "Nix for AI tools"; Muyue is "a cockpit". |
+| **OpenCode** | Terminal-based AI coding agent (Go, TUI, LSP+MCP client) | OpenCode is an AI coding agent itself. Muyue orchestrates agents (Crush, Claude) rather than being one. Muyue provides a desktop UI, tool management, and MCP config generation that OpenCode doesn't. |
+| **DevPod** | Dev environment manager using devcontainers (Go, CLI+Desktop) | DevPod manages remote/container environments. Muyue manages your local machine's tools and AI agent configs. No container overlap. |
+| **MCPM** | MCP server package manager (Python, CLI, registry) | Muyue generates MCP configs for Crush + Claude Code directly. Delegates server discovery to MCPM where needed. |
+| **McpMux** | Desktop MCP gateway/router (Rust) | Muyue manages MCP configs per-tool rather than routing through a gateway. Simpler, no encryption layer needed for local use. |
+
+### What Muyue should NOT do (anti-scope)
+
+1. **Not a coding agent** — Muyue orchestrates agents (Crush, Claude Code); it does not edit files, run tests, or write code autonomously. The `crush_run` tool delegates to Crush.
+2. **Not a sandbox/container manager** — No Docker orchestration, no VM provisioning. Use DevPod or Daytona for that.
+3. **Not an MCP registry** — No server discovery marketplace. Delegate to MCPM for that.
+4. **Not a CI/CD tool** — No build pipelines, no deployment workflows.
+5. **Not a multi-tenant platform** — Single-user, local machine only. No org management, no billing.
+6. **Not an IDE** — No file tree editor, no debugging, no syntax highlighting. Use VS Code, Zed, or Neovim.
+7. **Not an LSP client** — Muyue installs and manages LSP servers; it does not connect to them as a client. The IDE handles that.
+8. **Not a proxy/gateway** — No AI proxy agents, no request routing. The orchestrator talks directly to providers.
+
+---
+
+## 2. Feature Matrix
+
+### P0 — Must Have for Launch
+
+| # | Feature | Priority | Status | Decision | Description |
+|---|---------|----------|--------|----------|-------------|
+| 1 | System scanning (tools, runtimes, editors, shell, git) | P0 | **EXISTS** | KEEP | Scanner checks 14 tools, 8 runtimes, 8 editors, shell setup, git config. Has 5-min cache, JSON output. |
+| 2 | Tool installation (crush, claude, bmad, starship, go, node, python, git, pnpm, uv, docker, gh) | P0 | **EXISTS** | KEEP | Installer handles 12 tools with platform-specific install methods (apt/brew/winget). API endpoint wired. |
+| 3 | CLI subcommands (scan, install, update, setup, config, doctor, version, lsp, mcp, skills) | P0 | **EXISTS** | KEEP | Cobra-based CLI with all documented subcommands. Each has appropriate flags and output. |
+| 4 | Desktop mode (HTTP server + embedded SPA) | P0 | **EXISTS** | KEEP | `desktop.go` serves frontend via `go:embed`, auto-opens browser, handles `--port` and `--no-open`. |
+| 5 | AI orchestration (OpenAI-compatible, multi-provider) | P0 | **EXISTS** | KEEP | Orchestrator supports MiniMax, ZAI, Anthropic, OpenAI, Ollama. History management, tool calling loop. |
+| 6 | Agent tools (10 tools: terminal, crush_run, read_file, list_files, search_files, grep_content, get_config, set_provider, manage_ssh, web_fetch) | P0 | **EXISTS** | KEEP | All 10 tools implemented with proper parameter validation, timeouts, and output truncation. |
+| 7 | Tool execution endpoint | P0 | **EXISTS** | KEEP | `/api/tool/call` dispatches to agent registry for any registered tool. `/api/tools/list` returns all tools. |
+| 8 | MCP server management (scan, configure, generate configs) | P0 | **EXISTS** | KEEP | Scans 12 known MCP servers, generates configs for Crush (`crush.json`) and Claude Code (`.claude.json`). |
+| 9 | LSP server management (scan, install) | P0 | **EXISTS** | KEEP | 16 known LSP servers with install commands. `InstallForLanguages()` for batch installs. |
+| 10 | Skills management (CRUD, deploy, built-in skills) | P0 | **EXISTS** | KEEP | 5 built-in skills (env-setup, git-workflow, api-design, debug-assist, code-review). YAML frontmatter format. Deploy to Crush + Claude Code. |
+| 11 | Conversation persistence (JSON file store) | P0 | **EXISTS** | KEEP | `ConversationStore` with JSON persistence, auto-summarization at 80K tokens. |
+| 12 | API key encryption (AES-256-GCM) | P0 | **EXISTS** | KEEP | `internal/secret/` with encrypt/decrypt. Keys encrypted at rest in config.yaml. |
+| 13 | Config management (YAML, XDG paths, defaults) | P0 | **EXISTS** | KEEP | Full config schema with profile, AI providers, terminal, tools, SSH. Legacy migration from `~/.muyue`. |
+| 14 | Studio tab (AI chat, SSE streaming, tool calls) | P0 | **EXISTS** | KEEP | Full chat UI with SSE streaming, tool call visualization, thinking blocks, markdown rendering. |
+| 15 | Shell tab (PTY terminal, tabs, SSH connections) | P0 | **EXISTS** | KEEP | xterm.js with WebSocket PTY, tab management (max 7), SSH connection support, 6 terminal themes. |
+| 16 | Config tab (profile, providers, theme, language, skills) | P0 | **EXISTS** | KEEP | Two-column layout with profile editing, provider management, key validation, terminal settings. |
+| 17 | First-run profiling wizard (TUI) | P0 | **EXISTS** | KEEP | Charmbracelet/huh TUI wizard: name, pseudo, email, languages, editor, AI provider. Scored suggestions. |
+| 18 | Onboarding wizard (web) | P0 | **EXISTS** | KEEP | React-based web wizard for desktop mode. |
+| 19 | i18n (FR/EN, keyboard layout awareness) | P0 | **EXISTS** | KEEP | Full FR/EN translations, AZERTY/QWERTY/QWERTZ layouts affecting shortcut display. |
+| 20 | Theming (4 cyberpunk themes, CSS custom properties) | P0 | **EXISTS** | KEEP | 4 themes (Red, Pink, Blue, Green) with 30+ CSS variables. Runtime injection. |
+| 21 | Workflow engine (Plan→Execute) | P0 | **EXISTS** | KEEP | State machine with steps (tool_call, condition, approval). JSON persistence. SSE streaming execution. |
+
+### P0 — Needs Implementation/Completion
+
+| # | Feature | Priority | Status | Decision | Description |
+|---|---------|----------|--------|----------|-------------|
+| 22 | Dashboard tab (tools grid, notifications, quick actions) | P0 | **PARTIAL** | KEEP, BUILD | Currently shows empty workflow/activity placeholders. Needs: tools grid with status badges, update notifications, quick actions (install missing, check updates, rescan, configure MCP). |
+| 23 | Shell AI panel (real AI backend) | P0 | **EXISTS** | KEEP | Was fake, now uses `/api/shell/chat` with real AI backend + tool calling. Functional. |
+| 24 | Tool updates (check + auto-update) | P0 | **EXISTS** | KEEP | `internal/updater/` checks versions and runs auto-updates. API + CLI endpoints wired. |
+
+### P1 — Post-Launch
+
+| # | Feature | Priority | Status | Decision | Description |
+|---|---------|----------|--------|----------|-------------|
+| 25 | AI-generated skills (via Studio chat) | P1 | **STUBBED** | KEEP | `BuildAIGeneratePrompt()` exists but CLI `skills generate` is a stub. Need to wire to orchestrator. |
+| 26 | SSH test connectivity | P1 | **STUBBED** | KEEP | `handleSSHTest()` returns "not implemented". Add `net.DialTimeout` check. |
+| 27 | Conversation list/switch (multiple conversations) | P1 | **PARTIAL** | KEEP | `/api/conversations` list + delete exist. No create/switch/load. Need multi-conversation support in Studio. |
+| 28 | Dashboard activity log with real events | P1 | **MISSING** | KEEP | Wire install/scan/update events to a notification system that Dashboard renders. |
+| 29 | Starship prompt integration (multi-theme) | P1 | **EXISTS** | KEEP | 3 theme configs (charm, zerotwo, default). `handleApplyStarshipTheme` writes TOML + patches RC files. |
+| 30 | Terminal settings persistence (font, theme) | P1 | **EXISTS** | KEEP | Settings saved to config, loaded on startup. |
+
+### P2 — Nice-to-Have
+
+| # | Feature | Priority | Status | Decision | Description |
+|---|---------|----------|--------|----------|-------------|
+| 31 | Background daemon (`internal/daemon/`) | P2 | **MISSING** | DEFER | README mentions it. Not needed for launch. Tools can run on-demand. |
+| 32 | HTML preview server (`internal/preview/`) | P2 | **MISSING** | DROP | Use browser or IDE instead. Not Muyue's job. |
+| 33 | AI proxy agents (`internal/proxy/`) | P2 | **MISSING** | DROP | Direct provider communication is sufficient. No proxy layer needed. |
+
+### DROPPED
+
+| # | Feature | Reason | Replacement |
+|---|---------|--------|-------------|
+| 34 | HTML preview server | Not core value. IDEs handle this. | Browser / VS Code Live Preview |
+| 35 | AI proxy agents | Adds complexity without benefit for local-first tool. | Direct provider API calls |
+| 36 | MCP server registry / marketplace | Out of scope. | MCPM (`mcpm install <server>`) |
+| 37 | Sandboxed code execution | Out of scope. Requires infra. | Daytona sandboxes |
+| 38 | Dev container management | Out of scope. | DevPod |
+| 39 | Full IDE features (file tree, debugger) | Out of scope. | VS Code / Zed / Neovim |
+| 40 | LSP client mode (connecting to LSPs) | Out of scope. Muyue installs LSPs, doesn't consume them. | IDE handles LSP client |
+
+---
+
+## 3. User Flows
+
+### 3.1 First-Time User Opens `muyue`
+
+```
+1. User runs `muyue` (or downloaded binary)
+2. No config exists → loadOrSetupConfig() detects first run
+3. Profiler TUI wizard launches:
+   a. Asks: name, pseudo, email
+   b. Scans system → detects languages → shows scored language options
+   c. Detects editors → shows scored editor options
+   d. Shows AI provider options → user picks one
+4. If selected provider has no API key → asks for key (masked input)
+5. Config saved to ~/.config/muyue/config.yaml (API key encrypted)
+6. Built-in skills installed to ~/.muyue/skills/
+7. MCP configs generated for Crush + Claude Code
+8. Desktop server starts on port 8080
+9. Browser opens to http://127.0.0.1:8080
+10. Onboarding wizard checks if profile is empty → shows web wizard as fallback
+11. Dashboard tab loads → shows tools grid (some installed, some missing)
+```
+
+**Edge cases:**
+- Config file exists but is corrupted → show error, offer `muyue setup` to recreate
+- No internet → profiler still works (local scan only), AI features unavailable
+- API key invalid → doctor command detects, Config tab shows "Invalid key" badge
+
+### 3.2 Returning User Opens `muyue`
+
+```
+1. User runs `muyue`
+2. Config exists → loads from ~/.config/muyue/config.yaml
+3. Desktop server starts → browser opens (or reconnects)
+4. Previous conversation loaded from conversation.json
+5. Dashboard shows current tool status (cached, 5-min TTL)
+6. If checkOnStart=true → background update check runs
+7. User picks up where they left off
+```
+
+### 3.3 User Installs a Missing Tool from Dashboard
+
+```
+1. Dashboard shows tools grid with status badges:
+   - Green ✓ = installed
+   - Red ✗ = missing
+   - Yellow ⟳ = update available
+2. User clicks "Install" on a missing tool (e.g., "pnpm")
+3. Frontend calls POST /api/install {"tools": ["pnpm"]}
+4. Backend spawns installer.InstallTool("pnpm") in goroutine
+5. Installer checks if already installed → if yes, returns success
+6. Installer runs `npm install -g pnpm`
+7. Result returned: {"status": "done", "tools": ["pnpm"], "results": [{...}]}
+8. Frontend updates tool status badge to green ✓
+9. Activity log entry added: "Installed pnpm"
+10. System scan cache invalidated
+```
+
+**Edge cases:**
+- Install fails (permission denied) → show error in results, suggest `sudo` or manual install
+- Tool requires Node.js but Node isn't installed → installer returns "npx not found, install node first"
+- Multiple tools installed in parallel → `sync.WaitGroup` handles concurrent installs
+
+### 3.4 User Starts a Chat in Studio
+
+```
+1. User clicks Studio tab (Ctrl+2)
+2. Chat history loaded from /api/chat/history
+3. If no history → welcome message shown
+4. User types message in textarea, presses Enter
+5. Frontend calls POST /api/chat {"message": "...", "stream": true}
+6. SSE connection opens
+7. Backend:
+   a. Adds message to conversation store
+   b. Checks if summarization needed (>80K tokens)
+   c. Creates orchestrator with active provider
+   d. Sets system prompt (Studio prompt with agent context)
+   e. Sets tools (all 10 agent tools as OpenAI function specs)
+   f. Sends to AI provider API
+8. Streaming begins:
+   a. Content chunks → SSE {"content": "char"} events
+   b. Tool calls → SSE {"tool_call": {...}} events
+   c. Tool results → SSE {"tool_result": {...}} events
+   d. Max 15 tool iterations
+9. Frontend renders:
+   a. Text content streamed character-by-character
+   b. Tool calls shown as expandable blocks with icon + status
+   c. Thinking blocks (if any) shown with spinner
+10. Final response stored in conversation
+11. SSE {"done": "true"} closes stream
+```
+
+**Edge cases:**
+- AI provider returns error → SSE error event, shown as red message
+- Tool execution times out → error result returned to AI, may retry
+- No active provider configured → 503 error, redirect to Config tab
+- API key invalid → 401 error, show "Configure your API key" prompt
+
+### 3.5 User Runs a Plan→Execute Workflow
+
+```
+1. User types `/plan Set up a Go project with Docker` in Studio
+2. Frontend calls POST /api/workflow/plan {"goal": "Set up a Go project..."}
+3. Backend:
+   a. Creates Planner with AI orchestrator
+   b. Sends goal to AI with planning prompt
+   c. AI generates JSON array of steps
+   d. Planner parses response into []Step
+   e. Workflow Engine creates workflow with steps
+4. Workflow returned to frontend with ID and steps
+5. Frontend shows workflow panel:
+   - Step 1: "Check Go installation" → tool: terminal, args: {command: "go version"}
+   - Step 2: "Create project directory" → tool: terminal, args: {command: "mkdir -p ..."}
+   - Step 3: "Initialize Go module" → tool: terminal, args: {command: "go mod init ..."}
+   - etc.
+6. User clicks "Execute"
+7. Frontend calls POST /api/workflow/execute/{id}?stream=true
+8. SSE stream:
+   a. Each step: {"event": "started", "step": {...}}
+   b. On completion: {"event": "done", "step": {...}}
+   c. On failure: {"event": "failed", "step": {...}}
+   d. If approval step: {"event": "awaiting_approval", "step": {...}}
+9. User can approve/skip steps via POST /api/workflow/approve/{id}
+10. Final event: {"event": "workflow_done", "status": "done|failed"}
+```
+
+**Edge cases:**
+- AI generates invalid JSON → planner returns error, shown in chat
+- Step fails mid-workflow → remaining steps skipped, workflow marked "failed"
+- Approval step → execution pauses until user approves
+- Workflow exceeds 10 steps → planner prompt limits to 10
+
+### 3.6 User Opens Shell, Connects via SSH
+
+```
+1. User clicks Shell tab (Ctrl+3)
+2. Default "Local Shell" tab created with xterm.js terminal
+3. WebSocket connects to /api/ws/terminal with {type: "shell", data: ""}
+4. Backend creates PTY via creack/pty, pipes I/O through WebSocket
+5. User sees their shell prompt (starship if configured)
+6. To add SSH tab:
+   a. User clicks "+" → dropdown shows:
+      - System terminals (zsh, bash, fish)
+      - Saved SSH connections (from config)
+      - "Add SSH connection" button
+   b. User selects saved connection or adds new one
+   c. New tab created with {type: "ssh", data: JSON.stringify({host, port, user, key_path})}
+   d. Backend establishes SSH connection, creates PTY
+   e. Tab shows connected indicator (green dot)
+7. User can rename tabs (double-click), close tabs (×), switch with Alt+1-7
+8. AI assistant panel on right:
+   a. User types question
+   b. Frontend calls POST /api/shell/chat with message + terminal context
+   c. AI responds with shell-aware answers (commands, explanations)
+   d. Can execute tools (terminal, read_file, etc.) to help user
+```
+
+**Edge cases:**
+- SSH connection fails → tab shows "Connection error" in terminal
+- WebSocket disconnects → terminal shows "Connection closed" message
+- Tab limit (7) reached → "+" button disabled
+- SSH key not found → connection fails, suggest key path
+
+### 3.7 User Changes AI Provider
+
+```
+1. User clicks Config tab (Ctrl+4)
+2. "AI Providers" panel shows list of providers:
+   - MiniMax (active) — Key configured ✓
+   - Z.AI — No key
+   - Anthropic — No key
+   - OpenAI — No key
+   - Ollama — No key (local)
+3. User clicks "Configure" on Anthropic
+4. Modal opens with fields: API Key, Model, Base URL
+5. User enters API key
+6. User clicks "Validate" → POST /api/providers/validate
+7. Backend sends test request to Anthropic API with key
+8. Response: {"status": "valid"} or error
+9. User clicks "Activate" → provider set active, others deactivated
+10. Config saved → new orchestrator instances use Anthropic
+```
+
+**Edge cases:**
+- Key validation fails → show "Invalid key" badge, don't save
+- No internet → validation times out, show "Connection failed"
+- Ollama selected but not running → user sees local URL, no validation needed
+- Switching provider mid-conversation → new messages use new provider, old messages preserved
+
+### 3.8 User Manages MCP Servers
+
+```
+1. User opens Config tab → MCP section
+   OR: User runs `muyue mcp scan` from CLI
+2. System scans 12 known MCP servers (filesystem, github, git, fetch, memory, etc.)
+3. Each server shows: name, category, installed status (npx available)
+4. User clicks "Configure MCP" → POST /api/mcp/configure
+5. Backend:
+   a. Generates MCP config for Crush: ~/.config/crush/crush.json → {"mcps": {...}}
+   b. Generates MCP config for Claude Code: ~/.claude.json → {"mcpServers": {...}}
+   c. Core servers: filesystem, fetch, memory
+   d. Provider-specific: minimax-web-search, minimax-image (if API key set)
+   e. Claude-specific: sequential-thinking
+6. Configs written with 0600 permissions
+```
+
+**Edge cases:**
+- Existing configs not overwritten (merged) — `writeMCPConfig` merges into existing JSON
+- No API key for provider-specific servers → those servers omitted
+- Crush or Claude Code not installed → configs still generated (for when they are installed)
+
+### 3.9 User Manages LSP Servers
+
+```
+1. User runs `muyue lsp scan` from CLI
+   OR: views LSP section in Config tab
+2. System checks 16 known LSP servers
+3. Each shows: name, language, command path, installed status
+4. User installs specific LSP:
+   - CLI: `muyue lsp install gopls`
+   - API: POST /api/lsp/install {"name": "gopls"}
+5. Backend runs install command (e.g., `go install golang.org/x/tools/gopls@latest`)
+6. Result: success or error
+```
+
+**Edge cases:**
+- LSP has no auto-install command (e.g., clangd) → return "install manually" message
+- Install fails (network error) → show error, suggest retry
+- Language mapping: TypeScript installs 4 servers (TS, JSON, HTML, CSS)
+
+### 3.10 User Creates/Deploys a Skill
+
+```
+1. User runs `muyue skills init` → installs 5 built-in skills to ~/.muyue/skills/
+2. User creates custom skill:
+   - Manually: create ~/.muyue/skills/my-skill/SKILL.md with YAML frontmatter
+   - CLI: `muyue skills generate my-skill "Does X for Y" crush`
+   - API: POST /api/skills (via Config tab or Studio chat)
+3. SKILL.md format:
+   ```yaml
+   ---
+   name: my-skill
+   description: What it does
+   author: username
+   version: 1.0.0
+   target: crush|claude|both
+   tags: [tag1, tag2]
+   ---
+   # Skill instructions in markdown
+   ```
+4. Deploy: `muyue skills deploy`
+5. Skill copied to:
+   - Crush: ~/.config/crush/skills/my-skill/SKILL.md
+   - Claude Code: ~/.claude/skills/my-skill/SKILL.md
+```
+
+**Edge cases:**
+- Skill already exists at target → overwritten
+- Target is "both" → deployed to both Crush and Claude
+- Delete removes from all locations (source + targets)
+
+### 3.11 User Runs `muyue scan` from CLI
+
+```
+1. User runs `muyue scan`
+2. Scanner runs full system scan (tools, runtimes, shell, git)
+3. Output: formatted table with columns: Tool, Version, Status, Path
+4. Summary line: "Installed: 8/14"
+5. With --json flag: full JSON output
+```
+
+### 3.12 User Runs `muyue doctor` from CLI
+
+```
+1. User runs `muyue doctor`
+2. Three checks run:
+   a. System scan → shows installed/missing tools
+   b. Config check → loads config, validates profile
+   c. Connectivity check → HEAD requests to AI provider endpoints
+3. Output: diagnostic report with ✓/✗ indicators
+4. User sees what's broken and can take action
+```
+
+---
+
+## 4. API Contract
+
+### Existing Endpoints (37 routes)
+
+| Method | Path | Request Body | Response Body | Status |
+|--------|------|-------------|---------------|--------|
+| GET | `/api/info` | — | `{name, version, author}` | EXISTS |
+| GET | `/api/system` | — | `{system: {os, arch, platform, shell, ...}}` | EXISTS |
+| GET | `/api/tools` | — | `{tools: [{name, installed, version, path}], total}` | EXISTS |
+| GET | `/api/config` | — | `{profile, terminal, bmad}` | EXISTS |
+| GET | `/api/providers` | — | `{providers: [{name, model, active, ...}]}` | EXISTS |
+| GET | `/api/skills` | — | `{skills: [...], count}` | EXISTS |
+| GET | `/api/lsp` | — | `{servers: [{name, language, command, installed}]}` | EXISTS |
+| GET | `/api/mcp` | — | `{servers: [...], configured}` | EXISTS |
+| GET | `/api/updates` | — | `{updates: [{tool, current, latest, needsUpdate}]}` | EXISTS |
+| GET | `/api/editors` | — | `{editors: [{name, installed, version, path}]}` | EXISTS |
+| GET | `/api/terminal/sessions` | — | `{ssh: [...], system: [...]}` | EXISTS |
+| GET | `/api/terminal/themes` | — | `{themes: [{id, name}]}` | EXISTS |
+| GET | `/api/chat/history` | — | `{messages: [...], tokens}` | EXISTS |
+| GET | `/api/tools/list` | — | `{tools: [...], count}` | EXISTS |
+| GET | `/api/workflow/list` | — | `{workflows: [...], count}` | EXISTS |
+| GET | `/api/workflow/{id}` | — | `{id, name, steps, status, ...}` | EXISTS |
+| GET | `/api/conversations` | — | `{conversations: [...]}` | EXISTS |
+| GET | `/api/ssh/connections` | — | `{connections: [...]}` | EXISTS |
+| POST | `/api/scan` | — | `{status: "ok"}` | EXISTS |
+| POST | `/api/install` | `{tools: [string]}` | `{status, tools, results: [{tool, success, message}]}` | EXISTS |
+| POST | `/api/mcp/configure` | — | `{status: "ok"}` | EXISTS |
+| POST | `/api/terminal` | `{command, cwd}` | `{output, error}` | EXISTS |
+| POST | `/api/chat` | `{message, stream}` | SSE stream or `{content}` | EXISTS |
+| POST | `/api/chat/clear` | — | `{status: "ok"}` | EXISTS |
+| POST | `/api/tool/call` | `{tool, args}` | `{success, tool, result, error}` | EXISTS |
+| POST | `/api/shell/chat` | `{message, context, history, cwd, platform, stream}` | SSE stream or `{content, tool_calls}` | EXISTS |
+| POST | `/api/workflow` | `{name, description, type}` | `{id, name, steps, status, ...}` | EXISTS |
+| POST | `/api/workflow/plan` | `{goal}` | `{id, name, steps, status, ...}` | EXISTS |
+| POST | `/api/workflow/execute/{id}` | `?stream=true` optional | SSE stream or workflow object | EXISTS |
+| POST | `/api/workflow/approve/{id}` | `{step_id}` | `{status: "approved"}` | EXISTS |
+| POST | `/api/lsp/install` | `{name}` | `{success, server}` or `{success, error}` | EXISTS |
+| POST | `/api/skills/deploy` | `{name}` optional | `{status, skill}` | EXISTS |
+| POST | `/api/config/reset` | — | `{status: "ok"}` | EXISTS |
+| POST | `/api/providers/validate` | `{name, api_key, model, base_url}` | `{status: "valid"}` or error | EXISTS |
+| POST | `/api/update/run` | `{tool}` optional | `{status, updated}` or `{status, tool}` | EXISTS |
+| POST | `/api/ssh/test` | `{host, port, user}` | `{success, message}` (stubbed) | PARTIAL |
+| POST | `/api/starship/apply-theme` | `{theme}` | `{status, config}` | EXISTS |
+| PUT | `/api/preferences` | `{language, keyboard_layout}` | `{status: "ok"}` | EXISTS |
+| PUT | `/api/config/profile` | `{name, pseudo, email, editor, shell}` | `{status: "ok"}` | EXISTS |
+| PUT | `/api/config/provider` | `{name, api_key, model, base_url, active}` | `{status: "ok"}` | EXISTS |
+| PUT | `/api/terminal/settings` | `{font_size, font_family, theme}` | `{status, theme}` | EXISTS |
+| DELETE | `/api/conversations/{id}` | — | `{status: "deleted"}` | EXISTS |
+| DELETE | `/api/terminal/sessions/{name}` | — | (removes SSH connection) | EXISTS |
+| WS | `/api/ws/terminal` | `{type, data}` | `{type, data}` | EXISTS |
+
+### Error Response Format (all endpoints)
+
+```json
+{"error": "Human-readable error message"}
+```
+
+HTTP status codes: 400 (bad request), 401 (unauthorized), 404 (not found), 405 (method not allowed), 500 (internal), 503 (service unavailable — AI provider not configured).
+
+### SSE Event Format
+
+```
+data: {"content": "character"}
+data: {"tool_call": {"tool_call_id": "...", "name": "...", "args": "..."}}
+data: {"tool_result": {"tool_call_id": "...", "content": "...", "is_error": false}}
+data: {"done": "true"}
+```
+
+---
+
+## 5. CLI Contract
+
+### Root Command
+
+```
+muyue                          Launch desktop app (opens browser)
+muyue --port=8080              Launch on specific port
+muyue --no-open                Launch without opening browser
+```
+
+### Subcommands
+
+| Command | Flags | Output | Status |
+|---------|-------|--------|--------|
+| `muyue scan` | `--json` | Table or JSON of tools/runtimes | EXISTS |
+| `muyue install [tool]` | `--yes` | Install progress per tool | EXISTS |
+| `muyue update [tool]` | `--check` | Table of versions + status | EXISTS |
+| `muyue setup` | — | Interactive TUI wizard | EXISTS |
+| `muyue config` | — | (subcommand stub) | PARTIAL |
+| `muyue doctor` | — | Diagnostic report | EXISTS |
+| `muyue version` | — | `Muyue version X.Y.Z` | EXISTS |
+| `muyue lsp scan` | — | Table of LSP servers | EXISTS |
+| `muyue lsp install <name>` | — | Install progress | EXISTS |
+| `muyue mcp config` | — | Confirmation message | EXISTS |
+| `muyue mcp scan` | — | Table of MCP servers | EXISTS |
+| `muyue skills list` | — | Table of skills | EXISTS |
+| `muyue skills init` | — | Confirmation | STUBBED |
+| `muyue skills show <name>` | — | Skill details | EXISTS |
+| `muyue skills generate <name> <desc>` | — | (stub) | STUBBED |
+| `muyue skills deploy` | — | Confirmation | EXISTS |
+| `muyue skills delete <name>` | — | Confirmation | EXISTS |
+
+### CLI Commands Needing Work
+
+| Command | Issue | Fix |
+|---------|-------|-----|
+| `muyue config` | No subcommands (get/set are defined but not registered) | Register `config get <key>` and `config set <key> <value>` as subcommands |
+| `muyue skills init` | Just prints message, doesn't call `skills.InstallBuiltinSkills()` | Wire to actual function |
+| `muyue skills generate` | Just prints message, doesn't call AI | Wire to orchestrator |
+| `muyue install` | Passes `nil` config to installer | Pass loaded config |
+
+---
+
+## 6. Data Model
+
+### 6.1 Config YAML Schema (`~/.config/muyue/config.yaml`)
+
+```yaml
+version: "0.2.1"
+
+profile:
+  name: "Augustin"
+  pseudo: "muyue"
+  email: "augustin@example.com"
+  languages: ["go", "typescript", "python"]
+  preferences:
+    editor: "nvim"
+    shell: "zsh"
+    theme: "cyberpunk-red"         # cyberpunk-red | cyberpunk-pink | midnight-blue | matrix-green
+    default_ai: "minimax"
+    auto_update: true
+    check_on_start: true
+    language: "fr"                  # fr | en
+    keyboard_layout: "azerty"       # azerty | qwerty | qwertz
+
+ai:
+  providers:
+    - name: "minimax"
+      api_key: "enc:AES256GCM..."   # encrypted at rest
+      base_url: "https://api.minimax.io/v1"
+      model: "MiniMax-M2.7"
+      active: true
+    - name: "zai"
+      model: "glm"
+      active: false
+    - name: "anthropic"
+      api_key: "enc:AES256GCM..."
+      model: "claude-sonnet-4-20250514"
+      active: false
+    - name: "openai"
+      api_key: "enc:AES256GCM..."
+      base_url: "https://api.openai.com/v1"
+      model: "gpt-4o"
+      active: false
+    - name: "ollama"
+      model: "llama3"
+      base_url: "http://localhost:11434/api"
+      active: false
+
+tools:
+  - name: "crush"
+    installed: true
+    version: "v1.2.3"
+    auto_update: true
+
+bmad:
+  installed: true
+  version: "latest"
+  global: true
+
+terminal:
+  custom_prompt: true
+  prompt_theme: "zerotwo"           # charm | zerotwo | default
+  ssh:
+    - name: "prod-server"
+      host: "192.168.1.100"
+      port: 22
+      user: "deploy"
+      key_path: "~/.ssh/id_rsa"
+  font_size: 14
+  font_family: "'JetBrains Mono', monospace"
+  theme: "default"                  # default | monokai | gruvbox | nord | solarized-dark | dracula
+```
+
+### 6.2 Conversation JSON Schema (`~/.config/muyue/conversation.json`)
+
+```json
+{
+  "messages": [
+    {
+      "id": "20260422150000.000-1234567890",
+      "role": "user|assistant|system",
+      "content": "message text or JSON-encoded {content, tool_calls}",
+      "time": "2026-04-22T15:00:00Z"
+    }
+  ],
+  "summary": "Auto-generated conversation summary when >80K tokens",
+  "created_at": "2026-04-22T15:00:00Z",
+  "updated_at": "2026-04-22T15:30:00Z"
+}
+```
+
+### 6.3 Skill SKILL.md Format
+
+```markdown
+---
+name: skill-name
+description: What this skill does
+author: muyue
+version: 1.0.0
+target: both          # crush | claude | both
+tags: [tag1, tag2]
+---
+
+# Skill Title
+
+Instructions for the AI agent in markdown.
+Includes: when to activate, step-by-step instructions, examples, error handling.
+```
+
+### 6.4 MCP Config JSON Format
+
+**For Crush** (`~/.config/crush/crush.json`):
+```json
+{
+  "mcps": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/home/user/projects"]
+    },
+    "fetch": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-fetch"]
+    }
+  }
+}
+```
+
+**For Claude Code** (`~/.claude.json`):
+```json
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/home/user/projects"]
+    },
+    "sequential-thinking": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-sequential-thinking"]
+    }
+  }
+}
+```
+
+### 6.5 Workflow JSON Schema (`~/.config/muyue/workflows.json`)
+
+```json
+[
+  {
+    "id": "wf-1234567890",
+    "name": "Plan: Set up Go project",
+    "description": "Full goal description",
+    "type": "plan_execute",
+    "steps": [
+      {
+        "id": "step-0",
+        "name": "Check Go installation",
+        "type": "tool_call",
+        "tool": "terminal",
+        "args": {"command": "go version"},
+        "status": "pending|running|done|failed|awaiting_approval|skipped",
+        "result": "",
+        "error": "",
+        "depends_on": [],
+        "started_at": null,
+        "ended_at": null
+      }
+    ],
+    "status": "pending|running|done|failed",
+    "created_at": "2026-04-22T15:00:00Z",
+    "updated_at": "2026-04-22T15:00:00Z"
+  }
+]
+```
+
+---
+
+## 7. Technical Decisions
+
+### 7.1 CLI Framework: **Keep Cobra** ✓
+
+**Decision**: Keep `spf13/cobra` (already in `go.mod`, already used for all 11 subcommands).
+
+**Rationale**: Cobra is the de-facto standard for Go CLIs. All commands are already implemented. No benefit to switching to `urfave/cli`.
+
+### 7.2 HTTP Router: **Keep stdlib `http.ServeMux`** ✓
+
+**Decision**: Keep `net/http.ServeMux`. Do NOT add chi, echo, or gin.
+
+**Rationale**: 
+- 37 routes registered. Stdlib handles this fine.
+- Go 1.22+ `ServeMux` supports method-based routing (`GET /api/foo`).
+- Adding a framework adds a dependency and learning curve for no benefit.
+- Performance is irrelevant at localhost scale.
+
+**One improvement**: Use Go 1.22 method-based patterns to clean up manual method checks:
+```go
+mux.HandleFunc("GET /api/tools", s.handleTools)
+mux.HandleFunc("POST /api/install", s.handleInstall)
+```
+
+### 7.3 WebSocket: **Keep gorilla/websocket** ✓
+
+**Decision**: Keep `gorilla/websocket` for terminal PTY.
+
+**Rationale**: Already working for terminal WebSocket. Only used for one endpoint (`/api/ws/terminal`). No need for a framework.
+
+### 7.4 Frontend Framework: **Keep vanilla React** ✓
+
+**Decision**: Keep React 19 + vanilla state management. Do NOT add zustand or react-query.
+
+**Rationale**:
+- 4 components, ~1200 lines total. State is simple (tab switching, form inputs, chat messages).
+- Adding zustand/redux would be over-engineering for this scale.
+- `useState` + `useCallback` + `useRef` is sufficient.
+- SSE handling is custom and wouldn't benefit from react-query.
+
+**One consideration**: If Dashboard grows complex (many sub-components), extract a `useApi` custom hook pattern for data fetching.
+
+### 7.5 Async Operations: **SSE for everything** ✓
+
+**Decision**: Use SSE (Server-Sent Events) for all streaming operations (chat, workflow execution). Use synchronous JSON for non-streaming operations (install, scan).
+
+**Rationale**:
+- SSE is already implemented for chat and workflow execution.
+- Install operations are fast enough to be synchronous (wait for all goroutines, return results).
+- No polling needed.
+- WebSocket only for terminal PTY (bidirectional needed).
+
+### 7.6 Workflow Engine: **State machine** ✓
+
+**Decision**: Keep the current state machine approach. Do NOT convert to a DAG.
+
+**Rationale**:
+- Plans are linear sequences (step 1 → step 2 → step 3).
+- Dependencies are simple (wait for previous step).
+- DAG adds complexity (topological sort, parallel execution) for no benefit.
+- The current `depends_on` field supports basic ordering. Parallel execution can be added later if needed via `TypeParallel` step type (already defined but not implemented).
+
+### 7.7 Styling: **Keep CSS custom properties** ✓
+
+**Decision**: Keep CSS custom properties + 4 theme objects. Do NOT add Tailwind or CSS-in-JS.
+
+**Rationale**:
+- 30+ CSS variables already define the full theme system.
+- Theme switching works by setting `document.documentElement.style.setProperty()`.
+- Adding Tailwind would conflict with the existing CSS architecture.
+- Current CSS is ~1000 lines and well-structured.
+
+---
+
+## 8. Delegation Strategy
+
+### What Muyue delegates to existing tools
+
+| Feature | Delegated To | Integration Method | UI |
+|---------|-------------|-------------------|-----|
+| **Code editing / AI coding** | Crush (`crush run`) | `crush_run` agent tool → spawns `crush run <task>` | Studio chat invokes tool, Shell AI panel invokes tool |
+| **Code editing / AI coding** | Claude Code | Skills deployed to `~/.claude/skills/` | Config tab shows deployment status |
+| **MCP server discovery** | MCPM (`mcpm`) | CLI passthrough suggestion | Doctor command suggests `mcpm install <server>` if server missing |
+| **MCP server routing** | McpMux | Not needed | Muyue generates per-tool configs directly |
+| **Dev environments / containers** | DevPod | CLI passthrough suggestion | Doctor suggests DevPod if container needed |
+| **IDE features** | VS Code / Zed / Neovim | Config integration (editor preference) | Config tab sets editor, LSPs installed for editor |
+| **Terminal prompt** | Starship | Config generation (`starship.toml` + RC file patching) | Config tab applies themes |
+| **Git operations** | `git` CLI | Agent `terminal` tool runs git commands | Studio / Shell AI can execute git commands |
+
+### Integration Patterns
+
+1. **Config Generation** (primary pattern): Muyue generates config files for external tools (Crush `crush.json`, Claude `.claude.json`, Starship `starship.toml`). This is the cleanest integration — no API coupling, no version lock-in.
+
+2. **CLI Wrapping**: Muyue invokes external CLIs (`crush run`, `git`, `go install`) through the agent `terminal` tool. Stdout/stderr captured and returned to AI.
+
+3. **Suggestion**: Muyue suggests tools the user should install separately (MCPM, DevPod) but doesn't wrap them. `muyue doctor` output includes recommendations.
+
+4. **Skills Deployment**: Muyue's skills system deploys SKILL.md files to both Crush and Claude Code directories. Both tools natively understand this format.
+
+---
+
+## 9. Implementation Priority
+
+### Phase 1: Dashboard Completion (P0 gap)
+
+The only significant P0 gap is the Dashboard. Current state: empty placeholders.
+
+**Dashboard must have:**
+1. **Tools Grid** — Cards for each scanned tool showing name, status badge (installed/missing/update), version, install button
+2. **Quick Actions** — Buttons: "Install missing tools", "Check for updates", "Rescan system", "Configure MCP"
+3. **Update Notifications** — List of tools with available updates, with "Update" buttons
+4. **Activity Log** — Scrollable list of recent events (installs, scans, config changes) with timestamps
+
+**Implementation approach:**
+- Fetch from `/api/tools`, `/api/updates`, `/api/editors` on mount
+- Quick actions call existing API endpoints (`POST /api/install`, `POST /api/scan`, `POST /api/mcp/configure`)
+- Activity log: client-side event accumulation (no backend change needed for MVP)
+
+### Phase 2: CLI Polish (P0 gaps)
+
+1. Wire `muyue skills init` to `skills.InstallBuiltinSkills()`
+2. Wire `muyue skills generate` to orchestrator
+3. Register `muyue config get` and `muyue config set` subcommands
+4. Pass loaded config to installer in `muyue install`
+
+### Phase 3: P1 Features
+
+1. AI-generated skills via Studio chat
+2. SSH connectivity test
+3. Multi-conversation support in Studio
+4. Real event-based activity log
+
+---
+
+## 10. Architecture Summary
+
+```
+┌─────────────────────────────────────────────────────────┐
+│                    Browser (React SPA)                    │
+│  ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌──────────┐   │
+│  │Dashboard │ │ Studio   │ │  Shell   │ │  Config  │   │
+│  │(tools,   │ │(AI chat, │ │(xterm.js,│ │(profile, │   │
+│  │ updates, │ │ tool     │ │ WS PTY,  │ │provider, │   │
+│  │ actions) │ │ calls)   │ │ AI panel)│ │ theme)   │   │
+│  └──────────┘ └──────────┘ └──────────┘ └──────────┘   │
+└──────────────────────┬──────────────────────────────────┘
+                       │ HTTP/SSE/WS
+┌──────────────────────┴──────────────────────────────────┐
+│                   Go HTTP Server                          │
+│  ┌────────────────────────────────────────────────────┐  │
+│  │              api.Server (37 routes)                 │  │
+│  │  /api/chat → SSE stream + tool calling loop        │  │
+│  │  /api/shell/chat → SSE stream + tool calling loop  │  │
+│  │  /api/ws/terminal → WebSocket PTY                  │  │
+│  │  /api/install → parallel tool installation         │  │
+│  │  /api/workflow/* → CRUD + plan + execute           │  │
+│  └────────────────────────────────────────────────────┘  │
+│  ┌──────────┐ ┌────────────┐ ┌──────────┐ ┌──────────┐  │
+│  │Scanner   │ │ Installer  │ │ Updater  │ │  MCP     │  │
+│  │(14 tools,│ │(12 tools,  │ │(version  │ │(12 known │  │
+│  │ 8 runts, │ │ platform-  │ │ check +  │ │ servers, │  │
+│  │ 8 edtrs) │ │ specific)  │ │ auto-upd)│ │ config   │  │
+│  └──────────┘ └────────────┘ └──────────┘ │ gen)     │  │
+│  ┌──────────┐ ┌────────────┐ ┌──────────┐ └──────────┘  │
+│  │   LSP    │ │  Skills    │ │ Workflow │               │
+│  │(16 known │ │(CRUD +    │ │(Plan→    │               │
+│  │ servers) │ │ deploy +  │ │ Execute  │               │
+│  │          │ │ builtins) │ │ engine)  │               │
+│  └──────────┘ └────────────┘ └──────────┘               │
+│  ┌──────────┐ ┌────────────┐ ┌──────────┐ ┌──────────┐  │
+│  │Orchestrtr│ │   Agent    │ │  Secret  │ │  Config  │  │
+│  │(OpenAI-  │ │ Registry  │ │(AES-256- │ │(YAML,    │  │
+│  │ compat,  │ │(10 tools: │ │ GCM key  │ │ XDG,     │  │
+│  │ multi-   │ │ terminal, │ │ encrypt) │ │ encrypted│  │
+│  │ provider)│ │ files,    │ │          │ │ API keys)│  │
+│  │          │ │ grep, etc)│ │          │ │          │  │
+│  └──────────┘ └────────────┘ └──────────┘ └──────────┘  │
+└──────────────────────────────────────────────────────────┘
+                       │
+                       ▼
+         ┌─────────────────────────┐
+         │  External Tools/Agents  │
+         │  Crush, Claude Code,    │
+         │  Starship, MCP servers  │
+         └─────────────────────────┘
+```
+
+### Key Dependencies
+
+| Dependency | Version | Purpose |
+|-----------|---------|---------|
+| `spf13/cobra` | v1.10.2 | CLI framework |
+| `charmbracelet/huh` | v1.0.0 | TUI forms (profiler, API key input) |
+| `charmbracelet/bubbletea` | v1.3.10 | TUI framework (indirect) |
+| `gorilla/websocket` | v1.5.3 | Terminal WebSocket |
+| `creack/pty/v2` | v2.0.1 | PTY for terminal |
+| `gopkg.in/yaml.v3` | v3.0.1 | Config serialization |
+| React 19 | — | Frontend UI |
+| Vite 8 | — | Frontend build |
+| xterm.js | — | Terminal emulator component |
+
+### File Count Summary
+
+| Layer | Files | Lines (approx) |
+|-------|-------|---------------|
+| Go backend (`internal/`) | 41 `.go` files | ~8,000 |
+| CLI commands (`cmd/`) | 12 `.go` files | ~600 |
+| Frontend (`web/src/`) | ~20 files | ~3,500 |
+| CSS (`web/src/styles/`) | 1 file | ~1,500 |
+| **Total** | ~75 files | ~13,600 |
+
+---
+
+## 11. Risks & Mitigations
+
+| Risk | Impact | Mitigation |
+|------|--------|-----------|
+| AI provider API changes break orchestrator | Studio/Shell chat stops working | Orchestrator uses OpenAI-compatible format (widely supported). Fallback: user switches provider. |
+| Tool install commands change (brew, apt) | Installer fails | Installer returns clear error messages. Doctor command diagnoses. User can install manually. |
+| Frontend grows beyond vanilla React manageability | Hard to maintain | At current scale (4 components), this is not a risk. Re-evaluate if components exceed 20. |
+| Security: API keys in config file | Key exposure | AES-256-GCM encryption at rest. Config file permissions 0600. |
+| Terminal WebSocket security | Remote command execution | Server binds to 127.0.0.1 only. No remote access possible. |
+
+---
+
+*End of Muyue PRD v1.0*

go.mod

@@ -7,7 +7,9 @@ toolchain go1.24.3
 require (
 	github.com/charmbracelet/huh v1.0.0
 	github.com/creack/pty/v2 v2.0.1
+	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
+	github.com/spf13/cobra v1.10.2
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -28,6 +30,7 @@ require (
 	github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
@@ -37,6 +40,7 @@ require (
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.23.0 // indirect

go.sum

@@ -42,6 +42,7 @@ github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfa
 github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
 github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
 github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/creack/pty/v2 v2.0.1 h1:RDY1VY5b+7m2mfPsugucOYPIxMp+xal5ZheSyVzUA+k=
@@ -50,8 +51,12 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
 github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -70,8 +75,14 @@ github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

internal/agent/definitions.go

@@ -0,0 +1,311 @@
+package agent
+
+import (
+	"context"
+	"fmt"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+type TerminalParams struct {
+	Command string `json:"command" description:"The shell command to execute"`
+	Timeout int    `json:"timeout,omitempty" description:"Timeout in seconds (default 60, max 300)"`
+}
+
+func NewTerminalTool() (*ToolDefinition, error) {
+	return NewTool("terminal",
+		"Execute a shell command on the local system and return the output. Use for running builds, tests, git operations, package management, system info, or any CLI task. Commands run in the user's home directory by default. Long-running commands are auto-terminated.",
+		func(ctx context.Context, p TerminalParams) (ToolResponse, error) {
+			if p.Command == "" {
+				return TextErrorResponse("command is required"), nil
+			}
+
+			timeout := time.Duration(p.Timeout) * time.Second
+			if timeout == 0 {
+				timeout = 60 * time.Second
+			}
+			if timeout > 300*time.Second {
+				timeout = 300 * time.Second
+			}
+
+			ctx, cancel := context.WithTimeout(ctx, timeout)
+			defer cancel()
+
+			shell := detectShell()
+
+			cmd := exec.CommandContext(ctx, shell, "-c", p.Command)
+			output, err := cmd.CombinedOutput()
+
+			result := string(output)
+			if len(result) > 10000 {
+				result = result[:10000] + "\n... [truncated]"
+			}
+
+			if err != nil {
+				return TextErrorResponse(fmt.Sprintf("Error: %v\n\n%s", err, result)), nil
+			}
+
+			return TextResponse(result), nil
+		})
+}
+
+type CrushRunParams struct {
+	Task string `json:"task" description:"The task description for Crush to execute"`
+}
+
+func NewCrushRunTool() (*ToolDefinition, error) {
+	return NewTool("crush_run",
+		"Delegate a complex coding task to the Crush AI agent. Crush has access to file editing, code search, bash execution, and other development tools. Use this for multi-step coding tasks like refactoring, debugging, implementing features, or code review. Returns the agent's final output.",
+		func(ctx context.Context, p CrushRunParams) (ToolResponse, error) {
+			if p.Task == "" {
+				return TextErrorResponse("task is required"), nil
+			}
+
+			ctx, cancel := context.WithTimeout(ctx, 300*time.Second)
+			defer cancel()
+
+			cmd := exec.CommandContext(ctx, "crush", "run", p.Task)
+			output, err := cmd.CombinedOutput()
+
+			result := string(output)
+			if len(result) > 15000 {
+				result = result[:15000] + "\n... [truncated]"
+			}
+
+			if err != nil {
+				return TextErrorResponse(fmt.Sprintf("Crush error: %v\n\n%s", err, result)), nil
+			}
+
+			return TextResponse(result), nil
+		})
+}
+
+type ReadFileParams struct {
+	Path  string `json:"path" description:"Absolute or relative path to the file to read"`
+	Offset int   `json:"offset,omitempty" description:"Line number to start reading from (0-based, default 0)"`
+	Limit  int   `json:"limit,omitempty" description:"Maximum number of lines to read (default 200, max 2000)"`
+}
+
+func NewReadFileTool() (*ToolDefinition, error) {
+	return NewTool("read_file",
+		"Read file contents from the local filesystem. Returns the file content with line numbers. Supports offset/limit for reading specific sections of large files.",
+		func(ctx context.Context, p ReadFileParams) (ToolResponse, error) {
+			if p.Path == "" {
+				return TextErrorResponse("path is required"), nil
+			}
+
+			expanded := expandHome(p.Path)
+			data, err := readFileLimited(expanded, p.Offset, p.Limit)
+			if err != nil {
+				return TextErrorResponse(fmt.Sprintf("read error: %v", err)), nil
+			}
+
+			return TextResponse(data), nil
+		})
+}
+
+type ListFilesParams struct {
+	Path  string `json:"path,omitempty" description:"Directory path to list (default: user home)"`
+	Depth int    `json:"depth,omitempty" description:"Maximum depth to traverse (default 1, max 3)"`
+}
+
+func NewListFilesTool() (*ToolDefinition, error) {
+	return NewTool("list_files",
+		"List files and directories at a given path. Shows directory tree structure with file names. Useful for exploring project structure or finding specific files.",
+		func(ctx context.Context, p ListFilesParams) (ToolResponse, error) {
+			dir := expandHome(p.Path)
+			if dir == "" {
+				dir, _ = osUserHomeDir()
+			}
+
+			if p.Depth <= 0 {
+				p.Depth = 1
+			}
+			if p.Depth > 3 {
+				p.Depth = 3
+			}
+
+			result, err := listDirTree(dir, p.Depth, 0)
+			if err != nil {
+				return TextErrorResponse(fmt.Sprintf("list error: %v", err)), nil
+			}
+
+			return TextResponse(result), nil
+		})
+}
+
+type SearchFilesParams struct {
+	Pattern string `json:"pattern" description:"Search pattern (supports * and ? glob wildcards)"`
+	Path    string `json:"path,omitempty" description:"Directory to search in (default: current directory)"`
+}
+
+func NewSearchFilesTool() (*ToolDefinition, error) {
+	return NewTool("search_files",
+		"Search for files by name pattern using glob syntax. Use * for any characters, ** for recursive matching. Returns matching file paths sorted by name.",
+		func(ctx context.Context, p SearchFilesParams) (ToolResponse, error) {
+			if p.Pattern == "" {
+				return TextErrorResponse("pattern is required"), nil
+			}
+
+			dir := expandHome(p.Path)
+			if dir == "" {
+				dir = "."
+			}
+
+			matches, err := filepath.Glob(filepath.Join(dir, p.Pattern))
+			if err != nil {
+				return TextErrorResponse(fmt.Sprintf("glob error: %v", err)), nil
+			}
+
+			if len(matches) == 0 {
+				return TextResponse("No files found matching pattern."), nil
+			}
+
+			if len(matches) > 100 {
+				matches = matches[:100]
+			}
+
+			var result strings.Builder
+			for _, m := range matches {
+				result.WriteString(m)
+				result.WriteString("\n")
+			}
+
+			return TextResponse(result.String()), nil
+		})
+}
+
+type GrepContentParams struct {
+	Pattern string `json:"pattern" description:"Text pattern to search for in file contents"`
+	Path    string `json:"path,omitempty" description:"Directory to search in (default: current directory)"`
+	Include string `json:"include,omitempty" description:"File extension filter, e.g. '*.go' or '*.{js,ts}'"`
+}
+
+func NewGrepContentTool() (*ToolDefinition, error) {
+	return NewTool("grep_content",
+		"Search for text patterns inside file contents. Returns matching lines with file paths and line numbers. Use include to filter by file extension.",
+		func(ctx context.Context, p GrepContentParams) (ToolResponse, error) {
+			if p.Pattern == "" {
+				return TextErrorResponse("pattern is required"), nil
+			}
+
+			dir := expandHome(p.Path)
+			if dir == "" {
+				dir = "."
+			}
+
+			result, err := grepFiles(dir, p.Pattern, p.Include)
+			if err != nil {
+				return TextErrorResponse(fmt.Sprintf("grep error: %v", err)), nil
+			}
+
+			if result == "" {
+				return TextResponse("No matches found."), nil
+			}
+
+			return TextResponse(result), nil
+		})
+}
+
+type GetConfigParams struct {
+	Section string `json:"section,omitempty" description:"Config section to retrieve: 'providers', 'profile', 'tools', 'terminal', 'all' (default: 'all')"`
+}
+
+func NewGetConfigTool() (*ToolDefinition, error) {
+	return NewTool("get_config",
+		"Read the Muyue configuration. Returns provider settings, profile info, installed tools, terminal config, etc. Use section parameter to get a specific part, or 'all' for the full config.",
+		func(ctx context.Context, p GetConfigParams) (ToolResponse, error) {
+			return getConfigSection(p.Section), nil
+		})
+}
+
+type SetProviderParams struct {
+	Name    string `json:"name" description:"Provider name (e.g. 'openai', 'anthropic', 'ollama')"`
+	APIKey  string `json:"api_key,omitempty" description:"API key for the provider"`
+	BaseURL string `json:"base_url,omitempty" description:"Custom base URL for the provider API"`
+	Model   string `json:"model,omitempty" description:"Model identifier to use"`
+	Active  *bool  `json:"active,omitempty" description:"Set to true to make this the active provider"`
+}
+
+func NewSetProviderTool() (*ToolDefinition, error) {
+	return NewTool("set_provider",
+		"Configure an AI provider in Muyue settings. Can create, update, or activate a provider. API keys are automatically encrypted. Set active=true to switch to this provider.",
+		func(ctx context.Context, p SetProviderParams) (ToolResponse, error) {
+			if p.Name == "" {
+				return TextErrorResponse("name is required"), nil
+			}
+
+			return setProviderConfig(p), nil
+		})
+}
+
+type ManageSSHParams struct {
+	Action  string `json:"action" description:"Action to perform: 'list', 'add', 'remove'"`
+	Name    string `json:"name,omitempty" description:"Connection name (required for add/remove)"`
+	Host    string `json:"host,omitempty" description:"SSH host (required for add)"`
+	Port    int    `json:"port,omitempty" description:"SSH port (default: 22)"`
+	User    string `json:"user,omitempty" description:"SSH username (required for add)"`
+	KeyPath string `json:"key_path,omitempty" description:"Path to SSH private key"`
+}
+
+func NewManageSSHTool() (*ToolDefinition, error) {
+	return NewTool("manage_ssh",
+		"Manage SSH connections configured in Muyue. List existing connections, add new ones, or remove connections. SSH configs are persisted to the Muyue config file.",
+		func(ctx context.Context, p ManageSSHParams) (ToolResponse, error) {
+			if p.Action == "" {
+				return TextErrorResponse("action is required (list, add, remove)"), nil
+			}
+
+			return manageSSHAction(p), nil
+		})
+}
+
+type WebFetchParams struct {
+	URL string `json:"url" description:"The URL to fetch content from"`
+}
+
+func NewWebFetchTool() (*ToolDefinition, error) {
+	return NewTool("web_fetch",
+		"Fetch content from a URL and return the text. Useful for reading documentation, APIs, or web resources. Only HTTP/HTTPS URLs are supported.",
+		func(ctx context.Context, p WebFetchParams) (ToolResponse, error) {
+			if p.URL == "" {
+				return TextErrorResponse("url is required"), nil
+			}
+
+			return fetchURL(p.URL), nil
+		})
+}
+
+func DefaultRegistry() *Registry {
+	r := NewRegistry()
+
+	tools := []*ToolDefinition{
+		must(NewTerminalTool()),
+		must(NewCrushRunTool()),
+		must(NewReadFileTool()),
+		must(NewListFilesTool()),
+		must(NewSearchFilesTool()),
+		must(NewGrepContentTool()),
+		must(NewGetConfigTool()),
+		must(NewSetProviderTool()),
+		must(NewManageSSHTool()),
+		must(NewWebFetchTool()),
+	}
+
+	for _, t := range tools {
+		if err := r.Register(t); err != nil {
+			panic(err)
+		}
+	}
+
+	return r
+}
+
+func must(t *ToolDefinition, err error) *ToolDefinition {
+	if err != nil {
+		panic(err)
+	}
+	return t
+}

internal/agent/impl.go

@@ -0,0 +1,579 @@
+package agent
+
+import (
+	"bufio"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+	"time"
+)
+
+func detectShell() string {
+	shells := []string{"zsh", "bash", "fish", "pwsh", "powershell"}
+	for _, s := range shells {
+		if path, err := exec.LookPath(s); err == nil {
+			return path
+		}
+	}
+	return "/bin/sh"
+}
+
+func expandHome(path string) string {
+	if path == "" {
+		return ""
+	}
+	if path == "~" {
+		home, _ := os.UserHomeDir()
+		return home
+	}
+	if strings.HasPrefix(path, "~/") {
+		home, _ := os.UserHomeDir()
+		return filepath.Join(home, path[2:])
+	}
+	return path
+}
+
+func osUserHomeDir() (string, error) {
+	return os.UserHomeDir()
+}
+
+func readFileLimited(path string, offset, limit int) (string, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return "", err
+	}
+
+	lines := strings.Split(string(data), "\n")
+
+	if offset < 0 {
+		offset = 0
+	}
+	if offset > len(lines) {
+		offset = len(lines)
+	}
+
+	end := offset + limit
+	if limit <= 0 || limit > 2000 {
+		limit = 2000
+	}
+	if end > len(lines) {
+		end = len(lines)
+	}
+	if end-offset > limit {
+		end = offset + limit
+	}
+
+	selected := lines[offset:end]
+
+	var buf strings.Builder
+	for i, line := range selected {
+		fmt.Fprintf(&buf, "%6d\t%s\n", offset+i+1, line)
+	}
+
+	return buf.String(), nil
+}
+
+func listDirTree(dir string, maxDepth, currentDepth int) (string, error) {
+	info, err := os.Stat(dir)
+	if err != nil {
+		return "", err
+	}
+	if !info.IsDir() {
+		return dir + "\n", nil
+	}
+
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return "", err
+	}
+
+	var buf strings.Builder
+	indent := strings.Repeat("  ", currentDepth)
+
+	for _, entry := range entries {
+		name := entry.Name()
+		if strings.HasPrefix(name, ".") && name != "." && name != ".." {
+			continue
+		}
+
+		if entry.IsDir() {
+			fmt.Fprintf(&buf, "%s%s/\n", indent, name)
+			if currentDepth < maxDepth {
+				sub, err := listDirTree(filepath.Join(dir, name), maxDepth, currentDepth+1)
+				if err == nil {
+					buf.WriteString(sub)
+				}
+			}
+		} else {
+			fmt.Fprintf(&buf, "%s%s\n", indent, name)
+		}
+	}
+
+	return buf.String(), nil
+}
+
+func grepFiles(dir, pattern, include string) (string, error) {
+	if include != "" {
+		matches, err := filepath.Glob(filepath.Join(dir, include))
+		if err != nil {
+			return "", err
+		}
+		if len(matches) == 0 {
+			return "", nil
+		}
+		var buf strings.Builder
+		for _, match := range matches {
+			result, err := grepInFile(match, pattern)
+			if err != nil {
+				continue
+			}
+			buf.WriteString(result)
+		}
+		return buf.String(), nil
+	}
+
+	return grepInDir(dir, pattern, 0)
+}
+
+func grepInDir(dir, pattern string, depth int) (string, error) {
+	if depth > 10 {
+		return "", nil
+	}
+
+	var buf strings.Builder
+
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return "", err
+	}
+
+	for _, entry := range entries {
+		name := entry.Name()
+		if strings.HasPrefix(name, ".") {
+			continue
+		}
+
+		path := filepath.Join(dir, name)
+
+		if entry.IsDir() {
+			sub, err := grepInDir(path, pattern, depth+1)
+			if err == nil {
+				buf.WriteString(sub)
+			}
+			continue
+		}
+
+		result, err := grepInFile(path, pattern)
+		if err != nil {
+			continue
+		}
+		buf.WriteString(result)
+	}
+
+	return buf.String(), nil
+}
+
+func grepInFile(path, pattern string) (string, error) {
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		re, err = regexp.Compile(regexp.QuoteMeta(pattern))
+		if err != nil {
+			return "", err
+		}
+	}
+
+	file, err := os.Open(path)
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	var buf strings.Builder
+	scanner := bufio.NewScanner(file)
+	scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)
+
+	lineNum := 0
+	matchCount := 0
+	for scanner.Scan() {
+		lineNum++
+		if re.MatchString(scanner.Text()) {
+			fmt.Fprintf(&buf, "%s:%d: %s\n", path, lineNum, scanner.Text())
+			matchCount++
+			if matchCount >= 50 {
+				buf.WriteString("... [truncated, more matches exist]\n")
+				break
+			}
+		}
+	}
+
+	return buf.String(), nil
+}
+
+func getConfigSection(section string) ToolResponse {
+	configPath, err := os.UserConfigDir()
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("cannot find config dir: %v", err))
+	}
+	configPath = filepath.Join(configPath, "muyue", "config.yaml")
+
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("cannot read config: %v", err))
+	}
+
+	switch section {
+	case "providers", "profile", "tools", "terminal":
+		sectionData := extractYAMLSection(data, section)
+		if sectionData == "" {
+			return TextResponse(fmt.Sprintf("Section '%s' not found in config.", section))
+		}
+		return TextResponse(sectionData)
+	default:
+		content := string(data)
+		if len(content) > 8000 {
+			content = content[:8000] + "\n... [truncated]"
+		}
+		return TextResponse(content)
+	}
+}
+
+func extractYAMLSection(data []byte, section string) string {
+	lines := strings.Split(string(data), "\n")
+	inSection := false
+	indentLevel := 0
+	var buf strings.Builder
+
+	for _, line := range lines {
+		trimmed := strings.TrimSpace(line)
+		if trimmed == "" || strings.HasPrefix(trimmed, "#") {
+			if inSection {
+				buf.WriteString("\n")
+			}
+			continue
+		}
+
+		if !inSection {
+			if strings.HasPrefix(trimmed, section+":") || strings.HasPrefix(trimmed, section+" ") {
+				inSection = true
+				indentLevel = len(line) - len(strings.TrimLeft(line, " "))
+				buf.WriteString(line)
+				buf.WriteString("\n")
+			}
+			continue
+		}
+
+		currentIndent := len(line) - len(strings.TrimLeft(line, " "))
+		if currentIndent <= indentLevel && trimmed != "" {
+			break
+		}
+		buf.WriteString(line)
+		buf.WriteString("\n")
+	}
+
+	return strings.TrimSpace(buf.String())
+}
+
+func setProviderConfig(p SetProviderParams) ToolResponse {
+	configPath, err := os.UserConfigDir()
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("cannot find config dir: %v", err))
+	}
+	configPath = filepath.Join(configPath, "muyue", "config.yaml")
+
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("cannot read config: %v", err))
+	}
+
+	lines := strings.Split(string(data), "\n")
+	inProviders := false
+	providerIndent := 0
+	foundProvider := false
+	insertIdx := -1
+	lastProviderEnd := -1
+
+	for i, line := range lines {
+		trimmed := strings.TrimSpace(line)
+		if !inProviders {
+			if strings.HasPrefix(trimmed, "providers:") {
+				inProviders = true
+				providerIndent = len(line) - len(strings.TrimLeft(line, " "))
+			}
+			continue
+		}
+
+		currentIndent := len(line) - len(strings.TrimLeft(line, " "))
+		if currentIndent <= providerIndent && trimmed != "" && !strings.HasPrefix(trimmed, "#") {
+			lastProviderEnd = i
+			break
+		}
+
+		if currentIndent == providerIndent+2 && strings.HasPrefix(trimmed, "- name:") {
+			nameMatch := strings.TrimPrefix(trimmed, "- name:")
+			nameMatch = strings.TrimSpace(nameMatch)
+			if nameMatch == p.Name {
+				foundProvider = true
+				insertIdx = i
+			}
+			if insertIdx == -1 || insertIdx < i {
+				insertIdx = i
+			}
+		}
+	}
+
+	if lastProviderEnd == -1 {
+		lastProviderEnd = len(lines)
+	}
+
+	entryIndent := strings.Repeat(" ", providerIndent+4)
+
+	var newEntry strings.Builder
+	newEntry.WriteString(fmt.Sprintf("  - name: %s\n", p.Name))
+	if p.Model != "" {
+		newEntry.WriteString(fmt.Sprintf("%smodel: %s\n", entryIndent, p.Model))
+	}
+	if p.BaseURL != "" {
+		newEntry.WriteString(fmt.Sprintf("%sbase_url: %s\n", entryIndent, p.BaseURL))
+	}
+	if p.APIKey != "" {
+		newEntry.WriteString(fmt.Sprintf("%sapi_key: %s\n", entryIndent, p.APIKey))
+	}
+	if p.Active != nil {
+		newEntry.WriteString(fmt.Sprintf("%sactive: %v\n", entryIndent, *p.Active))
+	}
+
+	if foundProvider && insertIdx >= 0 {
+		var endIdx int
+		for endIdx = insertIdx + 1; endIdx < len(lines); endIdx++ {
+			li := len(lines[endIdx]) - len(strings.TrimLeft(lines[endIdx], " "))
+			if li <= providerIndent+2 || lines[endIdx] == "" {
+				if endIdx > insertIdx+1 && strings.TrimSpace(lines[endIdx]) == "" {
+					continue
+				}
+				break
+			}
+		}
+
+		newLines := make([]string, 0, len(lines))
+		newLines = append(newLines, lines[:insertIdx]...)
+		newLines = append(newLines, strings.TrimSuffix(newEntry.String(), "\n"))
+		newLines = append(newLines, lines[endIdx:]...)
+		lines = newLines
+	} else {
+		insertAt := lastProviderEnd
+		newLines := make([]string, 0, len(lines)+10)
+		newLines = append(newLines, lines[:insertAt]...)
+		newLines = append(newLines, strings.TrimSuffix(newEntry.String(), "\n"))
+		newLines = append(newLines, lines[insertAt:]...)
+		lines = newLines
+	}
+
+	content := strings.Join(lines, "\n")
+	if err := os.WriteFile(configPath, []byte(content), 0600); err != nil {
+		return TextErrorResponse(fmt.Sprintf("write config error: %v", err))
+	}
+
+	return TextResponse(fmt.Sprintf("Provider '%s' configured successfully.", p.Name))
+}
+
+func manageSSHAction(p ManageSSHParams) ToolResponse {
+	configPath, err := os.UserConfigDir()
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("cannot find config dir: %v", err))
+	}
+	configPath = filepath.Join(configPath, "muyue", "config.yaml")
+
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("cannot read config: %v", err))
+	}
+
+	switch p.Action {
+	case "list":
+		sshSection := extractYAMLSection(data, "ssh")
+		if sshSection == "" {
+			return TextResponse("No SSH connections configured.")
+		}
+		return TextResponse(sshSection)
+
+	case "add":
+		if p.Name == "" || p.Host == "" || p.User == "" {
+			return TextErrorResponse("name, host, and user are required for add action")
+		}
+		if p.Port == 0 {
+			p.Port = 22
+		}
+
+		lines := strings.Split(string(data), "\n")
+		sshIdx := -1
+		sshIndent := 0
+		lastSSHEnd := -1
+
+		for i, line := range lines {
+			trimmed := strings.TrimSpace(line)
+			if sshIdx == -1 && strings.HasPrefix(trimmed, "ssh:") {
+				sshIdx = i
+				sshIndent = len(line) - len(strings.TrimLeft(line, " "))
+				continue
+			}
+			if sshIdx != -1 {
+				li := len(line) - len(strings.TrimLeft(line, " "))
+				if li <= sshIndent && trimmed != "" {
+					lastSSHEnd = i
+					break
+				}
+			}
+		}
+
+		if lastSSHEnd == -1 {
+			lastSSHEnd = len(lines)
+		}
+
+		entry := fmt.Sprintf("    - name: %s\n      host: %s\n      port: %d\n      user: %s", p.Name, p.Host, p.Port, p.User)
+		if p.KeyPath != "" {
+			entry += fmt.Sprintf("\n      key_path: %s", p.KeyPath)
+		}
+
+		newLines := make([]string, 0, len(lines)+10)
+		newLines = append(newLines, lines[:lastSSHEnd]...)
+		newLines = append(newLines, entry)
+		newLines = append(newLines, lines[lastSSHEnd:]...)
+
+		if err := os.WriteFile(configPath, []byte(strings.Join(newLines, "\n")), 0600); err != nil {
+			return TextErrorResponse(fmt.Sprintf("write config error: %v", err))
+		}
+		return TextResponse(fmt.Sprintf("SSH connection '%s' (%s@%s:%d) added.", p.Name, p.User, p.Host, p.Port))
+
+	case "remove":
+		if p.Name == "" {
+			return TextErrorResponse("name is required for remove action")
+		}
+
+		lines := strings.Split(string(data), "\n")
+		newLines := make([]string, 0, len(lines))
+		skipping := false
+		removed := false
+
+		for i, line := range lines {
+			trimmed := strings.TrimSpace(line)
+			if strings.Contains(trimmed, "name: "+p.Name) && strings.HasPrefix(trimmed, "-") {
+				skipping = true
+				removed = true
+				continue
+			}
+			if skipping {
+				li := len(line) - len(strings.TrimLeft(line, " "))
+				if li > 6 && i < len(lines)-1 && strings.TrimSpace(lines[i+1]) != "" {
+					continue
+				}
+				skipping = false
+				continue
+			}
+			newLines = append(newLines, line)
+		}
+
+		if !removed {
+			return TextErrorResponse(fmt.Sprintf("SSH connection '%s' not found.", p.Name))
+		}
+
+		if err := os.WriteFile(configPath, []byte(strings.Join(newLines, "\n")), 0600); err != nil {
+			return TextErrorResponse(fmt.Sprintf("write config error: %v", err))
+		}
+		return TextResponse(fmt.Sprintf("SSH connection '%s' removed.", p.Name))
+
+	default:
+		return TextErrorResponse("unknown action. Use 'list', 'add', or 'remove'")
+	}
+}
+
+func fetchURL(url string) ToolResponse {
+	if !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {
+		return TextErrorResponse("only http/https URLs are supported")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("create request: %v", err))
+	}
+	req.Header.Set("User-Agent", "MuyueStudio/1.0")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("fetch error: %v", err))
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 50000))
+	if err != nil {
+		return TextErrorResponse(fmt.Sprintf("read error: %v", err))
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return TextErrorResponse(fmt.Sprintf("HTTP %d: %s", resp.StatusCode, truncate(string(body), 2000)))
+	}
+
+	contentType := resp.Header.Get("Content-Type")
+	if strings.Contains(contentType, "text/html") {
+		text := stripHTML(string(body))
+		if len(text) > 8000 {
+			text = text[:8000] + "\n... [truncated]"
+		}
+		return TextResponse(text)
+	}
+
+	result := string(body)
+	if len(result) > 10000 {
+		result = result[:10000] + "\n... [truncated]"
+	}
+	return TextResponse(result)
+}
+
+func truncate(s string, maxLen int) string {
+	if len(s) <= maxLen {
+		return s
+	}
+	return s[:maxLen] + "..."
+}
+
+func stripHTML(html string) string {
+	tagRe := regexp.MustCompile(`<[^>]*>`)
+	text := tagRe.ReplaceAllString(html, " ")
+
+	entityRe := regexp.MustCompile(`&[a-zA-Z]+;`)
+	text = entityRe.ReplaceAllStringFunc(text, func(s string) string {
+		switch s {
+		case "&amp;":
+			return "&"
+		case "&lt;":
+			return "<"
+		case "&gt;":
+			return ">"
+		case "&quot;":
+			return "\""
+		case "&#39;":
+			return "'"
+		case "&nbsp;":
+			return " "
+		default:
+			return " "
+		}
+	})
+
+	multiSpace := regexp.MustCompile(`\s+`)
+	text = multiSpace.ReplaceAllString(text, " ")
+	return strings.TrimSpace(text)
+}
+
+var _ = runtime.GOOS
+var _ = json.Marshal

internal/agent/prompt.go

@@ -0,0 +1,10 @@
+package agent
+
+import _ "embed"
+
+//go:embed prompts/studio_system.md
+var studioSystemPrompt string
+
+func StudioSystemPrompt() string {
+	return studioSystemPrompt
+}

internal/agent/prompts/studio_system.md

@@ -0,0 +1,44 @@
+Tu es l'assistant IA de **Muyue Studio**, le centre de commandement de l'environnement de développement de l'utilisateur.
+
+Tu es intégré dans Muyue, un gestionnaire d'environnement de développement de bureau. Ton rôle est d'aider l'utilisateur à configurer, gérer et optimiser son environnement dev.
+
+## Environnement
+
+Muyue gère :
+- **Fournisseurs IA** (OpenAI, Anthropic, Ollama, MiniMax, etc.)
+- **Outils de développement** (Crush, Claude Code, etc.)
+- **Terminaux locaux et SSH**
+- **Configuration et préférences**
+- **Serveurs MCP et LSP**
+
+## Outils disponibles
+
+Tu as accès à des outils. Utilise-les concrètement, ne décris pas ce que tu ferais — fais-le.
+
+- **terminal** : Exécuter des commandes shell (builds, tests, git, etc.)
+- **crush_run** : Déléguer une tâche complexe à l'agent Crush (édition de fichiers, refactoring, debug)
+- **read_file** : Lire le contenu d'un fichier
+- **list_files** : Lister les fichiers d'un répertoire
+- **search_files** : Chercher des fichiers par motif (glob)
+- **grep_content** : Chercher du texte dans le contenu des fichiers
+- **get_config** : Lire la configuration Muyue
+- **set_provider** : Configurer un fournisseur IA
+- **manage_ssh** : Gérer les connexions SSH
+- **web_fetch** : Récupérer le contenu d'une URL
+
+## Règles
+
+1. **AGIS, ne décris pas** — Si l'utilisateur demande de faire quelque chose, utilise les outils pour le faire. Ne dis pas "je pourrais faire X" — fais-le.
+2. **Sois concis** — Pas de préambule, pas de blabla. Réponse directe.
+3. **Une chose à la fois** — N'appelle pas plusieurs outils simultanément sauf si c'est nécessaire.
+4. **Gère les erreurs** — Si un outil échoue, essaie une approche différente avant de le dire à l'utilisateur.
+5. **Ne devine pas** — Si tu n'as pas assez d'informations, utilise les outils pour les obtenir (lire un fichier, chercher, etc.)
+6. **Confidentialité** — Ne révèle jamais les clés API, mots de passe ou informations sensibles dans tes réponses.
+7. **Langue** — Réponds dans la même langue que l'utilisateur.
+
+## Format des réponses
+
+- Code : utilise des blocs markdown
+- Résultats d'outils : résume les points clés, ne colle pas des milliers de lignes
+- Erreurs : explique clairement et propose une solution
+- Succès : confirme brièvement ce qui a été fait

internal/agent/tools.go

@@ -0,0 +1,218 @@
+package agent
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+type ToolCall struct {
+	ID       string          `json:"id"`
+	Name     string          `json:"name"`
+	Arguments json.RawMessage `json:"arguments"`
+}
+
+type ToolResponse struct {
+	Content string            `json:"content"`
+	IsError bool              `json:"is_error"`
+	Meta    map[string]string `json:"meta,omitempty"`
+}
+
+func TextResponse(content string) ToolResponse {
+	return ToolResponse{Content: content}
+}
+
+func TextErrorResponse(msg string) ToolResponse {
+	return ToolResponse{Content: msg, IsError: true}
+}
+
+type ToolDefinition struct {
+	Name        string          `json:"name"`
+	Description string          `json:"description"`
+	Params      json.RawMessage `json:"parameters"`
+	Handler     func(ctx context.Context, args json.RawMessage) (ToolResponse, error)
+}
+
+func (td *ToolDefinition) Execute(ctx context.Context, call ToolCall) (ToolResponse, error) {
+	resp, err := td.Handler(ctx, call.Arguments)
+	if err != nil {
+		return ToolResponse{Content: err.Error(), IsError: true}, nil
+	}
+	return resp, nil
+}
+
+func (td *ToolDefinition) ToOpenAITool() map[string]interface{} {
+	return map[string]interface{}{
+		"type": "function",
+		"function": map[string]interface{}{
+			"name":        td.Name,
+			"description": td.Description,
+			"parameters":  td.Params,
+		},
+	}
+}
+
+func NewTool[P any](name, description string, handler func(ctx context.Context, params P) (ToolResponse, error)) (*ToolDefinition, error) {
+	var zero P
+	paramsSchema, err := generateSchema(zero)
+	if err != nil {
+		return nil, fmt.Errorf("generate schema for %s: %w", name, err)
+	}
+
+	wrappedHandler := func(ctx context.Context, raw json.RawMessage) (ToolResponse, error) {
+		var params P
+		if err := json.Unmarshal(raw, &params); err != nil {
+			return TextErrorResponse(fmt.Sprintf("invalid arguments: %v", err)), nil
+		}
+		return handler(ctx, params)
+	}
+
+	return &ToolDefinition{
+		Name:        name,
+		Description: description,
+		Params:      paramsSchema,
+		Handler:     wrappedHandler,
+	}, nil
+}
+
+type Registry struct {
+	tools map[string]*ToolDefinition
+}
+
+func NewRegistry() *Registry {
+	return &Registry{
+		tools: make(map[string]*ToolDefinition),
+	}
+}
+
+func (r *Registry) Register(tool *ToolDefinition) error {
+	if _, exists := r.tools[tool.Name]; exists {
+		return fmt.Errorf("tool %q already registered", tool.Name)
+	}
+	r.tools[tool.Name] = tool
+	return nil
+}
+
+func (r *Registry) Get(name string) (*ToolDefinition, bool) {
+	t, ok := r.tools[name]
+	return t, ok
+}
+
+func (r *Registry) All() []*ToolDefinition {
+	out := make([]*ToolDefinition, 0, len(r.tools))
+	for _, t := range r.tools {
+		out = append(out, t)
+	}
+	return out
+}
+
+func (r *Registry) OpenAITools() []map[string]interface{} {
+	out := make([]map[string]interface{}, 0, len(r.tools))
+	for _, t := range r.tools {
+		out = append(out, t.ToOpenAITool())
+	}
+	return out
+}
+
+func (r *Registry) Execute(ctx context.Context, call ToolCall) (ToolResponse, error) {
+	tool, ok := r.tools[call.Name]
+	if !ok {
+		return TextErrorResponse(fmt.Sprintf("unknown tool: %s", call.Name)), nil
+	}
+	return tool.Execute(ctx, call)
+}
+
+func generateSchema(v interface{}) (json.RawMessage, error) {
+	t := reflect.TypeOf(v)
+	if t == nil {
+		return json.RawMessage(`{"type":"object","properties":{}}`), nil
+	}
+
+	if t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	}
+
+	if t.Kind() != reflect.Struct {
+		return json.RawMessage(`{"type":"object","properties":{}}`), nil
+	}
+
+	props := make(map[string]interface{})
+	required := []string{}
+
+	for i := 0; i < t.NumField(); i++ {
+		field := t.Field(i)
+		if !field.IsExported() {
+			continue
+		}
+
+		jsonTag := field.Tag.Get("json")
+		if jsonTag == "-" {
+			continue
+		}
+
+		jsonName := field.Name
+		parts := strings.Split(jsonTag, ",")
+		if parts[0] != "" {
+			jsonName = parts[0]
+		}
+
+		omitempty := false
+		for _, part := range parts[1:] {
+			if part == "omitempty" {
+				omitempty = true
+			}
+		}
+
+		desc := field.Tag.Get("description")
+		prop := map[string]interface{}{
+			"type": goTypeToJSON(field.Type),
+		}
+		if desc != "" {
+			prop["description"] = desc
+		}
+
+		props[jsonName] = prop
+		if !omitempty {
+			required = append(required, jsonName)
+		}
+	}
+
+	schema := map[string]interface{}{
+		"type":       "object",
+		"properties": props,
+	}
+	if len(required) > 0 {
+		schema["required"] = required
+	}
+
+	data, err := json.Marshal(schema)
+	if err != nil {
+		return nil, err
+	}
+	return json.RawMessage(data), nil
+}
+
+func goTypeToJSON(t reflect.Type) string {
+	switch t.Kind() {
+	case reflect.String:
+		return "string"
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+		reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return "integer"
+	case reflect.Float32, reflect.Float64:
+		return "number"
+	case reflect.Bool:
+		return "boolean"
+	case reflect.Slice:
+		if t.Elem().Kind() == reflect.Uint8 {
+			return "string"
+		}
+		return "array"
+	case reflect.Map:
+		return "object"
+	default:
+		return "string"
+	}
+}

internal/api/chat_engine.go

@@ -0,0 +1,244 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"github.com/muyue/muyue/internal/agent"
+	"github.com/muyue/muyue/internal/orchestrator"
+)
+
+const (
+	MaxToolIterations = 15
+)
+
+// ChatEngine handles chat interactions with tool execution.
+// This deduplicates chat logic previously repeated in handlers_chat.go and handlers_shell_chat.go.
+type ChatEngine struct {
+	orchestrator *orchestrator.Orchestrator
+	registry   *agent.Registry
+	tools      json.RawMessage
+	onChunk    func(map[string]interface{})
+	stream    bool
+}
+
+// NewChatEngine creates a new ChatEngine instance.
+func NewChatEngine(orb *orchestrator.Orchestrator, registry *agent.Registry, tools json.RawMessage) *ChatEngine {
+	return &ChatEngine{
+		orchestrator: orb,
+		registry:     registry,
+		tools:        tools,
+		stream:      false,
+	}
+}
+
+// SetStream enables streaming mode for the chat engine.
+func (ce *ChatEngine) SetStream(enabled bool) {
+	ce.stream = enabled
+}
+
+// OnChunk sets the callback for SSE chunk writing.
+func (ce *ChatEngine) OnChunk(fn func(map[string]interface{})) {
+	ce.onChunk = fn
+}
+
+// RunWithTools executes the chat loop with tool calls.
+// Returns final content, tool calls, tool results, and error.
+func (ce *ChatEngine) RunWithTools(ctx context.Context, messages []orchestrator.Message) (string, []map[string]interface{}, []map[string]interface{}, error) {
+	var finalContent string
+	var allToolCalls []map[string]interface{}
+	var allToolResults []map[string]interface{}
+
+	for i := 0; i < MaxToolIterations; i++ {
+		var resp *orchestrator.ChatResponse
+		var err error
+
+		if ce.stream {
+			// Use streaming version
+			resp, err = ce.orchestrator.SendWithToolsStream(messages, func(content string, toolCalls []orchestrator.ToolCallMsg) {
+				if ce.onChunk != nil && content != "" {
+					ce.onChunk(map[string]interface{}{"content": content})
+				}
+			})
+		} else {
+			resp, err = ce.orchestrator.SendWithTools(messages)
+		}
+		if err != nil {
+			if ce.onChunk != nil {
+				ce.onChunk(map[string]interface{}{"error": err.Error()})
+			}
+			return finalContent, allToolCalls, allToolResults, err
+		}
+
+		choice := resp.Choices[0]
+		content := cleanThinkingTags(choice.Message.Content)
+
+		if content != "" {
+			if ce.onChunk != nil {
+				ce.onChunk(map[string]interface{}{"content": content})
+			}
+			finalContent = content
+		}
+
+		if len(choice.Message.ToolCalls) == 0 {
+			break
+		}
+
+		assistantMsg := orchestrator.Message{
+			Role:      "assistant",
+			Content:   content,
+			ToolCalls: choice.Message.ToolCalls,
+		}
+		messages = append(messages, assistantMsg)
+
+		for _, tc := range choice.Message.ToolCalls {
+			toolCallData := map[string]interface{}{
+				"tool_call_id": tc.ID,
+				"name":        tc.Function.Name,
+				"args":        tc.Function.Arguments,
+			}
+			allToolCalls = append(allToolCalls, toolCallData)
+
+			if ce.onChunk != nil {
+				ce.onChunk(map[string]interface{}{"tool_call": toolCallData})
+			}
+
+			call := agent.ToolCall{
+				ID:        tc.ID,
+				Name:      tc.Function.Name,
+				Arguments: json.RawMessage(tc.Function.Arguments),
+			}
+
+			result, execErr := ce.registry.Execute(ctx, call)
+			if execErr != nil {
+				result = agent.ToolResponse{
+					Content: execErr.Error(),
+					IsError: true,
+				}
+			}
+
+			resultData := map[string]interface{}{
+				"tool_call_id": tc.ID,
+				"content":     result.Content,
+				"is_error":    result.IsError,
+			}
+			allToolResults = append(allToolResults, map[string]interface{}{
+				"tool_call_id": tc.ID,
+				"name":        tc.Function.Name,
+				"args":        tc.Function.Arguments,
+				"result":      result.Content,
+				"is_error":    result.IsError,
+			})
+
+			if ce.onChunk != nil {
+				ce.onChunk(map[string]interface{}{"tool_result": resultData})
+			}
+
+			messages = append(messages, orchestrator.Message{
+				Role:       "tool",
+				Content:    result.Content,
+				ToolCallID: tc.ID,
+				Name:       tc.Function.Name,
+			})
+		}
+
+		finalContent = ""
+	}
+
+	return finalContent, allToolCalls, allToolResults, nil
+}
+
+// RunNonStream executes chat without streaming content to client.
+func (ce *ChatEngine) RunNonStream(ctx context.Context, messages []orchestrator.Message) (string, error) {
+	var finalContent string
+
+	for i := 0; i < MaxToolIterations; i++ {
+		resp, err := ce.orchestrator.SendWithTools(messages)
+		if err != nil {
+			return finalContent, err
+		}
+
+		choice := resp.Choices[0]
+		content := cleanThinkingTags(choice.Message.Content)
+
+		if content != "" {
+			finalContent = content
+		}
+
+		if len(choice.Message.ToolCalls) == 0 {
+			break
+		}
+
+		assistantMsg := orchestrator.Message{
+			Role:      "assistant",
+			Content:   content,
+			ToolCalls: choice.Message.ToolCalls,
+		}
+		messages = append(messages, assistantMsg)
+
+		for _, tc := range choice.Message.ToolCalls {
+			call := agent.ToolCall{
+				ID:        tc.ID,
+				Name:      tc.Function.Name,
+				Arguments: json.RawMessage(tc.Function.Arguments),
+			}
+
+			result, execErr := ce.registry.Execute(ctx, call)
+			if execErr != nil {
+				result = agent.ToolResponse{
+					Content: execErr.Error(),
+					IsError: true,
+				}
+			}
+
+			messages = append(messages, orchestrator.Message{
+				Role:       "tool",
+				Content:    result.Content,
+				ToolCallID: tc.ID,
+				Name:       tc.Function.Name,
+			})
+		}
+
+		finalContent = ""
+	}
+
+	if finalContent == "" {
+		finalContent = "(tool calls completed, no text response)"
+	}
+
+	return finalContent, nil
+}
+
+// SSEWriter handles Server-Sent Events writing to HTTP response.
+type SSEWriter struct {
+	w       http.ResponseWriter
+	flusher http.Flusher
+}
+
+// NewSSEWriter creates a new SSEWriter.
+func NewSSEWriter(w http.ResponseWriter) *SSEWriter {
+	sse := &SSEWriter{w: w}
+	if f, ok := w.(http.Flusher); ok {
+		sse.flusher = f
+	}
+	return sse
+}
+
+// Write sends an SSE message.
+func (s *SSEWriter) Write(data map[string]interface{}) {
+	b, _ := json.Marshal(data)
+	s.w.Write([]byte("data: " + string(b) + "\n\n"))
+	if s.flusher != nil {
+		s.flusher.Flush()
+	}
+}
+
+// SetupSSEHeaders sets up SSE response headers.
+func SetupSSEHeaders(w http.ResponseWriter) {
+	w.Header().Set("Content-Type", "text/event-stream")
+	w.Header().Set("Cache-Control", "no-cache")
+	w.Header().Set("Connection", "keep-alive")
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.WriteHeader(http.StatusOK)
+}

internal/api/conversation.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 	"unicode/utf8"
@@ -36,6 +37,19 @@ type ConversationStore struct {
 	conv *Conversation
 }
 
+type TokenCount struct {
+	total     int
+	byRole    map[string]int
+	byMessage int
+}
+
+type SearchResult struct {
+	ID      string `json:"id"`
+	Role    string `json:"role"`
+	Content string `json:"content"`
+	Time    string `json:"time"`
+}
+
 func NewConversationStore() *ConversationStore {
 	dir, err := config.ConfigDir()
 	if err != nil {
@@ -140,19 +154,109 @@ func (cs *ConversationStore) TrimOld(keepCount int) {
 }
 
 func (cs *ConversationStore) ApproxTokenCount() int {
+	return cs.ApproxTokenCountDetailed().total
+}
+
+func (cs *ConversationStore) ApproxTokenCountDetailed() TokenCount {
 	cs.mu.RLock()
 	defer cs.mu.RUnlock()
-	total := utf8.RuneCountInString(cs.conv.Summary)
-	for _, m := range cs.conv.Messages {
-		total += utf8.RuneCountInString(m.Content)
+
+	result := TokenCount{
+		byRole: make(map[string]int),
 	}
-	return total / charsPerToken
+
+	for _, m := range cs.conv.Messages {
+		count := utf8.RuneCountInString(m.Content) / charsPerToken
+		result.byMessage += count
+		result.byRole[m.Role] += count
+	}
+
+	if cs.conv.Summary != "" {
+		result.total = result.byMessage + utf8.RuneCountInString(cs.conv.Summary)/charsPerToken
+	} else {
+		result.total = result.byMessage
+	}
+
+	return result
 }
 
 func (cs *ConversationStore) NeedsSummarization() bool {
 	return cs.ApproxTokenCount() > summarizeThreshold
 }
 
+func (cs *ConversationStore) Search(query string) []SearchResult {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+
+	var results []SearchResult
+	queryLower := strings.ToLower(query)
+
+	for _, msg := range cs.conv.Messages {
+		if strings.Contains(strings.ToLower(msg.Content), queryLower) {
+			results = append(results, SearchResult{
+				ID:      msg.ID,
+				Role:    msg.Role,
+				Content: msg.Content,
+				Time:    msg.Time,
+			})
+		}
+	}
+
+	return results
+}
+
+func (cs *ConversationStore) ExportMarkdown() string {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+
+	var sb strings.Builder
+	sb.WriteString("# Conversation Export\n\n")
+	sb.WriteString(fmt.Sprintf("Exporté le: %s\n\n", time.Now().Format(time.RFC3339)))
+
+	if cs.conv.Summary != "" {
+		sb.WriteString("## Résumé\n\n")
+		sb.WriteString(cs.conv.Summary)
+		sb.WriteString("\n\n---\n\n")
+	}
+
+	sb.WriteString("## Messages\n\n")
+
+	for i, msg := range cs.conv.Messages {
+		roleLabel := msg.Role
+		if roleLabel == "user" {
+			roleLabel = "👤 Utilisateur"
+		} else if roleLabel == "assistant" {
+			roleLabel = "🤖 Assistant"
+		} else if roleLabel == "system" {
+			roleLabel = "⚙️ Système"
+		}
+
+		timestamp := ""
+		if msg.Time != "" {
+			if t, err := time.Parse(time.RFC3339, msg.Time); err == nil {
+				timestamp = t.Format("2006-01-02 15:04")
+			}
+		}
+
+		sb.WriteString(fmt.Sprintf("### [%d] %s (%s)\n\n", i+1, roleLabel, timestamp))
+		sb.WriteString(msg.Content)
+		sb.WriteString("\n\n---\n\n")
+	}
+
+	return sb.String()
+}
+
+func (cs *ConversationStore) ExportJSON() string {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+
+	data, err := json.MarshalIndent(cs.conv, "", "  ")
+	if err != nil {
+		return "{}"
+	}
+	return string(data)
+}
+
 func generateMsgID() string {
 	return time.Now().Format("20060102150405.000") + "-" + fmt.Sprintf("%d", time.Now().UnixNano())
-}
+}

internal/api/conversation_multi.go

@@ -0,0 +1,370 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/muyue/muyue/internal/config"
+)
+
+// ConversationMeta represents metadata for a conversation (used for listing).
+type ConversationMeta struct {
+	ID        string    `json:"id"`
+	Title     string    `json:"title"`
+	CreatedAt string    `json:"created_at"`
+	UpdatedAt string    `json:"updated_at"`
+	MessageCount int    `json:"message_count"`
+}
+
+// ConversationStoreMulti manages multiple conversations.
+type ConversationStoreMulti struct {
+	mu         sync.RWMutex
+	dir        string
+	currentID  string
+	conversations map[string]*Conversation
+}
+
+func NewConversationStoreMulti() *ConversationStoreMulti {
+	dir, err := config.ConfigDir()
+	if err != nil {
+		dir = "/tmp/muyue"
+	}
+	dir = filepath.Join(dir, "conversations")
+	
+	cs := &ConversationStoreMulti{
+		dir:        dir,
+		conversations: make(map[string]*Conversation),
+	}
+	cs.loadIndex()
+	return cs
+}
+
+func (cs *ConversationStoreMulti) loadIndex() {
+	os.MkdirAll(cs.dir, 0755)
+	
+	// Load index file if exists
+	indexPath := filepath.Join(cs.dir, "index.json")
+	data, err := os.ReadFile(indexPath)
+	if err != nil {
+		// Create default conversation
+		cs.createDefault()
+		return
+	}
+	
+	var index struct {
+		CurrentID      string             `json:"current_id"`
+		Conversations []ConversationMeta `json:"conversations"`
+	}
+	if err := json.Unmarshal(data, &index); err != nil {
+		cs.createDefault()
+		return
+	}
+	
+	cs.currentID = index.CurrentID
+	if cs.currentID == "" {
+		cs.createDefault()
+		return
+	}
+	
+	// Load all conversations
+	for _, meta := range index.Conversations {
+		convPath := filepath.Join(cs.dir, fmt.Sprintf("conv_%s.json", meta.ID))
+		data, err := os.ReadFile(convPath)
+		if err != nil {
+			continue
+		}
+		var conv Conversation
+		if err := json.Unmarshal(data, &conv); err != nil {
+			continue
+		}
+		cs.conversations[meta.ID] = &conv
+	}
+	
+	// Ensure current conversation exists
+	if _, ok := cs.conversations[cs.currentID]; !ok {
+		cs.createDefault()
+	}
+}
+
+func (cs *ConversationStoreMulti) createDefault() {
+	cs.currentID = uuid.New().String()
+	cs.conversations[cs.currentID] = &Conversation{
+		Messages:  []FeedMessage{},
+		CreatedAt: time.Now().Format(time.RFC3339),
+		UpdatedAt: time.Now().Format(time.RFC3339),
+	}
+	cs.saveIndex()
+}
+
+func (cs *ConversationStoreMulti) saveIndex() error {
+	var metas []ConversationMeta
+	for id, conv := range cs.conversations {
+		title := "Nouvelle conversation"
+		if len(conv.Messages) > 0 {
+			// Use first user message as title
+			for _, m := range conv.Messages {
+				if m.Role == "user" {
+					if len(m.Content) > 50 {
+						title = m.Content[:50] + "..."
+					} else {
+						title = m.Content
+					}
+					break
+				}
+			}
+		}
+		metas = append(metas, ConversationMeta{
+			ID:           id,
+			Title:        title,
+			CreatedAt:    conv.CreatedAt,
+			UpdatedAt:   conv.UpdatedAt,
+			MessageCount: len(conv.Messages),
+		})
+	}
+	
+	index := struct {
+		CurrentID      string             `json:"current_id"`
+		Conversations []ConversationMeta `json:"conversations"`
+	}{
+		CurrentID:      cs.currentID,
+		Conversations: metas,
+	}
+	
+	data, err := json.MarshalIndent(index, "", "  ")
+	if err != nil {
+		return err
+	}
+	
+	return os.WriteFile(filepath.Join(cs.dir, "index.json"), data, 0600)
+}
+
+func (cs *ConversationStoreMulti) saveCurrent() error {
+	conv, ok := cs.conversations[cs.currentID]
+	if !ok {
+		return fmt.Errorf("no current conversation")
+	}
+	
+	conv.UpdatedAt = time.Now().Format(time.RFC3339)
+	data, err := json.MarshalIndent(conv, "", "  ")
+	if err != nil {
+		return err
+	}
+	
+	convPath := filepath.Join(cs.dir, fmt.Sprintf("conv_%s.json", cs.currentID))
+	if err := os.WriteFile(convPath, data, 0600); err != nil {
+		return err
+	}
+	
+	return cs.saveIndex()
+}
+
+// Current returns the current conversation store.
+func (cs *ConversationStoreMulti) Current() *ConversationStore {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+	
+	conv, ok := cs.conversations[cs.currentID]
+	if !ok {
+		return &ConversationStore{
+			conv: &Conversation{
+				Messages:  []FeedMessage{},
+				CreatedAt: time.Now().Format(time.RFC3339),
+				UpdatedAt: time.Now().Format(time.RFC3339),
+			},
+		}
+	}
+	
+	return &ConversationStore{
+		conv: conv,
+	}
+}
+
+// Get returns the current conversation messages.
+func (cs *ConversationStoreMulti) Get() []FeedMessage {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+	
+	conv, ok := cs.conversations[cs.currentID]
+	if !ok {
+		return []FeedMessage{}
+	}
+	
+	out := make([]FeedMessage, len(conv.Messages))
+	copy(out, conv.Messages)
+	return out
+}
+
+// Add adds a message to the current conversation.
+func (cs *ConversationStoreMulti) Add(role, content string) FeedMessage {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	
+	conv, ok := cs.conversations[cs.currentID]
+	if !ok {
+		cs.currentID = uuid.New().String()
+		conv = &Conversation{
+			Messages:  []FeedMessage{},
+			CreatedAt: time.Now().Format(time.RFC3339),
+			UpdatedAt: time.Now().Format(time.RFC3339),
+		}
+		cs.conversations[cs.currentID] = conv
+	}
+	
+	msg := FeedMessage{
+		ID:      generateMsgID(),
+		Role:    role,
+		Content: content,
+		Time:    time.Now().Format(time.RFC3339),
+	}
+	conv.Messages = append(conv.Messages, msg)
+	
+	go cs.saveCurrent() // Fire and forget
+	
+	return msg
+}
+
+// Clear clears the current conversation.
+func (cs *ConversationStoreMulti) Clear() {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	
+	conv, ok := cs.conversations[cs.currentID]
+	if !ok {
+		return
+	}
+	
+	conv.Messages = []FeedMessage{}
+	conv.Summary = ""
+	conv.CreatedAt = time.Now().Format(time.RFC3339)
+	conv.UpdatedAt = time.Now().Format(time.RFC3339)
+	
+	cs.saveCurrent()
+}
+
+// List returns all conversations.
+func (cs *ConversationStoreMulti) List() []ConversationMeta {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+	
+	var metas []ConversationMeta
+	for id, conv := range cs.conversations {
+		title := "Nouvelle conversation"
+		if len(conv.Messages) > 0 {
+			for _, m := range conv.Messages {
+				if m.Role == "user" {
+					if len(m.Content) > 50 {
+						title = m.Content[:50] + "..."
+					} else {
+						title = m.Content
+					}
+					break
+				}
+			}
+		}
+		metas = append(metas, ConversationMeta{
+			ID:           id,
+			Title:        title,
+			CreatedAt:    conv.CreatedAt,
+			UpdatedAt:   conv.UpdatedAt,
+			MessageCount: len(conv.Messages),
+		})
+	}
+	
+	return metas
+}
+
+// Create creates a new conversation and switches to it.
+func (cs *ConversationStoreMulti) Create() string {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	
+	id := uuid.New().String()
+	cs.conversations[id] = &Conversation{
+		Messages:  []FeedMessage{},
+		CreatedAt: time.Now().Format(time.RFC3339),
+		UpdatedAt: time.Now().Format(time.RFC3339),
+	}
+	cs.currentID = id
+	cs.saveIndex()
+	
+	return id
+}
+
+// Switch switches to a different conversation.
+func (cs *ConversationStoreMulti) Switch(id string) error {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	
+	if _, ok := cs.conversations[id]; !ok {
+		return fmt.Errorf("conversation not found: %s", id)
+	}
+	
+	cs.currentID = id
+	cs.saveIndex()
+	
+	return nil
+}
+
+// GetByID returns a conversation by ID.
+func (cs *ConversationStoreMulti) GetByID(id string) (*Conversation, error) {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+	
+	conv, ok := cs.conversations[id]
+	if !ok {
+		return nil, fmt.Errorf("conversation not found: %s", id)
+	}
+	
+	return conv, nil
+}
+
+// Delete deletes a conversation.
+func (cs *ConversationStoreMulti) Delete(id string) error {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	
+	if _, ok := cs.conversations[id]; !ok {
+		return fmt.Errorf("conversation not found: %s", id)
+	}
+	
+	delete(cs.conversations, id)
+	
+	// Delete file
+	convPath := filepath.Join(cs.dir, fmt.Sprintf("conv_%s.json", id))
+	os.Remove(convPath)
+	
+	// If deleted current, switch to another
+	if cs.currentID == id {
+		if len(cs.conversations) > 0 {
+			for newID := range cs.conversations {
+				cs.currentID = newID
+				break
+			}
+		} else {
+			// Create new default
+			cs.currentID = uuid.New().String()
+			cs.conversations[cs.currentID] = &Conversation{
+				Messages:  []FeedMessage{},
+				CreatedAt: time.Now().Format(time.RFC3339),
+				UpdatedAt: time.Now().Format(time.RFC3339),
+			}
+		}
+	}
+	
+	cs.saveIndex()
+	
+	return nil
+}
+
+// CurrentID returns the current conversation ID.
+func (cs *ConversationStoreMulti) CurrentID() string {
+	cs.mu.RLock()
+	defer cs.mu.RUnlock()
+	
+	return cs.currentID
+}

internal/api/handlers_chat.go

@@ -1,17 +1,17 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
-	"os/exec"
 	"regexp"
 	"strings"
 
+	"github.com/muyue/muyue/internal/agent"
 	"github.com/muyue/muyue/internal/orchestrator"
 )
 
-var toolCallRegex = regexp.MustCompile(`\[TOOL_CALL:\{[^\}]+\}\]`)
+var thinkingTagRegex = regexp.MustCompile(`(?s)<[Tt]hink[^>]*>.*?</[Tt]hink>`)
 
 func (s *Server) handleChat(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "POST" {
@@ -27,7 +27,7 @@ func (s *Server) handleChat(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if body.Message == "" {
-		writeError(w, "no message", http.StatusBadRequest)
+		writeError(w, "no message", http.StatusMethodNotAllowed)
 		return
 	}
 
@@ -42,143 +42,128 @@ func (s *Server) handleChat(w http.ResponseWriter, r *http.Request) {
 		writeError(w, err.Error(), http.StatusServiceUnavailable)
 		return
 	}
-	orb.SetSystemPrompt(`Tu es l'assistant IA de Muyue Studio. Tu as accès à un outil "crush" pour exécuter des tâches complexes sur l'ordinateur de l'utilisateur.
-
-RÈGLES ABSOLUES:
-1. Tu as DEUX possibilités ONLY:
-   - Répondre directement à l'utilisateur avec tes connaissances
-   - Demander l'exécution d'une tâche via crush en utilisant ce format EXACT:
-     [TOOL_CALL:{"tool":"crush","task":"description de la tâche"}]
-
-2. Quand tu utilises [TOOL_CALL:...], le système exécutera la tâche et te donnera le résultat.
-   Tu peux ensuite répondre à l'utilisateur avec ce résultat.
-
-3. SOIS CONCIS - pas de blabla, vais droit au but.
-
-4. L'utilisateur ne voit PAS tes pensées entre <think> tags.
-
-5. EXEMPLES d'utilisation de tool:
-   - "cherche tous les fichiers .md dans le projet" → [TOOL_CALL:{"tool":"crush","task":"Recherche les fichiers .md dans le projet courant"}]
-   - "aide-moi à déboguer cette erreur" → tu peux répondre directement si tu as assez d'info, sinon utiliser tool
-   - "quelle est la météo?" → [TOOL_CALL:{"tool":"crush","task":"Cherche la météo actuelle"}]
-
-6. Ne fais PAS de multi-step tool calls dans une seule réponse. Attends le résultat avant de continuer.`)
+	orb.SetSystemPrompt(agent.StudioSystemPrompt())
+	orb.SetTools(s.agentToolsJSON)
 
 	if body.Stream {
-		w.Header().Set("Content-Type", "text/event-stream")
-		w.Header().Set("Cache-Control", "no-cache")
-		w.Header().Set("Connection", "keep-alive")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-		w.WriteHeader(http.StatusOK)
-		flusher, canFlush := w.(http.Flusher)
+		s.handleStreamChat(w, orb, body.Message)
+	} else {
+		s.handleNonStreamChat(w, orb, body.Message)
+	}
+}
 
-		result, err := orb.SendStream(body.Message, func(chunk string) {
-			if strings.HasPrefix(chunk, "<think") {
-				data, _ := json.Marshal(map[string]string{"thinking": strings.TrimPrefix(chunk, "<think")})
-				w.Write([]byte("data: " + string(data) + "\n\n"))
-				if canFlush {
-					flusher.Flush()
-				}
-				return
-			}
-			if chunk == "</think>" {
-				data, _ := json.Marshal(map[string]string{"thinking_end": "true"})
-				w.Write([]byte("data: " + string(data) + "\n\n"))
-				if canFlush {
-					flusher.Flush()
-				}
-				return
-			}
-			data, _ := json.Marshal(map[string]string{"content": chunk})
-			w.Write([]byte("data: " + string(data) + "\n\n"))
-			if canFlush {
-				flusher.Flush()
-			}
-		})
-		if err != nil {
-			data, _ := json.Marshal(map[string]string{"error": err.Error()})
-			w.Write([]byte("data: " + string(data) + "\n\n"))
-			if canFlush {
-				flusher.Flush()
-			}
+func (s *Server) handleStreamChat(w http.ResponseWriter, orb *orchestrator.Orchestrator, userMessage string) {
+	SetupSSEHeaders(w)
+	flusher, canFlush := w.(http.Flusher)
+
+
+	sseWriter := NewSSEWriter(w)
+
+
+	ctx := context.Background()
+	messages := s.buildContextMessages(userMessage)
+
+	engine := NewChatEngine(orb, s.agentRegistry, s.agentToolsJSON)
+	engine.OnChunk(func(data map[string]interface{}) {
+		if data == nil {
 			return
 		}
-
-		// Process tool calls if any
-		cleanResult := processToolCalls(result)
-		s.convStore.Add("assistant", cleanResult)
-
-		data, _ := json.Marshal(map[string]string{"done": "true"})
-		w.Write([]byte("data: " + string(data) + "\n\n"))
+		sseWriter.Write(data)
 		if canFlush {
 			flusher.Flush()
 		}
+	})
+
+	finalContent, allToolCalls, allToolResults, err := engine.RunWithTools(ctx, messages)
+	if err != nil {
+		sseWriter.Write(map[string]interface{}{"error": err.Error()})
 		return
 	}
 
-	result, err := orb.Send(body.Message)
+	storeContent := finalContent
+	if len(allToolCalls) > 0 {
+		storeObj := map[string]interface{}{
+			"content":      storeContent,
+			"tool_calls":   allToolCalls,
+			"tool_results": allToolResults,
+		}
+		storeJSON, _ := json.Marshal(storeObj)
+		storeContent = string(storeJSON)
+	}
+	s.convStore.Add("assistant", storeContent)
+
+	sseWriter.Write(map[string]interface{}{"done": "true"})
+}
+
+func (s *Server) handleNonStreamChat(w http.ResponseWriter, orb *orchestrator.Orchestrator, userMessage string) {
+	ctx := context.Background()
+	messages := s.buildContextMessages(userMessage)
+
+	engine := NewChatEngine(orb, s.agentRegistry, s.agentToolsJSON)
+	finalContent, err := engine.RunNonStream(ctx, messages)
 	if err != nil {
 		writeError(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	cleanResult := processToolCalls(result)
-	s.convStore.Add("assistant", cleanResult)
-	writeJSON(w, map[string]string{"content": cleanResult})
-}
 
-func processToolCalls(content string) string {
-	matches := toolCallRegex.FindAllString(content, -1)
-	if len(matches) == 0 {
-		return cleanThinkingTags(content)
-	}
-
-	var result strings.Builder
-	clean := content
-
-	for _, match := range matches {
-		// Extract tool and task from [TOOL_CALL:{...}]
-		inner := strings.TrimPrefix(match, "[TOOL_CALL:")
-		inner = strings.TrimSuffix(inner, "]}") + "}"
-
-		var call struct {
-			Tool string `json:"tool"`
-			Task string `json:"task"`
-		}
-		if err := json.Unmarshal([]byte(inner), &call); err != nil {
-			continue
-		}
-
-		if call.Tool == "crush" && call.Task != "" {
-			result.WriteString(fmt.Sprintf("> %s\n\n", call.Task))
-			output := executeCrush(call.Task)
-			result.WriteString(output)
-			result.WriteString("\n\n---\n\n")
-		}
-
-		clean = strings.Replace(clean, match, "", 1)
-	}
-
-	clean = cleanThinkingTags(clean)
-
-	if result.Len() > 0 {
-		clean = strings.TrimSpace(clean) + "\n\n" + strings.TrimSpace(result.String())
-	}
-
-	return clean
+	s.convStore.Add("assistant", finalContent)
+	writeJSON(w, map[string]string{"content": finalContent})
 }
 
 func cleanThinkingTags(content string) string {
-	re := regexp.MustCompile(`(?s)<think[^>]*>.*?</think>`)
-	return re.ReplaceAllString(content, "")
+	return strings.TrimSpace(thinkingTagRegex.ReplaceAllString(content, ""))
 }
 
-func executeCrush(task string) string {
-	cmd := exec.Command("crush", "run", task)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Sprintf("Erreur: %v\n%s", err, string(output))
+const contextWindowMessages = 20
+
+func (s *Server) buildContextMessages(userMessage string) []orchestrator.Message {
+	history := s.convStore.Get()
+	start := 0
+	if len(history) > contextWindowMessages {
+		start = len(history) - contextWindowMessages
 	}
-	return string(output)
+
+	messages := make([]orchestrator.Message, 0, len(history[start:])+1)
+
+	summary := s.convStore.GetSummary()
+	if summary != "" {
+		messages = append(messages, orchestrator.Message{
+			Role:    "system",
+			Content: "Résumé de la conversation précédente:\n" + summary,
+		})
+	}
+
+	for _, m := range history[start:] {
+		content := m.Content
+		if m.Role == "assistant" {
+			var parsed struct {
+				Content   string `json:"content"`
+				ToolCalls []struct {
+					ToolCallID string `json:"tool_call_id"`
+					Name       string `json:"name"`
+					Args       string `json:"args"`
+				} `json:"tool_calls"`
+			}
+			if err := json.Unmarshal([]byte(content), &parsed); err == nil && parsed.Content != "" {
+				content = parsed.Content
+			}
+		}
+		role := m.Role
+		if role == "system" {
+			continue
+		}
+		messages = append(messages, orchestrator.Message{
+			Role:    role,
+			Content: content,
+		})
+	}
+
+	messages = append(messages, orchestrator.Message{
+		Role:    "user",
+		Content: userMessage,
+	})
+
+	return messages
 }
 
 func (s *Server) autoSummarize() {
@@ -221,8 +206,11 @@ func (s *Server) handleChatHistory(w http.ResponseWriter, r *http.Request) {
 	}
 	messages := s.convStore.Get()
 	writeJSON(w, map[string]interface{}{
-		"messages": messages,
-		"tokens":   s.convStore.ApproxTokenCount(),
+		"messages":     messages,
+		"tokens":       s.convStore.ApproxTokenCount(),
+		"max_tokens":   maxTokensApprox,
+		"summarize_at": summarizeThreshold,
+		"summary":      s.convStore.GetSummary(),
 	})
 }
 
@@ -233,4 +221,17 @@ func (s *Server) handleChatClear(w http.ResponseWriter, r *http.Request) {
 	}
 	s.convStore.Clear()
 	writeJSON(w, map[string]string{"status": "ok"})
-}
+}
+
+func (s *Server) handleChatSummarize(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+	s.autoSummarize()
+	writeJSON(w, map[string]interface{}{
+		"status":  "ok",
+		"tokens":  s.convStore.ApproxTokenCount(),
+		"summary": s.convStore.GetSummary(),
+	})
+}

internal/api/handlers_config.go

@@ -53,32 +53,27 @@ func (s *Server) handleSaveProfile(w http.ResponseWriter, r *http.Request) {
 		writeError(w, "no config", http.StatusNotFound)
 		return
 	}
-	var body struct {
-		Name   string `json:"name"`
-		Pseudo string `json:"pseudo"`
-		Email  string `json:"email"`
-		Editor string `json:"editor"`
-		Shell  string `json:"shell"`
+
+	currentJSON, err := json.Marshal(s.config.Profile)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
 	}
-	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+	var currentMap map[string]interface{}
+	json.Unmarshal(currentJSON, &currentMap)
+
+	var updates map[string]interface{}
+	body, _ := io.ReadAll(r.Body)
+	if err := json.Unmarshal(body, &updates); err != nil {
 		writeError(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	if body.Name != "" {
-		s.config.Profile.Name = body.Name
-	}
-	if body.Pseudo != "" {
-		s.config.Profile.Pseudo = body.Pseudo
-	}
-	if body.Email != "" {
-		s.config.Profile.Email = body.Email
-	}
-	if body.Editor != "" {
-		s.config.Profile.Preferences.Editor = body.Editor
-	}
-	if body.Shell != "" {
-		s.config.Profile.Preferences.Shell = body.Shell
-	}
+
+	deepMerge(currentMap, updates)
+
+	mergedJSON, _ := json.Marshal(currentMap)
+	json.Unmarshal(mergedJSON, &s.config.Profile)
+
 	if err := config.Save(s.config); err != nil {
 		writeError(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -86,6 +81,20 @@ func (s *Server) handleSaveProfile(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, map[string]string{"status": "ok"})
 }
 
+func deepMerge(dst, src map[string]interface{}) {
+	for k, sv := range src {
+		if dv, ok := dst[k]; ok {
+			dstMap, dOk := dv.(map[string]interface{})
+			srcMap, sOk := sv.(map[string]interface{})
+			if dOk && sOk {
+				deepMerge(dstMap, srcMap)
+				continue
+			}
+		}
+		dst[k] = sv
+	}
+}
+
 func (s *Server) handleSaveProvider(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "PUT" {
 		writeError(w, "PUT only", http.StatusMethodNotAllowed)

internal/api/handlers_info.go

@@ -1,7 +1,16 @@
 package api
 
 import (
+	"encoding/json"
+	"fmt"
+	"io"
 	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"time"
 
 	"github.com/muyue/muyue/internal/lsp"
 	"github.com/muyue/muyue/internal/mcp"
@@ -15,6 +24,7 @@ func (s *Server) handleInfo(w http.ResponseWriter, r *http.Request) {
 		"name":    version.Name,
 		"version": version.Version,
 		"author":  version.Author,
+		"sudo":    os.Geteuid() == 0,
 	})
 }
 
@@ -95,9 +105,14 @@ func (s *Server) handleLSP(w http.ResponseWriter, r *http.Request) {
 
 func (s *Server) handleMCP(w http.ResponseWriter, r *http.Request) {
 	servers := mcp.ScanServers()
+	home, _ := os.UserHomeDir()
+	editors := mcp.DetectInstalledEditors(home)
+	statuses := mcp.GetAllStatuses()
 	writeJSON(w, map[string]interface{}{
-		"servers":    servers,
-		"configured": true,
+		"servers":         servers,
+		"configured":      true,
+		"detected_editors": editors,
+		"statuses":        statuses,
 	})
 }
 
@@ -106,14 +121,651 @@ func (s *Server) handleMCPConfigure(w http.ResponseWriter, r *http.Request) {
 		writeError(w, "POST only", http.StatusMethodNotAllowed)
 		return
 	}
-	if err := mcp.ConfigureAll(s.config); err != nil {
+
+	var body struct {
+		Editor string `json:"editor,omitempty"`
+	}
+	if r.Body != nil {
+		json.NewDecoder(r.Body).Decode(&body)
+	}
+
+	if body.Editor != "" {
+		if err := mcp.ConfigureForEditor(s.config, body.Editor); err != nil {
+			writeError(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+	} else {
+		if err := mcp.ConfigureAll(s.config); err != nil {
+			writeError(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+	}
+	writeJSON(w, map[string]string{"status": "ok"})
+}
+
+func (s *Server) handleMCPStatus(w http.ResponseWriter, r *http.Request) {
+	statuses := mcp.GetAllStatuses()
+	writeJSON(w, map[string]interface{}{
+		"statuses": statuses,
+	})
+}
+
+func (s *Server) handleMCPRegistry(w http.ResponseWriter, r *http.Request) {
+	reg, err := mcp.LoadRegistry()
+	if err != nil {
 		writeError(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	writeJSON(w, map[string]string{"status": "ok"})
+	writeJSON(w, map[string]interface{}{
+		"registry": reg,
+	})
+}
+
+func (s *Server) handleLSPHealth(w http.ResponseWriter, r *http.Request) {
+	servers := lsp.ScanServers()
+	type healthInfo struct {
+		Name      string `json:"name"`
+		Language  string `json:"language"`
+		Installed bool   `json:"installed"`
+		Healthy   bool   `json:"healthy"`
+		Detail    string `json:"detail,omitempty"`
+	}
+	var results []healthInfo
+	for _, srv := range servers {
+		healthy, detail := lsp.HealthCheck(srv.Name)
+		results = append(results, healthInfo{
+			Name:      srv.Name,
+			Language:  srv.Language,
+			Installed: srv.Installed,
+			Healthy:   healthy,
+			Detail:    detail,
+		})
+	}
+	writeJSON(w, map[string]interface{}{
+		"servers": results,
+	})
+}
+
+func (s *Server) handleLSPAutoInstall(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		ProjectDir string `json:"project_dir,omitempty"`
+	}
+	if r.Body != nil {
+		json.NewDecoder(r.Body).Decode(&body)
+	}
+
+	if body.ProjectDir == "" {
+		home, _ := os.UserHomeDir()
+		body.ProjectDir = home
+	}
+
+	results, err := lsp.AutoInstallForProject(body.ProjectDir)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	writeJSON(w, map[string]interface{}{
+		"results": results,
+	})
+}
+
+func (s *Server) handleLSPEditorConfig(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		Editor string   `json:"editor"`
+		Names  []string `json:"names,omitempty"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	allServers := lsp.ScanServers()
+	var selected []lsp.LSPServer
+	if len(body.Names) > 0 {
+		nameSet := map[string]bool{}
+		for _, n := range body.Names {
+			nameSet[n] = true
+		}
+		for _, srv := range allServers {
+			if nameSet[srv.Name] {
+				selected = append(selected, srv)
+			}
+		}
+	} else {
+		for _, srv := range allServers {
+			if srv.Installed {
+				selected = append(selected, srv)
+			}
+		}
+	}
+
+	config, err := lsp.GenerateEditorConfigs(selected, body.Editor, "")
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	writeJSON(w, map[string]interface{}{
+		"editor": body.Editor,
+		"config": config,
+	})
+}
+
+func (s *Server) handleSkillValidate(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		Name string `json:"name"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	skill, err := skills.Get(body.Name)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusNotFound)
+		return
+	}
+
+	errs := skills.Validate(skill)
+	writeJSON(w, map[string]interface{}{
+		"name":         body.Name,
+		"valid":        len(errs) == 0,
+		"errors":       errs,
+		"dependencies": skills.CheckDependencies(skill),
+	})
+}
+
+func (s *Server) handleSkillTest(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		Name       string `json:"name"`
+		SampleTask string `json:"sample_task,omitempty"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	result := skills.DryRun(body.Name, body.SampleTask)
+	writeJSON(w, result)
+}
+
+func (s *Server) handleSkillExport(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		Name       string `json:"name"`
+		ExportPath string `json:"export_path"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	home, _ := os.UserHomeDir()
+	if body.ExportPath == "" {
+		body.ExportPath = home + "/.muyue/exports/" + body.Name + ".md"
+	}
+
+	if err := skills.Export(body.Name, body.ExportPath); err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	writeJSON(w, map[string]string{"status": "ok", "path": body.ExportPath})
+}
+
+func (s *Server) handleSkillImport(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		ImportPath string `json:"import_path"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	skill, err := skills.Import(body.ImportPath)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	if err := skills.Create(skill); err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	writeJSON(w, map[string]interface{}{"status": "ok", "skill": skill.Name})
+}
+
+func (s *Server) handleDashboardStatus(w http.ResponseWriter, r *http.Request) {
+	mcpStatuses := mcp.GetAllStatuses()
+	lspServers := lsp.ScanServers()
+	skillList, _ := skills.List()
+
+	mcpHealthy := 0
+	mcpTotal := len(mcpStatuses)
+	for _, st := range mcpStatuses {
+		if st.Healthy {
+			mcpHealthy++
+		}
+	}
+
+	lspInstalled := 0
+	lspTotal := len(lspServers)
+	for _, srv := range lspServers {
+		if srv.Installed {
+			lspInstalled++
+		}
+	}
+
+	skillsDeployed := len(skillList)
+	var skillIssues []string
+	for _, sk := range skillList {
+		missing := skills.CheckDependencies(&sk)
+		if len(missing) > 0 {
+			for _, dep := range missing {
+				skillIssues = append(skillIssues, sk.Name+": missing "+dep.Type+" "+dep.Name)
+			}
+		}
+	}
+
+	writeJSON(w, map[string]interface{}{
+		"mcp": map[string]interface{}{
+			"total":   mcpTotal,
+			"healthy": mcpHealthy,
+			"servers": mcpStatuses,
+		},
+		"lsp": map[string]interface{}{
+			"total":     lspTotal,
+			"installed": lspInstalled,
+			"servers":   lspServers,
+		},
+		"skills": map[string]interface{}{
+			"total":    skillsDeployed,
+			"issues":   skillIssues,
+			"deployed": skillList,
+		},
+	})
 }
 
 func (s *Server) handleScan(w http.ResponseWriter, r *http.Request) {
 	s.scanResult = scanner.ScanSystem()
 	writeJSON(w, map[string]string{"status": "ok"})
 }
+
+func (s *Server) handleEditors(w http.ResponseWriter, r *http.Request) {
+	editors := scanner.ScanEditors()
+	writeJSON(w, map[string]interface{}{"editors": editors})
+}
+
+func (s *Server) handleProvidersQuota(w http.ResponseWriter, r *http.Request) {
+	type providerQuota struct {
+		Name    string                 `json:"name"`
+		Active  bool                   `json:"active"`
+		Healthy bool                   `json:"healthy"`
+		Data    map[string]interface{} `json:"data,omitempty"`
+		Error   string                 `json:"error,omitempty"`
+	}
+	var results []providerQuota
+	client := &http.Client{Timeout: 8 * time.Second}
+	for _, p := range s.config.AI.Providers {
+		q := providerQuota{Name: p.Name, Active: p.Active}
+		switch p.Name {
+		case "minimax":
+			if p.APIKey == "" {
+				q.Error = "no API key"
+				results = append(results, q)
+				continue
+			}
+			req, _ := http.NewRequest("GET", "https://api.minimax.io/v1/token_plan/remains", nil)
+			req.Header.Set("Authorization", "Bearer "+p.APIKey)
+			req.Header.Set("Content-Type", "application/json")
+			resp, err := client.Do(req)
+			if err != nil {
+				q.Error = err.Error()
+			} else {
+				body, _ := io.ReadAll(resp.Body)
+				resp.Body.Close()
+				var data map[string]interface{}
+				if json.Unmarshal(body, &data) == nil {
+					if models, ok := data["model_remains"].([]interface{}); ok {
+						filtered := make([]map[string]interface{}, 0)
+						for _, m := range models {
+							if mm, ok := m.(map[string]interface{}); ok {
+								usage, _ := mm["current_interval_usage_count"].(float64)
+								total, _ := mm["current_interval_total_count"].(float64)
+								if total > 0 {
+									filtered = append(filtered, map[string]interface{}{
+										"model":       mm["model_name"],
+										"used":        usage,
+										"total":       total,
+										"remaining":   total - usage,
+										"weekly_used": mm["current_weekly_usage_count"],
+										"weekly_total": mm["current_weekly_total_count"],
+									})
+								}
+							}
+						}
+						q.Data = map[string]interface{}{"models": filtered}
+						q.Healthy = true
+					}
+				}
+			}
+		case "zai":
+			if p.APIKey == "" {
+				q.Error = "no API key"
+				results = append(results, q)
+				continue
+			}
+			req, _ := http.NewRequest("GET", "https://api.z.ai/api/monitor/usage/quota/limit", nil)
+			req.Header.Set("Authorization", "Bearer "+p.APIKey)
+			req.Header.Set("Accept", "application/json")
+			resp, err := client.Do(req)
+			if err != nil {
+				q.Error = err.Error()
+			} else {
+				body, _ := io.ReadAll(resp.Body)
+				resp.Body.Close()
+				var data map[string]interface{}
+				if json.Unmarshal(body, &data) == nil {
+					if d, ok := data["data"].(map[string]interface{}); ok {
+						if limits, ok := d["limits"].([]interface{}); ok {
+							models := make([]map[string]interface{}, 0)
+							for _, l := range limits {
+								if lm, ok := l.(map[string]interface{}); ok {
+									name := "Z.AI"
+									if model, ok := lm["model"].(string); ok && model != "" {
+										name = model
+									} else if t, ok := lm["type"].(string); ok && t != "TIME_LIMIT" {
+										name = t
+									}
+									usage, _ := lm["usage"].(float64)
+									remaining, _ := lm["remaining"].(float64)
+									limitVal, hasLimit := lm["limit"].(float64)
+									total := usage + remaining
+									if hasLimit && limitVal > 0 {
+										total = limitVal
+									}
+									if total > 0 {
+										models = append(models, map[string]interface{}{
+											"model":     name,
+											"used":      usage,
+											"total":     total,
+											"remaining": remaining,
+										})
+									}
+								}
+							}
+							if len(models) > 0 {
+								q.Data = map[string]interface{}{"models": models}
+								q.Healthy = true
+							}
+						}
+					}
+				}
+			}
+		case "claude", "anthropic":
+			// Claude Code n'a pas d'API externe, vérifier l'installation
+			claudePath := "/usr/bin/claude"
+			if _, err := os.Stat(claudePath); err == nil {
+				q.Healthy = true
+			} else {
+				q.Error = "claude code not installed"
+			}
+		default:
+			q.Error = "quota not supported"
+		}
+		results = append(results, q)
+	}
+	writeJSON(w, map[string]interface{}{"providers": results})
+}
+
+func (s *Server) handleRecentCommands(w http.ResponseWriter, r *http.Request) {
+	home, _ := os.UserHomeDir()
+	type cmdEntry struct {
+		Cmd     string `json:"cmd"`
+		Shell   string `json:"shell"`
+	}
+
+	var entries []cmdEntry
+
+	for _, histFile := range []string{".bash_history", ".zsh_history"} {
+		path := filepath.Join(home, histFile)
+		data, err := os.ReadFile(path)
+		if err != nil {
+			continue
+		}
+		shell := "bash"
+		if strings.Contains(histFile, "zsh") {
+			shell = "zsh"
+		}
+		lines := strings.Split(string(data), "\n")
+		start := len(lines) - 50
+		if start < 0 {
+			start = 0
+		}
+
+		for i := len(lines) - 1; i >= start; i-- {
+			line := strings.TrimSpace(lines[i])
+			if line == "" || strings.HasPrefix(line, "#") {
+				continue
+			}
+			if strings.HasPrefix(line, ": ") {
+				parts := strings.SplitN(line, ";", 2)
+				if len(parts) == 2 {
+					line = strings.TrimSpace(parts[1])
+				} else {
+					continue
+				}
+			}
+			if line == "" {
+				continue
+			}
+
+			base := strings.Fields(line)[0]
+			if len(base) < 2 {
+				continue
+			}
+			if !regexp.MustCompile(`^[a-zA-Z@./]`).MatchString(base) {
+				continue
+			}
+
+			entries = append(entries, cmdEntry{Cmd: line, Shell: shell})
+		}
+	}
+
+	max := 20
+	if len(entries) > max {
+		entries = entries[:max]
+	}
+
+	writeJSON(w, map[string]interface{}{"commands": entries})
+}
+
+func (s *Server) handleRunningProcesses(w http.ResponseWriter, r *http.Request) {
+	type proc struct {
+		PID     int    `json:"pid"`
+		Name    string `json:"name"`
+		Command string `json:"command"`
+		CPU     string `json:"cpu"`
+		Mem     string `json:"mem"`
+	}
+	var procs []proc
+
+	editors := []string{"code", "nvim", "vim", "emacs", "hx", "subl", "zed", "cursor"}
+	langs := []string{"node", "python", "java", "go", "rustc", "cargo", "ruby", "php"}
+	interesting := append(editors, langs...)
+	interesting = append(interesting, "muyue")
+
+	cmd := exec.Command("ps", "aux")
+	out, err := cmd.Output()
+	if err != nil {
+		writeJSON(w, map[string]interface{}{"processes": procs})
+		return
+	}
+
+	lines := strings.Split(string(out), "\n")
+	for _, line := range lines[1:] {
+		fields := strings.Fields(line)
+		if len(fields) < 11 {
+			continue
+		}
+		fullCmd := strings.Join(fields[10:], " ")
+		name := filepath.Base(fields[10])
+		matched := false
+		for _, pattern := range interesting {
+			if strings.Contains(name, pattern) || strings.Contains(strings.ToLower(fullCmd), pattern) {
+				matched = true
+				break
+			}
+		}
+		if !matched {
+			continue
+		}
+		var pid int
+		fmt.Sscanf(fields[1], "%d", &pid)
+		procs = append(procs, proc{
+			PID:     pid,
+			Name:    name,
+			Command: fullCmd,
+			CPU:     fields[2],
+			Mem:     fields[3],
+		})
+	}
+
+	writeJSON(w, map[string]interface{}{"processes": procs})
+}
+
+type sysMetrics struct {
+	CPUPercent float64 `json:"cpu_percent"`
+	MemPercent float64 `json:"mem_percent"`
+	MemUsedMB  float64 `json:"mem_used_mb"`
+	MemTotalMB float64 `json:"mem_total_mb"`
+	NetRxKBs   float64 `json:"net_rx_kbs"`
+	NetTxKBs   float64 `json:"net_tx_kbs"`
+}
+
+var (
+	lastCPU    [2]float64
+	lastNet    [2]float64
+	lastNetTs  time.Time
+	lastCPUSet bool
+)
+
+func (s *Server) handleSystemMetrics(w http.ResponseWriter, r *http.Request) {
+	m := sysMetrics{}
+
+	// CPU from /proc/stat
+	if data, err := os.ReadFile("/proc/stat"); err == nil {
+		line := strings.Split(string(data), "\n")[0]
+		fields := strings.Fields(line)
+		if len(fields) >= 5 {
+			var idle, total float64
+			for i := 1; i < len(fields) && i <= 4; i++ {
+				var v float64
+				fmt.Sscanf(fields[i], "%f", &v)
+				total += v
+				if i == 4 {
+					idle = v
+				}
+			}
+			if lastCPUSet {
+				dIdle := idle - lastCPU[0]
+				dTotal := total - lastCPU[1]
+				if dTotal > 0 {
+					m.CPUPercent = (1 - dIdle/dTotal) * 100
+				}
+			}
+			lastCPU = [2]float64{idle, total}
+			lastCPUSet = true
+		}
+	}
+
+	// Memory from /proc/meminfo
+	if data, err := os.ReadFile("/proc/meminfo"); err == nil {
+		var memTotal, memAvailable float64
+		for _, line := range strings.Split(string(data), "\n") {
+			fields := strings.Fields(line)
+			if len(fields) < 2 {
+				continue
+			}
+			var v float64
+			fmt.Sscanf(fields[1], "%f", &v)
+			switch fields[0] {
+			case "MemTotal:":
+				memTotal = v
+			case "MemAvailable:":
+				memAvailable = v
+			}
+		}
+		if memTotal > 0 {
+			m.MemTotalMB = memTotal / 1024
+			m.MemUsedMB = (memTotal - memAvailable) / 1024
+			m.MemPercent = (memTotal - memAvailable) / memTotal * 100
+		}
+	}
+
+	// Network from /proc/net/dev
+	if data, err := os.ReadFile("/proc/net/dev"); err == nil {
+		var rxBytes, txBytes float64
+		for _, line := range strings.Split(string(data), "\n")[2:] {
+			fields := strings.Fields(line)
+			if len(fields) < 10 {
+				continue
+			}
+			iface := strings.TrimSuffix(fields[0], ":")
+			if iface == "lo" {
+				continue
+			}
+			var rx, tx float64
+			fmt.Sscanf(fields[1], "%f", &rx)
+			fmt.Sscanf(fields[9], "%f", &tx)
+			rxBytes += rx
+			txBytes += tx
+		}
+		now := time.Now()
+		if !lastNetTs.IsZero() {
+			elapsed := now.Sub(lastNetTs).Seconds()
+			if elapsed > 0 {
+				m.NetRxKBs = (rxBytes - lastNet[0]) / 1024 / elapsed
+				m.NetTxKBs = (txBytes - lastNet[1]) / 1024 / elapsed
+				if m.NetRxKBs < 0 {
+					m.NetRxKBs = 0
+				}
+				if m.NetTxKBs < 0 {
+					m.NetTxKBs = 0
+				}
+			}
+		}
+		lastNet = [2]float64{rxBytes, txBytes}
+		lastNetTs = now
+	}
+
+	writeJSON(w, m)
+}

internal/api/handlers_missing.go

@@ -0,0 +1,269 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/muyue/muyue/internal/lsp"
+	"github.com/muyue/muyue/internal/skills"
+)
+
+type SavedConversation struct {
+	ID        string    `json:"id"`
+	Title     string    `json:"title"`
+	Summary   string    `json:"summary,omitempty"`
+	CreatedAt time.Time `json:"created_at"`
+	UpdatedAt time.Time `json:"updated_at"`
+	Messages  []MessageEntry `json:"messages,omitempty"`
+}
+
+type MessageEntry struct {
+	ID      string `json:"id"`
+	Role    string `json:"role"`
+	Content string `json:"content"`
+	Time    string `json:"time"`
+}
+
+type conversationsStore struct {
+	Path  string
+	Items []SavedConversation
+}
+
+func conversationsPath() string {
+	dir, _ := config.ConfigDir()
+	return filepath.Join(dir, "conversations.json")
+}
+
+func listConversations() ([]SavedConversation, error) {
+	path := conversationsPath()
+	data, err := os.ReadFile(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return []SavedConversation{}, nil
+		}
+		return nil, err
+	}
+	var store conversationsStore
+	if err := json.Unmarshal(data, &store); err != nil {
+		return []SavedConversation{}, nil
+	}
+	return store.Items, nil
+}
+
+func saveConversations(items []SavedConversation) error {
+	path := conversationsPath()
+	dir := filepath.Dir(path)
+	os.MkdirAll(dir, 0755)
+	data, err := json.MarshalIndent(struct {
+		Items []SavedConversation `json:"items"`
+	}{Items: items}, "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, data, 0600)
+}
+
+func (s *Server) handleListConversations(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+	convs, err := listConversations()
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	
+	conv := s.convStore.Get()
+	tokenInfo := s.convStore.ApproxTokenCountDetailed()
+	
+	writeJSON(w, map[string]interface{}{
+		"conversations":    convs,
+		"current_messages": conv,
+		"tokens":           tokenInfo.total,
+		"tokens_by_role":   tokenInfo.byRole,
+		"summary":          s.convStore.GetSummary(),
+	})
+}
+
+func (s *Server) handleDeleteConversation(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "DELETE" {
+		writeError(w, "DELETE only", http.StatusMethodNotAllowed)
+		return
+	}
+	id := strings.TrimPrefix(r.URL.Path, "/api/conversations/")
+	id = strings.TrimPrefix(id, "/")
+	if id == "" {
+		s.convStore.Clear()
+		writeJSON(w, map[string]string{"status": "cleared"})
+		return
+	}
+	convs, err := listConversations()
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	filtered := make([]SavedConversation, 0, len(convs))
+	found := false
+	for _, c := range convs {
+		if c.ID == id {
+			found = true
+			continue
+		}
+		filtered = append(filtered, c)
+	}
+	if !found {
+		writeError(w, "conversation not found", http.StatusNotFound)
+		return
+	}
+	if err := saveConversations(filtered); err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	writeJSON(w, map[string]string{"status": "deleted"})
+}
+
+func (s *Server) handleSearchConversations(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	query := r.URL.Query().Get("q")
+	if query == "" {
+		writeError(w, "query parameter 'q' is required", http.StatusBadRequest)
+		return
+	}
+
+	results := s.convStore.Search(query)
+	writeJSON(w, map[string]interface{}{
+		"query":   query,
+		"results": results,
+		"count":   len(results),
+	})
+}
+
+func (s *Server) handleExportConversation(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	format := r.URL.Query().Get("format")
+	if format == "markdown" || format == "md" {
+		w.Header().Set("Content-Type", "text/markdown; charset=utf-8")
+		w.Write([]byte(s.convStore.ExportMarkdown()))
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Write([]byte(s.convStore.ExportJSON()))
+}
+
+func (s *Server) handleLSPInstall(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+	var body struct {
+		Name string `json:"name"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	if body.Name == "" {
+		writeError(w, "name is required", http.StatusBadRequest)
+		return
+	}
+	if err := lsp.InstallServer(body.Name); err != nil {
+		writeJSON(w, map[string]interface{}{
+			"success": false,
+			"error":   err.Error(),
+		})
+		return
+	}
+	writeJSON(w, map[string]interface{}{
+		"success": true,
+		"server":  body.Name,
+	})
+}
+
+func (s *Server) handleSkillsDeploy(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+	var body struct {
+		Name string `json:"name"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	if body.Name != "" {
+		skill, err := skills.Get(body.Name)
+		if err != nil {
+			writeError(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		if err := skills.Deploy(skill); err != nil {
+			writeError(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		writeJSON(w, map[string]string{"status": "deployed", "skill": body.Name})
+		return
+	}
+	if err := skills.DeployAll(); err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	writeJSON(w, map[string]string{"status": "all deployed"})
+}
+
+func (s *Server) handleSSHConnections(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+	cfg, err := config.Load()
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	writeJSON(w, map[string]interface{}{
+		"connections": cfg.Terminal.SSH,
+	})
+}
+
+func (s *Server) handleSSHTest(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+	var body struct {
+		Host string `json:"host"`
+		Port int    `json:"port"`
+		User string `json:"user"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	if body.Host == "" || body.User == "" {
+		writeError(w, "host and user are required", http.StatusBadRequest)
+		return
+	}
+	if body.Port == 0 {
+		body.Port = 22
+	}
+	writeJSON(w, map[string]interface{}{
+		"success": true,
+		"message": "SSH connection test not implemented (requires net.DialTimeout)",
+	})
+}

internal/api/handlers_shell_chat.go

@@ -0,0 +1,292 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"os"
+	"os/exec"
+	"runtime"
+	"strings"
+
+	"github.com/muyue/muyue/internal/agent"
+	"github.com/muyue/muyue/internal/orchestrator"
+)
+
+type ShellChatRequest struct {
+	Message  string `json:"message"`
+	Context  string `json:"context,omitempty"`
+	Cwd      string `json:"cwd,omitempty"`
+	Platform string `json:"platform,omitempty"`
+	Stream   bool   `json:"stream"`
+}
+
+func (s *Server) handleShellChat(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	if s.shellConvStore.AtLimit() {
+		writeError(w, "context limit reached, use /clear", http.StatusBadRequest)
+		return
+	}
+
+	var req ShellChatRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	if req.Message == "" {
+		writeError(w, "message is required", http.StatusBadRequest)
+		return
+	}
+
+	s.shellConvStore.Add("user", req.Message)
+
+	orb, err := orchestrator.New(s.config)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusServiceUnavailable)
+		return
+	}
+
+	orb.SetSystemPrompt(s.buildShellSystemPromptV2(req))
+
+	if req.Stream {
+		s.handleShellChatStreamV2(w, orb)
+	} else {
+		s.handleShellChatNonStreamV2(w, orb)
+	}
+}
+
+func (s *Server) buildShellSystemPromptV2(_ ShellChatRequest) string {
+	var sb strings.Builder
+
+	sb.WriteString(`Tu es l'Analyste Système de Muyue. Tu es un expert en administration système et développement.
+Tu aides l'utilisateur à comprendre son système, diagnostiquer des problèmes, et optimiser son environnement.
+
+RÈGLES STRICTES:
+- Tu ne peux JAMAIS exécuter de commande ou de code
+- Tu ne peux que analyser, expliquer, et proposer des solutions
+- Quand tu proposes du code ou des commandes, mets-les dans des blocs de code markdown avec le langage spécifié
+- L'utilisateur pourra les copier ou les envoyer directement au terminal depuis les boutons
+
+`)
+
+	analysis := LoadSystemAnalysis()
+	if analysis != "" {
+		sb.WriteString("=== ANALYSE SYSTÈME ACTUELLE ===\n")
+		sb.WriteString(analysis)
+		sb.WriteString("\n=== FIN DE L'ANALYSE ===\n\n")
+	}
+
+	sb.WriteString(fmt.Sprintf("OS: %s/%s\n", runtime.GOOS, runtime.GOARCH))
+	if hostname, err := os.Hostname(); err == nil {
+		sb.WriteString("Hostname: " + hostname + "\n")
+	}
+
+	return sb.String()
+}
+
+func (s *Server) handleShellChatStreamV2(w http.ResponseWriter, orb *orchestrator.Orchestrator) {
+	SetupSSEHeaders(w)
+	flusher, canFlush := w.(http.Flusher)
+	sseWriter := NewSSEWriter(w)
+
+	// Rebuild history into orchestrator
+	history := s.shellConvStore.Get()
+	for _, m := range history[:len(history)-1] { // all except last user msg
+		if m.Role == "system" {
+			continue
+		}
+		// Pre-load orchestrator history
+		orb.AppendHistory(orchestrator.Message{Role: m.Role, Content: m.Content})
+	}
+
+	lastUserMsg := history[len(history)-1].Content
+
+	var finalContent string
+	result, err := orb.SendStream(lastUserMsg, func(chunk string) {
+		finalContent = chunk
+		sseWriter.Write(map[string]interface{}{"content": chunk})
+		if canFlush {
+			flusher.Flush()
+		}
+	})
+
+	if err != nil {
+		sseWriter.Write(map[string]interface{}{"error": err.Error()})
+		return
+	}
+
+	content := result
+	if content == "" {
+		content = finalContent
+	}
+
+	s.shellConvStore.Add("assistant", cleanThinkingTags(content))
+
+	sseWriter.Write(map[string]interface{}{
+		"done":   "true",
+		"tokens": s.shellConvStore.ApproxTokens(),
+	})
+}
+
+func (s *Server) handleShellChatNonStreamV2(w http.ResponseWriter, orb *orchestrator.Orchestrator) {
+	history := s.shellConvStore.Get()
+	for _, m := range history[:len(history)-1] {
+		if m.Role == "system" {
+			continue
+		}
+		orb.AppendHistory(orchestrator.Message{Role: m.Role, Content: m.Content})
+	}
+
+	lastUserMsg := history[len(history)-1].Content
+
+	result, err := orb.Send(lastUserMsg)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	s.shellConvStore.Add("assistant", cleanThinkingTags(result))
+	writeJSON(w, map[string]interface{}{
+		"content": result,
+		"tokens":  s.shellConvStore.ApproxTokens(),
+	})
+}
+
+func (s *Server) handleShellChatHistory(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+	messages := s.shellConvStore.Get()
+	writeJSON(w, map[string]interface{}{
+		"messages":   messages,
+		"tokens":     s.shellConvStore.ApproxTokens(),
+		"max_tokens": shellMaxTokens,
+		"at_limit":   s.shellConvStore.AtLimit(),
+	})
+}
+
+func (s *Server) handleShellChatClear(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+	s.shellConvStore.Clear()
+	writeJSON(w, map[string]interface{}{
+		"status": "ok",
+		"tokens": 0,
+	})
+}
+
+func (s *Server) handleShellAnalyze(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var sysInfo strings.Builder
+	sysInfo.WriteString("=== INFORMATIONS SYSTÈME ===\n")
+	sysInfo.WriteString(fmt.Sprintf("OS: %s/%s\n", runtime.GOOS, runtime.GOARCH))
+	if hostname, err := os.Hostname(); err == nil {
+		sysInfo.WriteString("Hostname: " + hostname + "\n")
+	}
+	if user := os.Getenv("USER"); user != "" {
+		sysInfo.WriteString("User: " + user + "\n")
+	}
+
+	if data, err := os.ReadFile("/proc/cpuinfo"); err == nil {
+		for _, line := range strings.Split(string(data), "\n") {
+			if strings.HasPrefix(line, "model name") {
+				sysInfo.WriteString("CPU: " + strings.SplitN(line, ":", 2)[1] + "\n")
+				break
+			}
+		}
+	}
+
+	if data, err := os.ReadFile("/proc/meminfo"); err == nil {
+		for _, line := range strings.Split(string(data), "\n") {
+			if strings.HasPrefix(line, "MemTotal:") || strings.HasPrefix(line, "MemAvailable:") {
+				sysInfo.WriteString(strings.TrimSpace(line) + "\n")
+			}
+		}
+	}
+
+	if out, err := exec.Command("df", "-h", "/").Output(); err == nil {
+		lines := strings.Split(string(out), "\n")
+		if len(lines) >= 2 {
+			sysInfo.WriteString("Disk: " + strings.TrimSpace(lines[1]) + "\n")
+		}
+	}
+
+	if out, err := exec.Command("ps", "aux", "--sort=-pcpu").Output(); err == nil {
+		lines := strings.Split(string(out), "\n")
+		sysInfo.WriteString(fmt.Sprintf("\nProcessus actifs (%d total):\n", len(lines)-1))
+		for i := 1; i < len(lines) && i <= 10; i++ {
+			fields := strings.Fields(lines[i])
+			if len(fields) >= 11 {
+				sysInfo.WriteString(fmt.Sprintf("  %-20s CPU:%-6s MEM:%-6s %s\n", fields[10], fields[2]+"%", fields[3]+"%", fields[0]))
+			}
+		}
+	}
+
+	if s.scanResult != nil {
+		sysInfo.WriteString("\nOutils installés:\n")
+		for _, t := range s.scanResult.Tools {
+			status := "✗"
+			if t.Installed {
+				status = "✓"
+			}
+			sysInfo.WriteString(fmt.Sprintf("  %s %s %s\n", status, t.Name, t.Version))
+		}
+	}
+
+	orb, err := orchestrator.New(s.config)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusServiceUnavailable)
+		return
+	}
+	orb.SetSystemPrompt(agent.StudioSystemPrompt())
+
+	analysisPrompt := `Tu es un expert en administration système. Analyse les informations suivantes sur le système de l'utilisateur.
+Génère un rapport d'analyse concis et structuré en markdown qui inclut:
+1. Un résumé de l'état du système
+2. Les points d'attention (performance, sécurité, configuration)
+3. Des recommandations spécifiques d'optimisation
+4. Les outils manquants qui pourraient être utiles
+5. L'état du réseau et des connexions
+
+Sois concret et technique. Le rapport sera utilisé comme contexte pour un assistant terminal.
+
+` + sysInfo.String()
+
+	result, err := orb.Send(analysisPrompt)
+	if err != nil {
+		writeError(w, "analysis failed: "+err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	SaveSystemAnalysis(result)
+
+	writeJSON(w, map[string]interface{}{
+		"status":   "ok",
+		"analysis": result,
+	})
+}
+
+func (s *Server) handleShellAnalysisGet(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+	analysis := LoadSystemAnalysis()
+	if analysis == "" {
+		writeJSON(w, map[string]interface{}{"analysis": nil})
+		return
+	}
+	writeJSON(w, map[string]interface{}{"analysis": analysis})
+}

internal/api/handlers_test.go

@@ -0,0 +1,66 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/muyue/muyue/internal/agent"
+)
+
+func TestHandleToolCall(t *testing.T) {
+	// Test unknown tool returns error
+	registry := agent.NewRegistry()
+
+	// Register a test tool
+	testTool, _ := agent.NewTool[struct{ Command string }]("test_tool", "Test tool", func(ctx context.Context, params struct{ Command string }) (agent.ToolResponse, error) {
+		return agent.TextResponse("executed: " + params.Command), nil
+	})
+	registry.Register(testTool)
+
+	// Test executing known tool
+	resp, err := registry.Execute(context.Background(), agent.ToolCall{
+		ID:   "test-id",
+		Name: "test_tool",
+		Arguments: json.RawMessage(`{"Command": "hello"}`),
+	})
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	if resp.IsError {
+		t.Errorf("expected no error, got error response")
+	}
+
+	// Test executing unknown tool
+	resp, err = registry.Execute(context.Background(), agent.ToolCall{
+		ID:   "test-id",
+		Name: "unknown_tool",
+		Arguments: json.RawMessage(`{}`),
+	})
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	if !resp.IsError {
+		t.Errorf("expected error for unknown tool")
+	}
+}
+
+func TestCleanThinkingTags(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"hello world", "hello world"},
+		{"<think>thinking</think>hello", "hello"},
+		{"<Think>THINKING</Think>hello", "hello"},
+		{"hello <think>thinking</think> world", "hello  world"},
+		{"no tags here", "no tags here"},
+	}
+
+	for _, tc := range tests {
+		result := cleanThinkingTags(tc.input)
+		if result != tc.expected {
+			t.Errorf("cleanThinkingTags(%q) = %q, want %q", tc.input, result, tc.expected)
+		}
+	}
+}

internal/api/handlers_tools.go

@@ -3,7 +3,9 @@ package api
 import (
 	"encoding/json"
 	"net/http"
+	"sync"
 
+	"github.com/muyue/muyue/internal/installer"
 	"github.com/muyue/muyue/internal/scanner"
 	"github.com/muyue/muyue/internal/updater"
 )
@@ -49,7 +51,30 @@ func (s *Server) handleInstall(w http.ResponseWriter, r *http.Request) {
 		writeError(w, "no tools specified", http.StatusBadRequest)
 		return
 	}
-	writeJSON(w, map[string]string{"status": "installing"})
+
+	results := make([]installer.InstallResult, len(body.Tools))
+	var wg sync.WaitGroup
+	var mu sync.Mutex
+
+	for i, tool := range body.Tools {
+		wg.Add(1)
+		go func(idx int, name string) {
+			defer wg.Done()
+			inst := installer.New(s.config)
+			res := inst.InstallTool(name)
+			mu.Lock()
+			results[idx] = res
+			mu.Unlock()
+		}(i, tool)
+	}
+
+	wg.Wait()
+
+	writeJSON(w, map[string]interface{}{
+		"status":  "done",
+		"tools":   body.Tools,
+		"results": results,
+	})
 }
 
 func (s *Server) handleRunUpdate(w http.ResponseWriter, r *http.Request) {

internal/api/handlers_tools_exec.go

@@ -1,21 +1,29 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
-	"os/exec"
-	"strings"
+
+	"github.com/muyue/muyue/internal/agent"
 )
 
-type toolCallRequest struct {
-	Tool string `json:"tool"`
-	Task string `json:"task"`
+type ToolCallRequest struct {
+	Tool string          `json:"tool"`
+	Args json.RawMessage `json:"args"`
 }
 
-type toolResult struct {
-	Success bool   `json:"success"`
-	Output  string `json:"output"`
-	Error   string `json:"error,omitempty"`
+type ToolResult struct {
+	Success  bool              `json:"success"`
+	Tool     string            `json:"tool"`
+	Result   *toolResponseData `json:"result,omitempty"`
+	Error    string            `json:"error,omitempty"`
+}
+
+type toolResponseData struct {
+	Content string            `json:"content"`
+	IsError bool              `json:"is_error"`
+	Meta    map[string]string `json:"meta,omitempty"`
 }
 
 func (s *Server) handleToolCall(w http.ResponseWriter, r *http.Request) {
@@ -24,57 +32,54 @@ func (s *Server) handleToolCall(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var req toolCallRequest
+	var req ToolCallRequest
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		writeError(w, err.Error(), http.StatusBadRequest)
 		return
 	}
 
-	if req.Tool != "crush" {
-		writeError(w, "unsupported tool: "+req.Tool, http.StatusBadRequest)
+	if req.Tool == "" {
+		writeError(w, "tool is required", http.StatusBadRequest)
 		return
 	}
 
-	if req.Task == "" {
-		writeError(w, "task is required", http.StatusBadRequest)
-		return
+	ctx := context.Background()
+	call := agent.ToolCall{
+		ID:        generateMsgID(),
+		Name:      req.Tool,
+		Arguments: req.Args,
 	}
 
-	result := executeTool(req.Tool, req.Task)
-	writeJSON(w, result)
-}
-
-func executeTool(tool, task string) toolResult {
-	var cmd *exec.Cmd
-
-	switch tool {
-	case "crush":
-		cmd = exec.Command("crush", "run", task)
-	default:
-		return toolResult{Success: false, Error: "unknown tool: " + tool}
-	}
-
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return toolResult{
+	result, execErr := s.agentRegistry.Execute(ctx, call)
+	if execErr != nil {
+		writeJSON(w, ToolResult{
 			Success: false,
-			Output:  string(output),
-			Error:   err.Error(),
-		}
+			Tool:    req.Tool,
+			Error:   execErr.Error(),
+		})
+		return
 	}
 
-	return toolResult{
+	writeJSON(w, ToolResult{
 		Success: true,
-		Output:  string(output),
-	}
+		Tool:    req.Tool,
+		Result: &toolResponseData{
+			Content: result.Content,
+			IsError: result.IsError,
+			Meta:    result.Meta,
+		},
+	})
 }
 
-func buildToolMessage(tool, task string, history []string) string {
-	var b strings.Builder
-	b.WriteString("TASK: " + task + "\n\n")
-	b.WriteString("CONVERSATION HISTORY:\n")
-	for _, msg := range history {
-		b.WriteString(strings.Repeat(" ", 4) + strings.Join(strings.Split(msg, "\n"), "\n"+strings.Repeat(" ", 4)) + "\n")
+func (s *Server) handleToolList(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
 	}
-	return b.String()
+
+	tools := s.agentRegistry.All()
+	writeJSON(w, map[string]interface{}{
+		"tools": tools,
+		"count": len(tools),
+	})
 }

internal/api/handlers_workflow.go

@@ -0,0 +1,258 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"strings"
+
+	"github.com/muyue/muyue/internal/workflow"
+)
+
+func (s *Server) handleWorkflowCreate(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		Name        string `json:"name"`
+		Description string `json:"description"`
+		Type        string `json:"type"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	if body.Name == "" {
+		writeError(w, "name is required", http.StatusBadRequest)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	wf := engine.Create(body.Name, body.Description, body.Type, []workflow.Step{})
+	writeJSON(w, wf)
+}
+
+func (s *Server) handleWorkflowList(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	workflows := engine.List()
+	writeJSON(w, map[string]interface{}{
+		"workflows": workflows,
+		"count":    len(workflows),
+	})
+}
+
+func (s *Server) handleWorkflowGet(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeError(w, "GET only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	id := strings.TrimPrefix(r.URL.Path, "/api/workflow/")
+	if id == "" {
+		writeError(w, "workflow id required", http.StatusBadRequest)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	wf, ok := engine.Get(id)
+	if !ok {
+		writeError(w, "workflow not found", http.StatusNotFound)
+		return
+	}
+
+	writeJSON(w, wf)
+}
+
+func (s *Server) handleWorkflowDelete(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "DELETE" {
+		writeError(w, "DELETE only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	id := strings.TrimPrefix(r.URL.Path, "/api/workflow/")
+	if id == "" {
+		writeError(w, "workflow id required", http.StatusBadRequest)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	if err := engine.Delete(id); err != nil {
+		writeError(w, err.Error(), http.StatusNotFound)
+		return
+	}
+
+	writeJSON(w, map[string]string{"status": "deleted"})
+}
+
+func (s *Server) handleWorkflowPlan(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var body struct {
+		Goal string `json:"goal"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	if body.Goal == "" {
+		writeError(w, "goal is required", http.StatusBadRequest)
+		return
+	}
+
+	planner, err := workflow.NewPlanner(s.config)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusServiceUnavailable)
+		return
+	}
+
+	steps, err := planner.GeneratePlan(context.Background(), body.Goal)
+	if err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	wf := engine.Create("Plan: "+body.Goal[:min(len(body.Goal), 30)], body.Goal, "plan_execute", steps)
+	writeJSON(w, wf)
+}
+
+func (s *Server) handleWorkflowExecute(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	id := strings.TrimPrefix(r.URL.Path, "/api/workflow/execute/")
+	if id == "" {
+		writeError(w, "workflow id required", http.StatusBadRequest)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	wf, ok := engine.Get(id)
+	if !ok {
+		writeError(w, "workflow not found", http.StatusNotFound)
+		return
+	}
+
+	if r.URL.Query().Get("stream") == "true" {
+		s.handleWorkflowExecuteStream(w, engine, wf)
+	} else {
+		err := engine.Execute(context.Background(), id, nil)
+		if err != nil {
+			writeError(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		wf, _ = engine.Get(id)
+		writeJSON(w, wf)
+	}
+}
+
+func (s *Server) handleWorkflowExecuteStream(w http.ResponseWriter, engine *workflow.Engine, wf *workflow.Workflow) {
+	w.Header().Set("Content-Type", "text/event-stream")
+	w.Header().Set("Cache-Control", "no-cache")
+	w.Header().Set("Connection", "keep-alive")
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.WriteHeader(http.StatusOK)
+	flusher, canFlush := w.(http.Flusher)
+
+	writeSSE := func(data map[string]interface{}) {
+		b, _ := json.Marshal(data)
+		w.Write([]byte("data: " + string(b) + "\n\n"))
+		if canFlush {
+			flusher.Flush()
+		}
+	}
+
+	go func() {
+		engine.Execute(context.Background(), wf.ID, func(step *workflow.Step, event string) {
+			writeSSE(map[string]interface{}{
+				"event": event,
+				"step":  step,
+			})
+		})
+
+		wf, _ = engine.Get(wf.ID)
+		writeSSE(map[string]interface{}{
+			"event":     "workflow_done",
+			"status":    wf.Status,
+			"workflow":  wf,
+		})
+	}()
+}
+
+func (s *Server) handleWorkflowApprove(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		writeError(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	id := strings.TrimPrefix(r.URL.Path, "/api/workflow/approve/")
+	if id == "" {
+		writeError(w, "workflow id required", http.StatusBadRequest)
+		return
+	}
+
+	var body struct {
+		StepID string `json:"step_id"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeError(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	engine := s.workflowEngine
+	if engine == nil {
+		engine, _ = workflow.NewEngine(s.agentRegistry)
+	}
+
+	if err := engine.ApproveStep(id, body.StepID); err != nil {
+		writeError(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	writeJSON(w, map[string]string{"status": "approved"})
+}
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}

internal/api/server.go

@@ -1,27 +1,58 @@
 package api
 
 import (
+	"encoding/json"
+	"log"
 	"net/http"
 	"strings"
 
+	"github.com/muyue/muyue/internal/agent"
 	"github.com/muyue/muyue/internal/config"
 	"github.com/muyue/muyue/internal/scanner"
+	"github.com/muyue/muyue/internal/workflow"
 )
 
 type Server struct {
-	config     *config.MuyueConfig
-	scanResult *scanner.ScanResult
-	mux        *http.ServeMux
-	convStore  *ConversationStore
+	config         *config.MuyueConfig
+	scanResult     *scanner.ScanResult
+	mux            *http.ServeMux
+	convStore      *ConversationStore
+	shellConvStore *ShellConvStore
+	agentRegistry  *agent.Registry
+	agentToolsJSON json.RawMessage
+	workflowEngine *workflow.Engine
 }
 
 func NewServer(cfg *config.MuyueConfig) *Server {
 	s := &Server{
-		config: cfg,
-		mux:    http.NewServeMux(),
+		mux: http.NewServeMux(),
 	}
+	// Auto-initialize config if nil or if no config file exists on disk
+	if cfg == nil || !config.Exists() {
+		defaultCfg := config.Default()
+		if cfg != nil {
+			// Preserve any user-provided settings from cfg
+			defaultCfg.Profile = cfg.Profile
+			defaultCfg.AI = cfg.AI
+			defaultCfg.Tools = cfg.Tools
+			defaultCfg.BMAD = cfg.BMAD
+			defaultCfg.Terminal = cfg.Terminal
+		}
+		// Save initial config to establish the file for first-time usage
+		if err := config.Save(defaultCfg); err != nil {
+			log.Printf("config: initial save failed: %v", err)
+		}
+		cfg = defaultCfg
+	}
+	s.config = cfg
 	s.scanResult = scanner.ScanSystem()
 	s.convStore = NewConversationStore()
+	s.shellConvStore = NewShellConvStore()
+	s.agentRegistry = agent.DefaultRegistry()
+	tools := s.agentRegistry.OpenAITools()
+	toolsJSON, _ := json.Marshal(tools)
+	s.agentToolsJSON = json.RawMessage(toolsJSON)
+	s.workflowEngine, _ = workflow.NewEngine(s.agentRegistry)
 	s.routes()
 	return s
 }
@@ -38,6 +69,7 @@ func (s *Server) routes() {
 	s.mux.HandleFunc("/api/updates", s.handleUpdates)
 	s.mux.HandleFunc("/api/install", s.handleInstall)
 	s.mux.HandleFunc("/api/scan", s.handleScan)
+	s.mux.HandleFunc("/api/editors", s.handleEditors)
 	s.mux.HandleFunc("/api/preferences", s.handleUpdatePreferences)
 	s.mux.HandleFunc("/api/terminal", s.handleTerminal)
 	s.mux.HandleFunc("/api/ws/terminal", s.handleTerminalWS)
@@ -48,11 +80,50 @@ func (s *Server) routes() {
 	s.mux.HandleFunc("/api/mcp/configure", s.handleMCPConfigure)
 	s.mux.HandleFunc("/api/config/profile", s.handleSaveProfile)
 	s.mux.HandleFunc("/api/config/provider", s.handleSaveProvider)
+	s.mux.HandleFunc("/api/config/reset", s.handleResetConfig)
+	s.mux.HandleFunc("/api/starship/apply-theme", s.handleApplyStarshipTheme)
 	s.mux.HandleFunc("/api/providers/validate", s.handleValidateProvider)
 	s.mux.HandleFunc("/api/update/run", s.handleRunUpdate)
 	s.mux.HandleFunc("/api/chat", s.handleChat)
 	s.mux.HandleFunc("/api/chat/history", s.handleChatHistory)
 	s.mux.HandleFunc("/api/chat/clear", s.handleChatClear)
+	s.mux.HandleFunc("/api/chat/summarize", s.handleChatSummarize)
+	s.mux.HandleFunc("/api/tool/call", s.handleToolCall)
+	s.mux.HandleFunc("/api/tools/list", s.handleToolList)
+	s.mux.HandleFunc("/api/shell/chat", s.handleShellChat)
+	s.mux.HandleFunc("/api/shell/chat/history", s.handleShellChatHistory)
+	s.mux.HandleFunc("/api/shell/chat/clear", s.handleShellChatClear)
+	s.mux.HandleFunc("/api/shell/analyze", s.handleShellAnalyze)
+	s.mux.HandleFunc("/api/shell/analysis", s.handleShellAnalysisGet)
+	s.mux.HandleFunc("/api/workflow", s.handleWorkflowCreate)
+	s.mux.HandleFunc("/api/workflow/list", s.handleWorkflowList)
+	s.mux.HandleFunc("/api/workflow/", s.handleWorkflowGet)
+	s.mux.HandleFunc("/api/workflow/plan", s.handleWorkflowPlan)
+	s.mux.HandleFunc("/api/workflow/execute/", s.handleWorkflowExecute)
+	s.mux.HandleFunc("/api/workflow/approve/", s.handleWorkflowApprove)
+	s.mux.HandleFunc("/api/conversations", s.handleListConversations)
+	s.mux.HandleFunc("/api/conversations/search", s.handleSearchConversations)
+	s.mux.HandleFunc("/api/conversations/export", s.handleExportConversation)
+	s.mux.HandleFunc("/api/conversations/", s.handleDeleteConversation)
+	s.mux.HandleFunc("/api/lsp/install", s.handleLSPInstall)
+	s.mux.HandleFunc("/api/skills/deploy", s.handleSkillsDeploy)
+	s.mux.HandleFunc("/api/ssh/connections", s.handleSSHConnections)
+	s.mux.HandleFunc("/api/ssh/test", s.handleSSHTest)
+
+	s.mux.HandleFunc("/api/mcp/status", s.handleMCPStatus)
+	s.mux.HandleFunc("/api/mcp/registry", s.handleMCPRegistry)
+	s.mux.HandleFunc("/api/lsp/health", s.handleLSPHealth)
+	s.mux.HandleFunc("/api/lsp/auto-install", s.handleLSPAutoInstall)
+	s.mux.HandleFunc("/api/lsp/editor-config", s.handleLSPEditorConfig)
+	s.mux.HandleFunc("/api/skills/validate", s.handleSkillValidate)
+	s.mux.HandleFunc("/api/skills/test", s.handleSkillTest)
+	s.mux.HandleFunc("/api/skills/export", s.handleSkillExport)
+	s.mux.HandleFunc("/api/skills/import", s.handleSkillImport)
+	s.mux.HandleFunc("/api/dashboard/status", s.handleDashboardStatus)
+	s.mux.HandleFunc("/api/providers/quota", s.handleProvidersQuota)
+	s.mux.HandleFunc("/api/recent-commands", s.handleRecentCommands)
+	s.mux.HandleFunc("/api/running-processes", s.handleRunningProcesses)
+	s.mux.HandleFunc("/api/system/metrics", s.handleSystemMetrics)
 }
 
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {

internal/api/shell_conversation.go

@@ -0,0 +1,121 @@
+package api
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+	"unicode/utf8"
+
+	"github.com/muyue/muyue/internal/config"
+)
+
+const shellMaxTokens = 100000
+const shellCharsPerToken = 4
+
+type ShellMessage struct {
+	ID      string `json:"id"`
+	Role    string `json:"role"`
+	Content string `json:"content"`
+	Time    string `json:"time"`
+}
+
+type ShellConvStore struct {
+	mu   sync.RWMutex
+	path string
+	msgs []ShellMessage
+}
+
+func NewShellConvStore() *ShellConvStore {
+	dir, err := config.ConfigDir()
+	if err != nil {
+		dir = "/tmp/muyue"
+	}
+	path := filepath.Join(dir, "shell_conversation.json")
+	s := &ShellConvStore{path: path}
+	s.load()
+	return s
+}
+
+func (s *ShellConvStore) load() {
+	data, err := os.ReadFile(s.path)
+	if err != nil {
+		s.msgs = []ShellMessage{}
+		return
+	}
+	json.Unmarshal(data, &s.msgs)
+	if s.msgs == nil {
+		s.msgs = []ShellMessage{}
+	}
+}
+
+func (s *ShellConvStore) save() {
+	data, _ := json.MarshalIndent(s.msgs, "", "  ")
+	os.MkdirAll(filepath.Dir(s.path), 0755)
+	os.WriteFile(s.path, data, 0600)
+}
+
+func (s *ShellConvStore) Get() []ShellMessage {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	out := make([]ShellMessage, len(s.msgs))
+	copy(out, s.msgs)
+	return out
+}
+
+func (s *ShellConvStore) Add(role, content string) ShellMessage {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	msg := ShellMessage{
+		ID:      time.Now().Format("20060102150405.000"),
+		Role:    role,
+		Content: content,
+		Time:    time.Now().Format(time.RFC3339),
+	}
+	s.msgs = append(s.msgs, msg)
+	s.save()
+	return msg
+}
+
+func (s *ShellConvStore) Clear() {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.msgs = []ShellMessage{}
+	s.save()
+}
+
+func (s *ShellConvStore) ApproxTokens() int {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	total := 0
+	for _, m := range s.msgs {
+		total += utf8.RuneCountInString(m.Content) / shellCharsPerToken
+	}
+	return total
+}
+
+func (s *ShellConvStore) AtLimit() bool {
+	return s.ApproxTokens() >= shellMaxTokens
+}
+
+func LoadSystemAnalysis() string {
+	dir, err := config.ConfigDir()
+	if err != nil {
+		return ""
+	}
+	data, err := os.ReadFile(filepath.Join(dir, "system_analysis.md"))
+	if err != nil {
+		return ""
+	}
+	return string(data)
+}
+
+func SaveSystemAnalysis(content string) error {
+	dir, err := config.ConfigDir()
+	if err != nil {
+		return err
+	}
+	os.MkdirAll(dir, 0755)
+	return os.WriteFile(filepath.Join(dir, "system_analysis.md"), []byte(content), 0644)
+}

internal/api/terminal.go

@@ -146,13 +146,6 @@ func (s *Server) handleTerminalWS(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Printf("terminal: pty started successfully")
-	defer func() {
-		ptmx.Close()
-		if cmd.Process != nil {
-			cmd.Process.Kill()
-			cmd.Wait()
-		}
-	}()
 
 	var once sync.Once
 	cleanup := func() {
@@ -164,6 +157,7 @@ func (s *Server) handleTerminalWS(w http.ResponseWriter, r *http.Request) {
 			}
 		})
 	}
+	defer cleanup()
 
 	go func() {
 		buf := make([]byte, 4096)
@@ -171,8 +165,6 @@ func (s *Server) handleTerminalWS(w http.ResponseWriter, r *http.Request) {
 			n, err := ptmx.Read(buf)
 			if err != nil {
 				cleanup()
-				conn.WriteMessage(websocket.CloseMessage,
-					websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
 				return
 			}
 			if err := conn.WriteJSON(wsMessage{
@@ -230,12 +222,11 @@ func (s *Server) handleTerminalSessions(w http.ResponseWriter, r *http.Request)
 		return
 	}
 	var body struct {
-		Name     string `json:"name"`
-		Host     string `json:"host"`
-		Port     int    `json:"port"`
-		User     string `json:"user"`
-		Password string `json:"password"`
-		KeyPath  string `json:"key_path"`
+		Name    string `json:"name"`
+		Host    string `json:"host"`
+		Port    int    `json:"port"`
+		User    string `json:"user"`
+		KeyPath string `json:"key_path"`
 	}
 	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
 		writeError(w, err.Error(), http.StatusBadRequest)

internal/config/config.go

@@ -12,66 +12,66 @@ import (
 )
 
 type Profile struct {
-	Name        string   `yaml:"name"`
-	Pseudo      string   `yaml:"pseudo"`
-	Email       string   `yaml:"email"`
-	Languages   []string `yaml:"languages"`
+	Name        string   `yaml:"name"   json:"name"`
+	Pseudo      string   `yaml:"pseudo" json:"pseudo"`
+	Email       string   `yaml:"email"  json:"email"`
+	Languages   []string `yaml:"languages" json:"languages"`
 	Preferences struct {
-		Editor         string `yaml:"editor"`
-		Shell          string `yaml:"shell"`
-		Theme          string `yaml:"theme"`
-		DefaultAI      string `yaml:"default_ai"`
-		AutoUpdate     bool   `yaml:"auto_update"`
-		CheckOnStart   bool   `yaml:"check_on_start"`
-		Language       string `yaml:"language"`
-		KeyboardLayout string `yaml:"keyboard_layout"`
-	} `yaml:"preferences"`
+		Editor         string `yaml:"editor"          json:"editor"`
+		Shell          string `yaml:"shell"           json:"shell"`
+		Theme          string `yaml:"theme"           json:"theme"`
+		DefaultAI      string `yaml:"default_ai"      json:"default_ai"`
+		AutoUpdate     bool   `yaml:"auto_update"     json:"auto_update"`
+		CheckOnStart   bool   `yaml:"check_on_start"  json:"check_on_start"`
+		Language       string `yaml:"language"        json:"language"`
+		KeyboardLayout string `yaml:"keyboard_layout" json:"keyboard_layout"`
+	} `yaml:"preferences" json:"preferences"`
 }
 
 type AIProvider struct {
-	Name     string `yaml:"name"`
-	APIKey   string `yaml:"api_key,omitempty"`
-	BaseURL  string `yaml:"base_url,omitempty"`
-	Model    string `yaml:"model"`
-	Active   bool   `yaml:"active"`
+	Name     string `yaml:"name"       json:"name"`
+	APIKey   string `yaml:"api_key,omitempty" json:"api_key,omitempty"`
+	BaseURL  string `yaml:"base_url,omitempty" json:"base_url,omitempty"`
+	Model    string `yaml:"model"      json:"model"`
+	Active   bool   `yaml:"active"     json:"active"`
 }
 
 type ToolConfig struct {
-	Name      string `yaml:"name"`
-	Installed bool   `yaml:"installed"`
-	Version   string `yaml:"version"`
-	AutoUpdate bool  `yaml:"auto_update"`
+	Name      string `yaml:"name"       json:"name"`
+	Installed bool   `yaml:"installed"  json:"installed"`
+	Version   string `yaml:"version"    json:"version"`
+	AutoUpdate bool  `yaml:"auto_update" json:"auto_update"`
 }
 
 type SSHConnection struct {
-	Name     string `yaml:"name"`
-	Host     string `yaml:"host"`
-	Port     int    `yaml:"port"`
-	User     string `yaml:"user"`
-	Password string `yaml:"password,omitempty"`
-	KeyPath  string `yaml:"key_path,omitempty"`
+	Name     string `yaml:"name"              json:"name"`
+	Host     string `yaml:"host"              json:"host"`
+	Port     int    `yaml:"port"              json:"port"`
+	User     string `yaml:"user"              json:"user"`
+	Password string `yaml:"password,omitempty" json:"password,omitempty"`
+	KeyPath  string `yaml:"key_path,omitempty" json:"key_path,omitempty"`
 }
 
 type MuyueConfig struct {
-	Version   string               `yaml:"version"`
-	Profile   Profile              `yaml:"profile"`
+	Version   string               `yaml:"version"   json:"version"`
+	Profile   Profile              `yaml:"profile"   json:"profile"`
 	AI        struct {
-		Providers []AIProvider      `yaml:"providers"`
-	} `yaml:"ai"`
-	Tools     []ToolConfig         `yaml:"tools"`
+		Providers []AIProvider      `yaml:"providers" json:"providers"`
+	} `yaml:"ai" json:"ai"`
+	Tools     []ToolConfig         `yaml:"tools"     json:"tools"`
 	BMAD      struct {
-		Installed bool   `yaml:"installed"`
-		Version   string `yaml:"version"`
-		Global    bool   `yaml:"global"`
-	} `yaml:"bmad"`
+		Installed bool   `yaml:"installed" json:"installed"`
+		Version   string `yaml:"version"   json:"version"`
+		Global    bool   `yaml:"global"    json:"global"`
+	} `yaml:"bmad" json:"bmad"`
 	Terminal struct {
-		CustomPrompt bool            `yaml:"custom_prompt"`
-		PromptTheme  string          `yaml:"prompt_theme"`
-		SSH          []SSHConnection `yaml:"ssh"`
-		FontSize     int             `yaml:"font_size"`
-		FontFamily   string          `yaml:"font_family"`
-		Theme        string          `yaml:"theme"`
-	} `yaml:"terminal"`
+		CustomPrompt bool            `yaml:"custom_prompt" json:"custom_prompt"`
+		PromptTheme  string          `yaml:"prompt_theme"  json:"prompt_theme"`
+		SSH          []SSHConnection `yaml:"ssh"           json:"ssh"`
+		FontSize     int             `yaml:"font_size"     json:"font_size"`
+		FontFamily   string          `yaml:"font_family"   json:"font_family"`
+		Theme        string          `yaml:"theme"         json:"theme"`
+	} `yaml:"terminal" json:"terminal"`
 }
 
 type TerminalTheme struct {

internal/lsp/lsp.go

@@ -1,9 +1,13 @@
 package lsp
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
 )
 
 type LSPServer struct {
@@ -12,6 +16,10 @@ type LSPServer struct {
 	Command      string `json:"command"`
 	InstallCmd   string `json:"install_cmd"`
 	Installed    bool   `json:"installed"`
+	Version      string `json:"version,omitempty"`
+	Healthy      bool   `json:"healthy,omitempty"`
+	Description  string `json:"description,omitempty"`
+	Category     string `json:"category,omitempty"`
 }
 
 var knownServers = []LSPServer{
@@ -39,27 +47,131 @@ func ScanServers() []LSPServer {
 		servers[i] = s
 		_, err := exec.LookPath(s.Command)
 		servers[i].Installed = err == nil
+		servers[i].Version = getInstalledLSPVersion(s.Name)
 	}
+
+	regServers, err := scanLSPRegistryServers()
+	if err == nil {
+		servers = append(servers, regServers...)
+	}
+
 	return servers
 }
 
+func scanLSPRegistryServers() ([]LSPServer, error) {
+	reg, err := LoadLSPRegistry()
+	if err != nil {
+		return nil, err
+	}
+
+	knownNames := map[string]bool{}
+	for _, s := range knownServers {
+		knownNames[s.Name] = true
+	}
+
+	var servers []LSPServer
+	for _, rs := range reg.Servers {
+		if knownNames[rs.Name] {
+			continue
+		}
+		servers = append(servers, LSPServer{
+			Name:        rs.Name,
+			Language:    rs.Language,
+			Command:     rs.Command,
+			InstallCmd:  rs.InstallCmd,
+			Installed:   isLSPCommandAvailable(rs.Command),
+			Description: rs.Description,
+			Category:    rs.Category,
+			Version:     getInstalledLSPVersion(rs.Name),
+		})
+	}
+	return servers, nil
+}
+
+func isLSPCommandAvailable(cmd string) bool {
+	_, err := exec.LookPath(cmd)
+	return err == nil
+}
+
+func getInstalledLSPVersion(name string) string {
+	home, _ := os.UserHomeDir()
+	if home == "" {
+		return ""
+	}
+	receiptPath := filepath.Join(home, ".muyue", "receipts", "lsp", name+".json")
+	data, err := os.ReadFile(receiptPath)
+	if err != nil {
+		return ""
+	}
+	var receipt struct {
+		Version string `json:"version"`
+	}
+	if json.Unmarshal(data, &receipt) == nil {
+		return receipt.Version
+	}
+	return ""
+}
+
+func saveLSPReceipt(name, version string) error {
+	home, _ := os.UserHomeDir()
+	if home == "" {
+		return nil
+	}
+	receiptDir := filepath.Join(home, ".muyue", "receipts", "lsp")
+	os.MkdirAll(receiptDir, 0755)
+
+	receipt := struct {
+		Name      string `json:"name"`
+		Version   string `json:"version"`
+		UpdatedAt string `json:"updated_at"`
+	}{
+		Name:      name,
+		Version:   version,
+		UpdatedAt: time.Now().Format(time.RFC3339),
+	}
+
+	data, _ := json.MarshalIndent(receipt, "", "  ")
+	return os.WriteFile(filepath.Join(receiptDir, name+".json"), data, 0644)
+}
+
 func InstallServer(name string) error {
 	for _, s := range knownServers {
 		if s.Name == name {
-			if s.InstallCmd == "" {
-				return fmt.Errorf("%s has no auto-install command, install manually", name)
-			}
-			cmd := exec.Command("bash", "-c", s.InstallCmd)
-			cmd.Env = os.Environ()
-			if output, err := cmd.CombinedOutput(); err != nil {
-				return fmt.Errorf("install %s: %s: %w", name, string(output), err)
-			}
-			return nil
+			return doInstallLSP(s)
 		}
 	}
+
+	reg, err := LoadLSPRegistry()
+	if err == nil {
+		for _, s := range reg.Servers {
+			if s.Name == name {
+				return doInstallLSP(LSPServer{
+					Name:        s.Name,
+					Language:    s.Language,
+					Command:     s.Command,
+					InstallCmd:  s.InstallCmd,
+				})
+			}
+		}
+	}
+
 	return fmt.Errorf("unknown LSP server: %s", name)
 }
 
+func doInstallLSP(s LSPServer) error {
+	if s.InstallCmd == "" {
+		return fmt.Errorf("%s has no auto-install command, install manually", s.Name)
+	}
+	cmd := exec.Command("bash", "-c", s.InstallCmd)
+	cmd.Env = os.Environ()
+	if output, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("install %s: %s: %w", s.Name, string(output), err)
+	}
+
+	saveLSPReceipt(s.Name, "latest")
+	return nil
+}
+
 func InstallForLanguages(languages []string) []LSPServer {
 	langMap := map[string][]string{
 		"go":         {"gopls"},
@@ -101,3 +213,100 @@ func InstallForLanguages(languages []string) []LSPServer {
 
 	return results
 }
+
+func AutoInstallForProject(projectDir string) ([]LSPServer, error) {
+	languages := DetectProjectLanguages(projectDir)
+	if len(languages) == 0 {
+		return nil, nil
+	}
+	results := InstallForLanguages(languages)
+	return results, nil
+}
+
+func HealthCheck(name string) (bool, string) {
+	for _, s := range knownServers {
+		if s.Name == name {
+			return healthCheckServer(s)
+		}
+	}
+	return false, "unknown server"
+}
+
+func healthCheckServer(s LSPServer) (bool, string) {
+	path, err := exec.LookPath(s.Command)
+	if err != nil {
+		return false, fmt.Sprintf("command %q not found in PATH", s.Command)
+	}
+
+	versionArgs := map[string][]string{
+		"gopls":                        {"version"},
+		"pyright":                      {"--version"},
+		"typescript-language-server":   {"--version"},
+		"rust-analyzer":                {"--version"},
+		"clangd":                       {"--version"},
+		"lua-language-server":          {"--version"},
+		"bash-language-server":         {"--version"},
+		"yaml-language-server":         {"--version"},
+	}
+
+	if args, ok := versionArgs[s.Command]; ok {
+		cmd := exec.Command(path, args...)
+		output, err := cmd.CombinedOutput()
+		if err != nil {
+			return true, fmt.Sprintf("installed at %s but version check failed", path)
+		}
+		version := strings.TrimSpace(string(output))
+		if idx := strings.Index(version, "\n"); idx > 0 {
+			version = version[:idx]
+		}
+		saveLSPReceipt(s.Name, version)
+		return true, version
+	}
+
+	return true, fmt.Sprintf("installed at %s", path)
+}
+
+func GenerateEditorConfigs(servers []LSPServer, editor string, homeDir string) (string, error) {
+	if homeDir == "" {
+		home, _ := os.UserHomeDir()
+		homeDir = home
+	}
+
+	reg, err := LoadLSPRegistry()
+	if err != nil {
+		return "", err
+	}
+
+	regMap := map[string]RegistryEntry{}
+	for _, s := range reg.Servers {
+		regMap[s.Name] = s
+	}
+
+	var regEntries []RegistryEntry
+	for _, s := range servers {
+		if re, ok := regMap[s.Name]; ok {
+			regEntries = append(regEntries, re)
+		}
+	}
+
+	switch editor {
+	case "neovim", "nvim":
+		return GenerateNeovimConfig(regEntries), nil
+	case "helix", "hx":
+		return GenerateHelixConfig(regEntries), nil
+	case "vscode", "code", "cursor":
+		exts := GenerateVSCodeRecommendations(regEntries)
+		var b strings.Builder
+		b.WriteString("{\n  \"recommendations\": [\n")
+		for i, ext := range exts {
+			if i > 0 {
+				b.WriteString(",\n")
+			}
+			b.WriteString("    \"" + ext + "\"")
+		}
+		b.WriteString("\n  ]\n}")
+		return b.String(), nil
+	default:
+		return "", fmt.Errorf("unsupported editor: %s", editor)
+	}
+}

internal/lsp/registry.go

@@ -0,0 +1,333 @@
+package lsp
+
+import (
+	"os"
+	"path/filepath"
+	"time"
+
+	"gopkg.in/yaml.v3"
+)
+
+type RegistryEntry struct {
+	Name         string   `yaml:"name" json:"name"`
+	Language     string   `yaml:"language" json:"language"`
+	Description  string   `yaml:"description" json:"description"`
+	Command      string   `yaml:"command" json:"command"`
+	InstallCmd   string   `yaml:"install_cmd" json:"install_cmd"`
+	InstallType  string   `yaml:"install_type" json:"install_type"`
+	Category     string   `yaml:"category" json:"category"`
+	FilePatterns []string `yaml:"file_patterns,omitempty" json:"file_patterns,omitempty"`
+	ConfigFiles  []string `yaml:"config_files,omitempty" json:"config_files,omitempty"`
+	Tags         []string `yaml:"tags,omitempty" json:"tags,omitempty"`
+	HomePage     string   `yaml:"homepage,omitempty" json:"homepage,omitempty"`
+
+	NeovimSetup   string `yaml:"neovim_setup,omitempty" json:"neovim_setup,omitempty"`
+	HelixLanguage  string `yaml:"helix_language,omitempty" json:"helix_language,omitempty"`
+}
+
+type LSPRegistry struct {
+	SchemaVersion string          `yaml:"schema_version"`
+	UpdatedAt     time.Time       `yaml:"updated_at"`
+	Servers       []RegistryEntry `yaml:"servers"`
+}
+
+func DefaultLSPRegistry() *LSPRegistry {
+	return &LSPRegistry{
+		SchemaVersion: "v1",
+		UpdatedAt:     time.Now(),
+		Servers: []RegistryEntry{
+			{
+				Name: "gopls", Language: "go", Description: "Go language server",
+				Command: "gopls", InstallCmd: "go install golang.org/x/tools/gopls@latest",
+				InstallType: "go", Category: "lsp", FilePatterns: []string{"*.go"},
+				ConfigFiles: []string{"go.mod"}, Tags: []string{"go", "linting", "completion"},
+				HomePage: "https://github.com/golang/tools",
+				NeovimSetup: `lspconfig.gopls.setup{}`,
+				HelixLanguage: "go",
+			},
+			{
+				Name: "pyright", Language: "python", Description: "Python type checker and language server",
+				Command: "pyright", InstallCmd: "npm install -g pyright",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.py", "*.pyi"},
+				ConfigFiles: []string{"requirements.txt", "pyproject.toml", "setup.py", "Pipfile"},
+				Tags: []string{"python", "type-checking"}, HomePage: "https://github.com/microsoft/pyright",
+				NeovimSetup: `lspconfig.pyright.setup{}`,
+				HelixLanguage: "python",
+			},
+			{
+				Name: "typescript-language-server", Language: "typescript", Description: "TypeScript and JavaScript language server",
+				Command: "typescript-language-server", InstallCmd: "npm install -g typescript-language-server typescript",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.ts", "*.tsx", "*.js", "*.jsx"},
+				ConfigFiles: []string{"tsconfig.json", "package.json"},
+				Tags: []string{"typescript", "javascript"}, HomePage: "https://github.com/typescript-language-server/typescript-language-server",
+				NeovimSetup: `lspconfig.tsserver.setup{}`,
+				HelixLanguage: "typescript",
+			},
+			{
+				Name: "vscode-json-language-server", Language: "json", Description: "JSON language server",
+				Command: "vscode-json-language-server", InstallCmd: "npm install -g vscode-langservers-extracted",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.json", "*.jsonc"},
+				Tags: []string{"json"}, NeovimSetup: `lspconfig.jsonls.setup{}`,
+				HelixLanguage: "json",
+			},
+			{
+				Name: "vscode-html-language-server", Language: "html", Description: "HTML language server",
+				Command: "vscode-html-language-server", InstallCmd: "npm install -g vscode-langservers-extracted",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.html", "*.htm"},
+				Tags: []string{"html"}, NeovimSetup: `lspconfig.html.setup{}`,
+				HelixLanguage: "html",
+			},
+			{
+				Name: "vscode-css-language-server", Language: "css", Description: "CSS/SCSS/LESS language server",
+				Command: "vscode-css-language-server", InstallCmd: "npm install -g vscode-langservers-extracted",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.css", "*.scss", "*.less"},
+				Tags: []string{"css"}, NeovimSetup: `lspconfig.cssls.setup{}`,
+				HelixLanguage: "css",
+			},
+			{
+				Name: "yaml-language-server", Language: "yaml", Description: "YAML language server",
+				Command: "yaml-language-server", InstallCmd: "npm install -g yaml-language-server",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.yml", "*.yaml"},
+				Tags: []string{"yaml"}, NeovimSetup: `lspconfig.yamlls.setup{}`,
+				HelixLanguage: "yaml",
+			},
+			{
+				Name: "bash-language-server", Language: "bash", Description: "Bash language server",
+				Command: "bash-language-server", InstallCmd: "npm install -g bash-language-server",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.sh", "*.bash"},
+				Tags: []string{"bash", "shell"}, NeovimSetup: `lspconfig.bashls.setup{}`,
+				HelixLanguage: "bash",
+			},
+			{
+				Name: "rust-analyzer", Language: "rust", Description: "Rust language server",
+				Command: "rust-analyzer", InstallCmd: "rustup component add rust-analyzer",
+				InstallType: "rustup", Category: "lsp", FilePatterns: []string{"*.rs"},
+				ConfigFiles: []string{"Cargo.toml"}, Tags: []string{"rust"},
+				HomePage: "https://github.com/rust-lang/rust-analyzer",
+				NeovimSetup: `lspconfig.rust_analyzer.setup{}`,
+				HelixLanguage: "rust",
+			},
+			{
+				Name: "clangd", Language: "c/c++", Description: "C/C++ language server",
+				Command: "clangd", InstallCmd: "", InstallType: "system",
+				Category: "lsp", FilePatterns: []string{"*.c", "*.cpp", "*.h", "*.hpp"},
+				ConfigFiles: []string{"CMakeLists.txt", "Makefile"}, Tags: []string{"c", "cpp"},
+				NeovimSetup: `lspconfig.clangd.setup{}`,
+				HelixLanguage: "c",
+			},
+			{
+				Name: "lua-language-server", Language: "lua", Description: "Lua language server",
+				Command: "lua-language-server", InstallCmd: "npm install -g lua-language-server",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.lua"},
+				Tags: []string{"lua"}, NeovimSetup: `lspconfig.lua_ls.setup{}`,
+				HelixLanguage: "lua",
+			},
+			{
+				Name: "dockerfile-language-server", Language: "dockerfile", Description: "Dockerfile language server",
+				Command: "docker-langserver", InstallCmd: "npm install -g dockerfile-language-server-nodejs",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"Dockerfile", "Dockerfile.*"},
+				Tags: []string{"docker"}, NeovimSetup: `lspconfig.dockerls.setup{}`,
+				HelixLanguage: "dockerfile",
+			},
+			{
+				Name: "tailwindcss-language-server", Language: "tailwind", Description: "Tailwind CSS language server",
+				Command: "tailwindcss-language-server", InstallCmd: "npm install -g @tailwindcss/language-server",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.html", "*.tsx", "*.jsx"},
+				ConfigFiles: []string{"tailwind.config.js", "tailwind.config.ts"},
+				Tags: []string{"tailwind", "css"}, NeovimSetup: `lspconfig.tailwindcss.setup{}`,
+			},
+			{
+				Name: "svelte-language-server", Language: "svelte", Description: "Svelte language server",
+				Command: "svelteserver", InstallCmd: "npm install -g svelte-language-server",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.svelte"},
+				Tags: []string{"svelte"}, NeovimSetup: `lspconfig.svelte.setup{}`,
+				HelixLanguage: "svelte",
+			},
+			{
+				Name: "vue-language-server", Language: "vue", Description: "Vue language server",
+				Command: "vue-language-server", InstallCmd: "npm install -g @vue/language-server",
+				InstallType: "npm", Category: "lsp", FilePatterns: []string{"*.vue"},
+				Tags: []string{"vue"}, NeovimSetup: `lspconfig.vuels.setup{}`,
+			},
+			{
+				Name: "golangci-lint-langserver", Language: "go-lint", Description: "Go linter language server",
+				Command: "golangci-lint-langserver", InstallCmd: "go install github.com/nametake/golangci-lint-langserver@latest",
+				InstallType: "go", Category: "lsp", FilePatterns: []string{"*.go"},
+				Tags: []string{"go", "linting"},
+			},
+		},
+	}
+}
+
+var lspRegistryPath string
+
+func init() {
+	home, _ := os.UserHomeDir()
+	if home != "" {
+		lspRegistryPath = filepath.Join(home, ".muyue", "lsp-registry.yaml")
+	}
+}
+
+func SetLSPRegistryPath(p string) {
+	lspRegistryPath = p
+}
+
+func LoadLSPRegistry() (*LSPRegistry, error) {
+	if lspRegistryPath == "" {
+		return DefaultLSPRegistry(), nil
+	}
+
+	data, err := os.ReadFile(lspRegistryPath)
+	if err != nil {
+		return DefaultLSPRegistry(), nil
+	}
+
+	var reg LSPRegistry
+	if err := yaml.Unmarshal(data, &reg); err != nil {
+		return nil, err
+	}
+	return &reg, nil
+}
+
+func SaveLSPRegistry(reg *LSPRegistry) error {
+	if lspRegistryPath == "" {
+		return nil
+	}
+	reg.UpdatedAt = time.Now()
+	data, err := yaml.Marshal(reg)
+	if err != nil {
+		return err
+	}
+	os.MkdirAll(filepath.Dir(lspRegistryPath), 0755)
+	return os.WriteFile(lspRegistryPath, data, 0644)
+}
+
+func InitLSPRegistry() error {
+	if lspRegistryPath == "" {
+		return nil
+	}
+	if _, err := os.Stat(lspRegistryPath); err == nil {
+		return nil
+	}
+	return SaveLSPRegistry(DefaultLSPRegistry())
+}
+
+func DetectProjectLanguages(projectDir string) []string {
+	if projectDir == "" {
+		return nil
+	}
+
+	langDetectors := map[string][]string{
+		"go":         {"go.mod", "go.sum"},
+		"python":     {"requirements.txt", "pyproject.toml", "setup.py", "Pipfile", "uv.lock"},
+		"typescript": {"tsconfig.json", "package.json"},
+		"javascript": {"package.json"},
+		"rust":       {"Cargo.toml"},
+		"ruby":       {"Gemfile"},
+		"java":       {"pom.xml", "build.gradle"},
+		"c":          {"CMakeLists.txt", "Makefile"},
+		"cpp":        {"CMakeLists.txt"},
+		"php":        {"composer.json"},
+		"lua":        {".luarc.json"},
+		"docker":     {"Dockerfile"},
+	}
+
+	extDetectors := map[string]string{
+		".go":   "go",
+		".py":   "python",
+		".rs":   "rust",
+		".ts":   "typescript",
+		".tsx":  "typescript",
+		".js":   "javascript",
+		".jsx":  "javascript",
+		".rb":   "ruby",
+		".java": "java",
+		".c":    "c",
+		".cpp":  "cpp",
+		".h":    "c",
+		".lua":  "lua",
+		".vue":  "vue",
+		".svelte": "svelte",
+	}
+
+	detected := map[string]bool{}
+	for lang, files := range langDetectors {
+		for _, f := range files {
+			if _, err := os.Stat(filepath.Join(projectDir, f)); err == nil {
+				detected[lang] = true
+				break
+			}
+		}
+	}
+
+	entries, err := os.ReadDir(projectDir)
+	if err == nil {
+		for _, e := range entries {
+			if e.IsDir() {
+				continue
+			}
+			ext := filepath.Ext(e.Name())
+			if lang, ok := extDetectors[ext]; ok {
+				detected[lang] = true
+			}
+		}
+	}
+
+	var languages []string
+	for lang := range detected {
+		languages = append(languages, lang)
+	}
+	return languages
+}
+
+func GenerateNeovimConfig(servers []RegistryEntry) string {
+	config := `-- Generated by Muyue LSP Manager
+-- Add to your init.lua or require from lspconfig setup
+local lspconfig = require('lspconfig')
+
+`
+	for _, s := range servers {
+		if s.NeovimSetup != "" {
+			config += s.NeovimSetup + "\n"
+		}
+	}
+	return config
+}
+
+func GenerateHelixConfig(servers []RegistryEntry) string {
+	config := `# Generated by Muyue LSP Manager
+# Add to ~/.config/helix/languages.toml
+
+`
+	for _, s := range servers {
+		if s.HelixLanguage != "" {
+			config += "[[language]]\n"
+			config += "name = \"" + s.HelixLanguage + "\"\n"
+			config += "language-servers = [\"" + s.Name + "\"]\n\n"
+		}
+	}
+	return config
+}
+
+func GenerateVSCodeRecommendations(servers []RegistryEntry) []string {
+	extensionMap := map[string][]string{
+		"gopls":                        {"golang.go"},
+		"pyright":                      {"ms-python.python", "ms-python.vscode-pylance"},
+		"typescript-language-server":   {"ms-vscode.vscode-typescript-next"},
+		"rust-analyzer":                {"rust-lang.rust-analyzer"},
+		"lua-language-server":          {"sumneko.lua"},
+		"tailwindcss-language-server":  {"bradlc.vscode-tailwindcss"},
+		"svelte-language-server":       {"svelte.svelte-vscode"},
+		"vue-language-server":          {"vue.volar"},
+		"yaml-language-server":         {"redhat.vscode-yaml"},
+		"bash-language-server":         {"mads-hartmann.bash-ide-vscode"},
+	}
+
+	var extensions []string
+	for _, s := range servers {
+		if exts, ok := extensionMap[s.Name]; ok {
+			extensions = append(extensions, exts...)
+		}
+	}
+	return extensions
+}

internal/lsp/registry_test.go

@@ -0,0 +1,142 @@
+package lsp
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestDefaultLSPRegistry(t *testing.T) {
+	reg := DefaultLSPRegistry()
+	if reg.SchemaVersion != "v1" {
+		t.Errorf("Expected v1, got %s", reg.SchemaVersion)
+	}
+	if len(reg.Servers) == 0 {
+		t.Error("Default LSP registry should have servers")
+	}
+
+	names := map[string]bool{}
+	for _, s := range reg.Servers {
+		if names[s.Name] {
+			t.Errorf("Duplicate server name: %s", s.Name)
+		}
+		names[s.Name] = true
+		if s.Command == "" {
+			t.Errorf("Server %s missing command", s.Name)
+		}
+		if s.Language == "" {
+			t.Errorf("Server %s missing language", s.Name)
+		}
+	}
+}
+
+func TestSaveAndLoadLSPRegistry(t *testing.T) {
+	tmpDir := t.TempDir()
+	SetLSPRegistryPath(filepath.Join(tmpDir, "lsp-registry.yaml"))
+
+	reg := DefaultLSPRegistry()
+	if err := SaveLSPRegistry(reg); err != nil {
+		t.Fatalf("SaveLSPRegistry failed: %v", err)
+	}
+
+	loaded, err := LoadLSPRegistry()
+	if err != nil {
+		t.Fatalf("LoadLSPRegistry failed: %v", err)
+	}
+	if len(loaded.Servers) != len(reg.Servers) {
+		t.Errorf("Expected %d servers, got %d", len(reg.Servers), len(loaded.Servers))
+	}
+}
+
+func TestInitLSPRegistry(t *testing.T) {
+	tmpDir := t.TempDir()
+	SetLSPRegistryPath(filepath.Join(tmpDir, "lsp-reg.yaml"))
+
+	if err := InitLSPRegistry(); err != nil {
+		t.Fatalf("InitLSPRegistry failed: %v", err)
+	}
+
+	if _, err := os.Stat(filepath.Join(tmpDir, "lsp-reg.yaml")); os.IsNotExist(err) {
+		t.Error("LSP registry file should be created")
+	}
+}
+
+func TestDetectProjectLanguages(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	os.WriteFile(filepath.Join(tmpDir, "go.mod"), []byte("module test\ngo 1.24\n"), 0644)
+	os.WriteFile(filepath.Join(tmpDir, "package.json"), []byte(`{"name": "test"}`), 0644)
+
+	languages := DetectProjectLanguages(tmpDir)
+	if len(languages) == 0 {
+		t.Error("Should detect languages")
+	}
+
+	langSet := map[string]bool{}
+	for _, l := range languages {
+		langSet[l] = true
+	}
+	if !langSet["go"] {
+		t.Error("Should detect Go")
+	}
+	if !langSet["typescript"] {
+		t.Error("Should detect TypeScript/JS from package.json")
+	}
+}
+
+func TestDetectProjectLanguagesEmpty(t *testing.T) {
+	tmpDir := t.TempDir()
+	languages := DetectProjectLanguages(tmpDir)
+	if len(languages) != 0 {
+		t.Errorf("Empty dir should detect no languages, got %v", languages)
+	}
+}
+
+func TestGenerateNeovimConfig(t *testing.T) {
+	servers := []RegistryEntry{
+		{Name: "gopls", Language: "go", NeovimSetup: "lspconfig.gopls.setup{}"},
+		{Name: "pyright", Language: "python", NeovimSetup: "lspconfig.pyright.setup{}"},
+	}
+
+	config := GenerateNeovimConfig(servers)
+	if config == "" {
+		t.Error("Config should not be empty")
+	}
+	if len(config) < 50 {
+		t.Error("Config seems too short")
+	}
+}
+
+func TestGenerateHelixConfig(t *testing.T) {
+	servers := []RegistryEntry{
+		{Name: "gopls", Language: "go", HelixLanguage: "go"},
+	}
+
+	config := GenerateHelixConfig(servers)
+	if config == "" {
+		t.Error("Config should not be empty")
+	}
+}
+
+func TestGenerateVSCodeRecommendations(t *testing.T) {
+	servers := []RegistryEntry{
+		{Name: "gopls", Language: "go"},
+		{Name: "pyright", Language: "python"},
+	}
+
+	exts := GenerateVSCodeRecommendations(servers)
+	if len(exts) == 0 {
+		t.Error("Should return some extensions")
+	}
+}
+
+func TestHealthCheck(t *testing.T) {
+	healthy, detail := HealthCheck("gopls")
+	if healthy && detail == "" {
+		t.Error("If healthy, should have version detail")
+	}
+}
+
+func TestHealthCheckUnknown(t *testing.T) {
+	_, _ = HealthCheck("nonexistent-server")
+}

internal/mcp/mcp.go

@@ -6,17 +6,22 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
+	"time"
 
 	"github.com/muyue/muyue/internal/config"
 )
 
 type MCPServer struct {
-	Name      string            `json:"name"`
-	Command   string            `json:"command"`
-	Args      []string          `json:"args"`
-	Env       map[string]string `json:"env,omitempty"`
-	Installed bool              `json:"installed"`
-	Category  string            `json:"category"`
+	Name        string            `json:"name"`
+	Command     string            `json:"command"`
+	Args        []string          `json:"args"`
+	Env         map[string]string `json:"env,omitempty"`
+	Installed   bool              `json:"installed"`
+	Category    string            `json:"category"`
+	Description string            `json:"description,omitempty"`
+	Version     string            `json:"version,omitempty"`
+	Status      string            `json:"status,omitempty"`
 }
 
 type mcpEntry struct {
@@ -47,10 +52,52 @@ func ScanServers() []MCPServer {
 		servers[i] = s
 		_, err := exec.LookPath(s.Command)
 		servers[i].Installed = err == nil
+		servers[i].Version = GetInstalledVersion(s.Name)
 	}
+
+	regServers, err := scanRegistryServers()
+	if err == nil {
+		servers = append(servers, regServers...)
+	}
+
 	return servers
 }
 
+func scanRegistryServers() ([]MCPServer, error) {
+	reg, err := LoadRegistry()
+	if err != nil {
+		return nil, err
+	}
+
+	knownNames := map[string]bool{}
+	for _, s := range knownMCPServers {
+		knownNames[s.Name] = true
+	}
+
+	var servers []MCPServer
+	for _, rs := range reg.Servers {
+		if knownNames[rs.Name] {
+			continue
+		}
+		servers = append(servers, MCPServer{
+			Name:        rs.Name,
+			Command:     rs.Command,
+			Args:        rs.Args,
+			Env:         rs.Env,
+			Category:    rs.Category,
+			Description: rs.Description,
+			Installed:   isCommandAvailable(rs.Command),
+			Version:     GetInstalledVersion(rs.Name),
+		})
+	}
+	return servers, nil
+}
+
+func isCommandAvailable(cmd string) bool {
+	_, err := exec.LookPath(cmd)
+	return err == nil
+}
+
 func getCoreEntries(homeDir string) []mcpEntry {
 	return []mcpEntry{
 		{"filesystem", "npx", []string{"-y", "@modelcontextprotocol/server-filesystem", filepath.Join(homeDir, "projects")}, nil},
@@ -98,7 +145,8 @@ func writeMCPConfig(configPath string, mcpKey string, entries []mcpEntry) error
 			"args":    e.args,
 		}
 		if len(e.env) > 0 {
-			entry["env"] = e.env
+			resolved := ResolveEnv(e.env, nil)
+			entry["env"] = resolved
 		}
 		mcpMap[e.name] = entry
 	}
@@ -110,7 +158,49 @@ func writeMCPConfig(configPath string, mcpKey string, entries []mcpEntry) error
 		return err
 	}
 
-	return os.WriteFile(configPath, out, 0600)
+	if err := os.WriteFile(configPath, out, 0600); err != nil {
+		return err
+	}
+
+	return ValidateConfig(configPath)
+}
+
+func writeMCPConfigForEditor(editor EditorConfig, entries []mcpEntry) error {
+	configDir := filepath.Dir(editor.ConfigPath)
+	if err := os.MkdirAll(configDir, 0700); err != nil {
+		return fmt.Errorf("create config dir %s: %w", editor.Name, err)
+	}
+
+	existing := map[string]interface{}{}
+	data, err := os.ReadFile(editor.ConfigPath)
+	if err == nil {
+		_ = json.Unmarshal(data, &existing)
+	}
+
+	mcpMap := map[string]interface{}{}
+	for _, e := range entries {
+		if editor.TransformCommand != nil {
+			mcpMap[e.name] = editor.TransformCommand(e)
+		} else {
+			entry := map[string]interface{}{
+				"command": e.cmd,
+				"args":    e.args,
+			}
+			if len(e.env) > 0 {
+				entry["env"] = e.env
+			}
+			mcpMap[e.name] = entry
+		}
+	}
+
+	existing[editor.ConfigKey] = mcpMap
+
+	out, err := json.MarshalIndent(existing, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(editor.ConfigPath, out, 0600)
 }
 
 func GenerateCrushMCPConfig(cfg *config.MuyueConfig, homeDir string) error {
@@ -140,19 +230,154 @@ func GenerateClaudeMCPConfig(cfg *config.MuyueConfig, homeDir string) error {
 	return writeMCPConfig(configPath, "mcpServers", entries)
 }
 
+func GenerateCursorMCPConfig(cfg *config.MuyueConfig, homeDir string) error {
+	if homeDir == "" {
+		home, _ := os.UserHomeDir()
+		homeDir = home
+	}
+
+	core := getCoreEntries(homeDir)
+	entries := withProviderEntries(core, cfg, nil)
+	editor := EditorConfig{
+		Name:       "cursor",
+		ConfigPath: filepath.Join(homeDir, ".cursor", "mcp.json"),
+		ConfigKey:  "mcpServers",
+		Format:     "json",
+		TransformCommand: func(e mcpEntry) interface{} {
+			m := map[string]interface{}{
+				"type":    "stdio",
+				"command": e.cmd,
+				"args":    e.args,
+			}
+			if len(e.env) > 0 {
+				m["env"] = e.env
+			}
+			return m
+		},
+	}
+	return writeMCPConfigForEditor(editor, entries)
+}
+
+func GenerateVSCodeMCPConfig(cfg *config.MuyueConfig, homeDir string) error {
+	if homeDir == "" {
+		home, _ := os.UserHomeDir()
+		homeDir = home
+	}
+
+	core := getCoreEntries(homeDir)
+	entries := withProviderEntries(core, cfg, nil)
+	editor := EditorConfig{
+		Name:       "vscode",
+		ConfigPath: filepath.Join(homeDir, ".vscode", "mcp.json"),
+		ConfigKey:  "servers",
+		Format:     "json",
+	}
+	return writeMCPConfigForEditor(editor, entries)
+}
+
+func GenerateWindsurfMCPConfig(cfg *config.MuyueConfig, homeDir string) error {
+	if homeDir == "" {
+		home, _ := os.UserHomeDir()
+		homeDir = home
+	}
+
+	core := getCoreEntries(homeDir)
+	entries := withProviderEntries(core, cfg, nil)
+	editor := EditorConfig{
+		Name:       "windsurf",
+		ConfigPath: filepath.Join(homeDir, ".windsurf", "mcp.json"),
+		ConfigKey:  "mcpServers",
+		Format:     "json",
+	}
+	return writeMCPConfigForEditor(editor, entries)
+}
+
 func ConfigureAll(cfg *config.MuyueConfig) error {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return fmt.Errorf("get home dir: %w", err)
 	}
 
-	if err := GenerateCrushMCPConfig(cfg, home); err != nil {
-		return fmt.Errorf("crush MCP config: %w", err)
+	editors := []struct {
+		name string
+		fn   func(*config.MuyueConfig, string) error
+	}{
+		{"crush", GenerateCrushMCPConfig},
+		{"claude", GenerateClaudeMCPConfig},
+		{"cursor", GenerateCursorMCPConfig},
+		{"vscode", GenerateVSCodeMCPConfig},
+		{"windsurf", GenerateWindsurfMCPConfig},
 	}
 
-	if err := GenerateClaudeMCPConfig(cfg, home); err != nil {
-		return fmt.Errorf("claude MCP config: %w", err)
+	var errs []string
+	for _, e := range editors {
+		if err := e.fn(cfg, home); err != nil {
+			errs = append(errs, fmt.Sprintf("%s: %s", e.name, err))
+		}
+	}
+
+	SaveReceipt("all", time.Now().Format("2006-01-02"))
+
+	if len(errs) > 0 {
+		return fmt.Errorf("MCP config errors: %s", strings.Join(errs, "; "))
 	}
 
 	return nil
 }
+
+func ConfigureForEditor(cfg *config.MuyueConfig, editorName string) error {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return fmt.Errorf("get home dir: %w", err)
+	}
+
+	switch editorName {
+	case "crush":
+		return GenerateCrushMCPConfig(cfg, home)
+	case "claude", "claude-code":
+		return GenerateClaudeMCPConfig(cfg, home)
+	case "cursor":
+		return GenerateCursorMCPConfig(cfg, home)
+	case "vscode", "code":
+		return GenerateVSCodeMCPConfig(cfg, home)
+	case "windsurf":
+		return GenerateWindsurfMCPConfig(cfg, home)
+	default:
+		return fmt.Errorf("unknown editor: %s (supported: crush, claude-code, cursor, vscode, windsurf)", editorName)
+	}
+}
+
+func DetectInstalledEditors(homeDir string) []string {
+	if homeDir == "" {
+		home, _ := os.UserHomeDir()
+		homeDir = home
+	}
+
+	editors := []struct {
+		name string
+		path string
+	}{
+		{"crush", filepath.Join(homeDir, ".config", "crush", "crush.json")},
+		{"claude-code", filepath.Join(homeDir, ".claude.json")},
+		{"cursor", filepath.Join(homeDir, ".cursor")},
+		{"vscode", filepath.Join(homeDir, ".vscode")},
+		{"windsurf", filepath.Join(homeDir, ".windsurf")},
+	}
+
+	var detected []string
+	for _, e := range editors {
+		if _, err := os.Stat(e.path); err == nil {
+			detected = append(detected, e.name)
+		}
+	}
+	return detected
+}
+
+func GetAllStatuses() []MCPStatus {
+	servers := ScanServers()
+	statuses := make([]MCPStatus, len(servers))
+	for i, s := range servers {
+		statuses[i] = CheckServerStatus(s.Name)
+	}
+	return statuses
+}

internal/mcp/registry.go

@@ -0,0 +1,520 @@
+package mcp
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"gopkg.in/yaml.v3"
+)
+
+type RegistryServer struct {
+	Name        string            `yaml:"name" json:"name"`
+	Description string            `yaml:"description" json:"description"`
+	Category    string            `yaml:"category" json:"category"`
+	Package     string            `yaml:"package" json:"package"`
+	Command     string            `yaml:"command" json:"command"`
+	Args        []string          `yaml:"args" json:"args"`
+	Env         map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
+	RequiredEnv []string          `yaml:"required_env,omitempty" json:"required_env,omitempty"`
+	HomePage    string            `yaml:"homepage,omitempty" json:"homepage,omitempty"`
+	Tags        []string          `yaml:"tags,omitempty" json:"tags,omitempty"`
+	Version     string            `yaml:"version,omitempty" json:"version,omitempty"`
+	InstallType string            `yaml:"install_type" json:"install_type"`
+}
+
+type Registry struct {
+	SchemaVersion string           `yaml:"schema_version"`
+	UpdatedAt     time.Time        `yaml:"updated_at"`
+	Servers       []RegistryServer `yaml:"servers"`
+}
+
+type MCPStatus struct {
+	Name      string `json:"name"`
+	Installed bool   `json:"installed"`
+	Running   bool   `json:"running"`
+	Healthy   bool   `json:"healthy"`
+	Version   string `json:"version"`
+	Error     string `json:"error,omitempty"`
+}
+
+type EditorConfig struct {
+	Name             string
+	ConfigPath       string
+	ConfigKey        string
+	LocalConfigPath  string
+	Format           string
+	TransformCommand func(entry mcpEntry) interface{}
+}
+
+var (
+	registryMu     sync.RWMutex
+	registryCache  *Registry
+	registryPath   string
+)
+
+func init() {
+	home, _ := os.UserHomeDir()
+	if home != "" {
+		registryPath = filepath.Join(home, ".muyue", "mcp-registry.yaml")
+	}
+}
+
+func SetRegistryPath(p string) {
+	registryMu.Lock()
+	defer registryMu.Unlock()
+	registryPath = p
+	registryCache = nil
+}
+
+func DefaultRegistry() *Registry {
+	return &Registry{
+		SchemaVersion: "v1",
+		UpdatedAt:     time.Now(),
+		Servers: []RegistryServer{
+			{
+				Name: "filesystem", Description: "File system operations for AI tools",
+				Category: "core", Package: "@modelcontextprotocol/server-filesystem",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-filesystem"},
+				InstallType: "npm", Tags: []string{"files", "core"},
+			},
+			{
+				Name: "github", Description: "GitHub API integration",
+				Category: "vcs", Package: "@modelcontextprotocol/server-github",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-github"},
+				Env: map[string]string{"GITHUB_PERSONAL_ACCESS_TOKEN": ""},
+				RequiredEnv: []string{"GITHUB_PERSONAL_ACCESS_TOKEN"},
+				InstallType: "npm", Tags: []string{"github", "git"},
+			},
+			{
+				Name: "git", Description: "Git repository operations",
+				Category: "vcs", Package: "@modelcontextprotocol/server-git",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-git"},
+				InstallType: "npm", Tags: []string{"git"},
+			},
+			{
+				Name: "fetch", Description: "Web fetching and HTTP requests",
+				Category: "web", Package: "@modelcontextprotocol/server-fetch",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-fetch"},
+				InstallType: "npm", Tags: []string{"web", "http"},
+			},
+			{
+				Name: "memory", Description: "Persistent memory/knowledge graph",
+				Category: "core", Package: "@modelcontextprotocol/server-memory",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-memory"},
+				InstallType: "npm", Tags: []string{"memory", "core"},
+			},
+			{
+				Name: "sequential-thinking", Description: "Structured reasoning and chain-of-thought",
+				Category: "ai", Package: "@modelcontextprotocol/server-sequential-thinking",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-sequential-thinking"},
+				InstallType: "npm", Tags: []string{"ai", "reasoning"},
+			},
+			{
+				Name: "brave-search", Description: "Web search via Brave Search API",
+				Category: "web", Package: "@modelcontextprotocol/server-brave-search",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-brave-search"},
+				Env: map[string]string{"BRAVE_API_KEY": ""},
+				RequiredEnv: []string{"BRAVE_API_KEY"},
+				InstallType: "npm", Tags: []string{"search", "web"},
+			},
+			{
+				Name: "sqlite", Description: "SQLite database operations",
+				Category: "database", Package: "@modelcontextprotocol/server-sqlite",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-sqlite"},
+				InstallType: "npm", Tags: []string{"database", "sqlite"},
+			},
+			{
+				Name: "postgres", Description: "PostgreSQL database operations",
+				Category: "database", Package: "@modelcontextprotocol/server-postgres",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-postgres"},
+				InstallType: "npm", Tags: []string{"database", "postgres"},
+			},
+			{
+				Name: "docker", Description: "Docker container management",
+				Category: "devops", Package: "@modelcontextprotocol/server-docker",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-docker"},
+				InstallType: "npm", Tags: []string{"docker", "devops"},
+			},
+			{
+				Name: "minimax-web-search", Description: "Web search via MiniMax API",
+				Category: "ai", Package: "@minimax/mcp-web-search",
+				Command: "npx", Args: []string{"-y", "@minimax/mcp-web-search"},
+				Env: map[string]string{"MINIMAX_API_KEY": ""},
+				RequiredEnv: []string{"MINIMAX_API_KEY"},
+				InstallType: "npm", Tags: []string{"ai", "search"},
+			},
+			{
+				Name: "minimax-image", Description: "Image understanding via MiniMax API",
+				Category: "ai", Package: "@minimax/mcp-image-understanding",
+				Command: "npx", Args: []string{"-y", "@minimax/mcp-image-understanding"},
+				Env: map[string]string{"MINIMAX_API_KEY": ""},
+				RequiredEnv: []string{"MINIMAX_API_KEY"},
+				InstallType: "npm", Tags: []string{"ai", "image"},
+			},
+			{
+				Name: "puppeteer", Description: "Browser automation with Puppeteer",
+				Category: "web", Package: "@modelcontextprotocol/server-puppeteer",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-puppeteer"},
+				InstallType: "npm", Tags: []string{"browser", "automation"},
+			},
+			{
+				Name: "everything", Description: "Test/debug MCP server with all features",
+				Category: "testing", Package: "@modelcontextprotocol/server-everything",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-everything"},
+				InstallType: "npm", Tags: []string{"testing", "debug"},
+			},
+			{
+				Name: "slack", Description: "Slack workspace integration",
+				Category: "communication", Package: "@modelcontextprotocol/server-slack",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-slack"},
+				Env: map[string]string{"SLACK_BOT_TOKEN": ""},
+				RequiredEnv: []string{"SLACK_BOT_TOKEN"},
+				InstallType: "npm", Tags: []string{"slack", "communication"},
+			},
+			{
+				Name: "google-maps", Description: "Google Maps integration",
+				Category: "web", Package: "@modelcontextprotocol/server-google-maps",
+				Command: "npx", Args: []string{"-y", "@modelcontextprotocol/server-google-maps"},
+				Env: map[string]string{"GOOGLE_MAPS_API_KEY": ""},
+				RequiredEnv: []string{"GOOGLE_MAPS_API_KEY"},
+				InstallType: "npm", Tags: []string{"maps", "location"},
+			},
+		},
+	}
+}
+
+func LoadRegistry() (*Registry, error) {
+	registryMu.RLock()
+	if registryCache != nil {
+		defer registryMu.RUnlock()
+		return registryCache, nil
+	}
+	registryMu.RUnlock()
+
+	reg, err := loadRegistryFromDisk()
+	if err != nil {
+		defaultReg := DefaultRegistry()
+		registryMu.Lock()
+		registryCache = defaultReg
+		registryMu.Unlock()
+		return defaultReg, nil
+	}
+
+	registryMu.Lock()
+	registryCache = reg
+	registryMu.Unlock()
+	return reg, nil
+}
+
+func loadRegistryFromDisk() (*Registry, error) {
+	if registryPath == "" {
+		return nil, fmt.Errorf("registry path not set")
+	}
+
+	data, err := os.ReadFile(registryPath)
+	if err != nil {
+		return nil, err
+	}
+
+	var reg Registry
+	if err := yaml.Unmarshal(data, &reg); err != nil {
+		return nil, fmt.Errorf("parse registry: %w", err)
+	}
+
+	return &reg, nil
+}
+
+func SaveRegistry(reg *Registry) error {
+	if registryPath == "" {
+		return fmt.Errorf("registry path not set")
+	}
+
+	reg.UpdatedAt = time.Now()
+	data, err := yaml.Marshal(reg)
+	if err != nil {
+		return fmt.Errorf("marshal registry: %w", err)
+	}
+
+	if err := os.MkdirAll(filepath.Dir(registryPath), 0755); err != nil {
+		return err
+	}
+
+	if err := os.WriteFile(registryPath, data, 0644); err != nil {
+		return err
+	}
+
+	registryMu.Lock()
+	registryCache = reg
+	registryMu.Unlock()
+	return nil
+}
+
+func AddToRegistry(server RegistryServer) error {
+	reg, err := LoadRegistry()
+	if err != nil {
+		return err
+	}
+
+	for _, s := range reg.Servers {
+		if s.Name == server.Name {
+			return fmt.Errorf("server %q already exists in registry", server.Name)
+		}
+	}
+
+	reg.Servers = append(reg.Servers, server)
+	return SaveRegistry(reg)
+}
+
+func RemoveFromRegistry(name string) error {
+	reg, err := LoadRegistry()
+	if err != nil {
+		return err
+	}
+
+	for i, s := range reg.Servers {
+		if s.Name == name {
+			reg.Servers = append(reg.Servers[:i], reg.Servers[i+1:]...)
+			return SaveRegistry(reg)
+		}
+	}
+
+	return fmt.Errorf("server %q not found in registry", name)
+}
+
+func InitRegistry() error {
+	if _, err := os.Stat(registryPath); err == nil {
+		return nil
+	}
+	return SaveRegistry(DefaultRegistry())
+}
+
+func ResolveEnv(env map[string]string, providerKeys map[string]string) map[string]string {
+	resolved := make(map[string]string)
+	for k, v := range env {
+		if v != "" {
+			resolved[k] = v
+			continue
+		}
+
+		if providerKeys != nil {
+			for providerKey, apiKey := range providerKeys {
+				if strings.EqualFold(k, providerKey) || strings.Contains(strings.ToUpper(k), strings.ToUpper(providerKey)) {
+					if apiKey != "" {
+						resolved[k] = apiKey
+					}
+				}
+			}
+		}
+
+		if resolved[k] == "" {
+			if envVal := os.Getenv(k); envVal != "" {
+				resolved[k] = envVal
+			}
+		}
+	}
+	return resolved
+}
+
+func ValidateConfig(configPath string) error {
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return fmt.Errorf("read config: %w", err)
+	}
+
+	var cfg map[string]interface{}
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return fmt.Errorf("parse config: %w", err)
+	}
+
+	return nil
+}
+
+func DiscoverNpmServers() ([]RegistryServer, error) {
+	var servers []RegistryServer
+
+	packages := []struct {
+		pkg   string
+		name  string
+		desc  string
+		cat   string
+		args  []string
+	}{
+		{"@modelcontextprotocol/server-filesystem", "filesystem", "File system operations", "core", []string{"-y", "@modelcontextprotocol/server-filesystem"}},
+		{"@modelcontextprotocol/server-github", "github", "GitHub API integration", "vcs", []string{"-y", "@modelcontextprotocol/server-github"}},
+		{"@modelcontextprotocol/server-fetch", "fetch", "Web fetching", "web", []string{"-y", "@modelcontextprotocol/server-fetch"}},
+		{"@modelcontextprotocol/server-memory", "memory", "Persistent memory", "core", []string{"-y", "@modelcontextprotocol/server-memory"}},
+	}
+
+	for _, p := range packages {
+		servers = append(servers, RegistryServer{
+			Name:        p.name,
+			Description: p.desc,
+			Category:    p.cat,
+			Package:     p.pkg,
+			Command:     "npx",
+			Args:        p.args,
+			InstallType: "npm",
+		})
+	}
+
+	return servers, nil
+}
+
+func GetInstalledVersion(name string) string {
+	home, _ := os.UserHomeDir()
+	if home == "" {
+		return ""
+	}
+	receiptPath := filepath.Join(home, ".muyue", "receipts", "mcp", name+".json")
+	data, err := os.ReadFile(receiptPath)
+	if err != nil {
+		return ""
+	}
+	var receipt struct {
+		Version string `json:"version"`
+	}
+	if json.Unmarshal(data, &receipt) == nil {
+		return receipt.Version
+	}
+	return ""
+}
+
+func SaveReceipt(name, version string) error {
+	home, _ := os.UserHomeDir()
+	if home == "" {
+		return nil
+	}
+	receiptDir := filepath.Join(home, ".muyue", "receipts", "mcp")
+	os.MkdirAll(receiptDir, 0755)
+
+	receipt := struct {
+		Name      string `json:"name"`
+		Version   string `json:"version"`
+		UpdatedAt string `json:"updated_at"`
+	}{
+		Name:      name,
+		Version:   version,
+		UpdatedAt: time.Now().Format(time.RFC3339),
+	}
+
+	data, _ := json.MarshalIndent(receipt, "", "  ")
+	return os.WriteFile(filepath.Join(receiptDir, name+".json"), data, 0644)
+}
+
+func BuildProviderKeyMap(cfg interface{ GetAPIKeys() map[string]string }) map[string]string {
+	if cfg == nil {
+		return nil
+	}
+	return cfg.GetAPIKeys()
+}
+
+func EditorConfigs(homeDir string) []EditorConfig {
+	if homeDir == "" {
+		home, _ := os.UserHomeDir()
+		homeDir = home
+	}
+
+	transformStdio := func(e mcpEntry) interface{} {
+		m := map[string]interface{}{
+			"command": e.cmd,
+			"args":    e.args,
+		}
+		if len(e.env) > 0 {
+			m["env"] = e.env
+		}
+		return m
+	}
+
+	transformCursor := func(e mcpEntry) interface{} {
+		m := map[string]interface{}{
+			"type":    "stdio",
+			"command": e.cmd,
+			"args":    e.args,
+		}
+		if len(e.env) > 0 {
+			m["env"] = e.env
+		}
+		return m
+	}
+
+	return []EditorConfig{
+		{
+			Name: "crush", ConfigPath: filepath.Join(homeDir, ".config", "crush", "crush.json"),
+			ConfigKey: "mcps", Format: "json", TransformCommand: transformStdio,
+		},
+		{
+			Name: "claude-code", ConfigPath: filepath.Join(homeDir, ".claude.json"),
+			ConfigKey: "mcpServers", Format: "json", TransformCommand: transformStdio,
+		},
+		{
+			Name: "cursor", ConfigPath: filepath.Join(homeDir, ".cursor", "mcp.json"),
+			LocalConfigPath: ".cursor/mcp.json", ConfigKey: "mcpServers",
+			Format: "json", TransformCommand: transformCursor,
+		},
+		{
+			Name: "vscode", ConfigPath: filepath.Join(homeDir, ".vscode", "mcp.json"),
+			LocalConfigPath: ".vscode/mcp.json", ConfigKey: "servers",
+			Format: "json", TransformCommand: transformStdio,
+		},
+		{
+			Name: "windsurf", ConfigPath: filepath.Join(homeDir, ".windsurf", "mcp.json"),
+			ConfigKey: "mcpServers", Format: "json", TransformCommand: transformStdio,
+		},
+	}
+}
+
+func CheckServerStatus(name string) MCPStatus {
+	status := MCPStatus{Name: name}
+
+	reg, err := LoadRegistry()
+	if err != nil {
+		status.Error = "registry unavailable"
+		return status
+	}
+
+	var server *RegistryServer
+	for i := range reg.Servers {
+		if reg.Servers[i].Name == name {
+			server = &reg.Servers[i]
+			break
+		}
+	}
+	if server == nil {
+		status.Error = "not in registry"
+		return status
+	}
+
+	_, err = exec.LookPath(server.Command)
+	if err != nil {
+		status.Error = fmt.Sprintf("command %q not found", server.Command)
+		return status
+	}
+	status.Installed = true
+
+	status.Version = GetInstalledVersion(name)
+
+	home, _ := os.UserHomeDir()
+	if home != "" {
+		crushingPath := filepath.Join(home, ".config", "crush", "crush.json")
+		data, err := os.ReadFile(crushingPath)
+		if err == nil {
+			var cfg map[string]interface{}
+			if json.Unmarshal(data, &cfg) == nil {
+				if mcps, ok := cfg["mcps"].(map[string]interface{}); ok {
+					if _, exists := mcps[name]; exists {
+						status.Running = true
+						status.Healthy = true
+					}
+				}
+			}
+		}
+	}
+
+	return status
+}

internal/mcp/registry_test.go

@@ -0,0 +1,228 @@
+package mcp
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestDefaultRegistry(t *testing.T) {
+	reg := DefaultRegistry()
+	if reg.SchemaVersion != "v1" {
+		t.Errorf("Expected v1, got %s", reg.SchemaVersion)
+	}
+	if len(reg.Servers) == 0 {
+		t.Error("Default registry should have servers")
+	}
+
+	names := map[string]bool{}
+	for _, s := range reg.Servers {
+		if names[s.Name] {
+			t.Errorf("Duplicate server name: %s", s.Name)
+		}
+		names[s.Name] = true
+		if s.Command == "" {
+			t.Errorf("Server %s missing command", s.Name)
+		}
+	}
+}
+
+func TestSaveAndLoadRegistry(t *testing.T) {
+	tmpDir := t.TempDir()
+	registryPath := filepath.Join(tmpDir, "mcp-registry.yaml")
+	SetRegistryPath(registryPath)
+
+	reg := DefaultRegistry()
+	if err := SaveRegistry(reg); err != nil {
+		t.Fatalf("SaveRegistry failed: %v", err)
+	}
+
+	if _, err := os.Stat(registryPath); os.IsNotExist(err) {
+		t.Error("Registry file should exist")
+	}
+
+	loaded, err := LoadRegistry()
+	if err != nil {
+		t.Fatalf("LoadRegistry failed: %v", err)
+	}
+	if len(loaded.Servers) != len(reg.Servers) {
+		t.Errorf("Expected %d servers, got %d", len(reg.Servers), len(loaded.Servers))
+	}
+}
+
+func TestAddAndRemoveFromRegistry(t *testing.T) {
+	tmpDir := t.TempDir()
+	SetRegistryPath(filepath.Join(tmpDir, "mcp-registry.yaml"))
+	SaveRegistry(DefaultRegistry())
+
+	newServer := RegistryServer{
+		Name:        "test-server",
+		Description: "Test server",
+		Category:    "test",
+		Command:     "npx",
+		Args:        []string{"-y", "test-pkg"},
+		InstallType: "npm",
+	}
+
+	if err := AddToRegistry(newServer); err != nil {
+		t.Fatalf("AddToRegistry failed: %v", err)
+	}
+
+	reg, _ := LoadRegistry()
+	found := false
+	for _, s := range reg.Servers {
+		if s.Name == "test-server" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Error("test-server should be in registry")
+	}
+
+	if err := RemoveFromRegistry("test-server"); err != nil {
+		t.Fatalf("RemoveFromRegistry failed: %v", err)
+	}
+
+	reg, _ = LoadRegistry()
+	for _, s := range reg.Servers {
+		if s.Name == "test-server" {
+			t.Error("test-server should have been removed")
+		}
+	}
+}
+
+func TestResolveEnv(t *testing.T) {
+	env := map[string]string{
+		"API_KEY": "",
+		"HOST":    "localhost",
+	}
+
+	os.Setenv("API_KEY", "from-env")
+	defer os.Unsetenv("API_KEY")
+
+	resolved := ResolveEnv(env, nil)
+	if resolved["API_KEY"] != "from-env" {
+		t.Errorf("Expected from-env, got %s", resolved["API_KEY"])
+	}
+	if resolved["HOST"] != "localhost" {
+		t.Errorf("Expected localhost, got %s", resolved["HOST"])
+	}
+}
+
+func TestValidateConfig(t *testing.T) {
+	tmpDir := t.TempDir()
+	configPath := filepath.Join(tmpDir, "test-config.json")
+	os.WriteFile(configPath, []byte(`{"mcps":{}}`), 0644)
+
+	if err := ValidateConfig(configPath); err != nil {
+		t.Errorf("Valid config should pass: %v", err)
+	}
+
+	badPath := filepath.Join(tmpDir, "nonexistent.json")
+	if err := ValidateConfig(badPath); err == nil {
+		t.Error("Nonexistent config should fail")
+	}
+}
+
+func TestEditorConfigs(t *testing.T) {
+	configs := EditorConfigs("/tmp")
+	if len(configs) < 3 {
+		t.Errorf("Expected at least 3 editor configs, got %d", len(configs))
+	}
+
+	names := map[string]bool{}
+	for _, c := range configs {
+		if names[c.Name] {
+			t.Errorf("Duplicate editor: %s", c.Name)
+		}
+		names[c.Name] = true
+		if c.ConfigPath == "" {
+			t.Errorf("Editor %s missing config path", c.Name)
+		}
+		if c.ConfigKey == "" {
+			t.Errorf("Editor %s missing config key", c.Name)
+		}
+	}
+}
+
+func TestDiscoverNpmServers(t *testing.T) {
+	servers, err := DiscoverNpmServers()
+	if err != nil {
+		t.Fatalf("DiscoverNpmServers failed: %v", err)
+	}
+	if len(servers) == 0 {
+		t.Error("Should discover some npm servers")
+	}
+}
+
+func TestReceiptRoundTrip(t *testing.T) {
+	tmpDir := t.TempDir()
+	os.Setenv("HOME", tmpDir)
+	defer os.Unsetenv("HOME")
+
+	SetRegistryPath(filepath.Join(tmpDir, "reg.yaml"))
+
+	if err := SaveReceipt("test-server", "1.2.3"); err != nil {
+		t.Fatalf("SaveReceipt failed: %v", err)
+	}
+
+	version := GetInstalledVersion("test-server")
+	if version != "1.2.3" {
+		t.Errorf("Expected 1.2.3, got %s", version)
+	}
+}
+
+func TestInitRegistry(t *testing.T) {
+	tmpDir := t.TempDir()
+	SetRegistryPath(filepath.Join(tmpDir, "init-reg.yaml"))
+
+	if err := InitRegistry(); err != nil {
+		t.Fatalf("InitRegistry failed: %v", err)
+	}
+
+	if _, err := os.Stat(filepath.Join(tmpDir, "init-reg.yaml")); os.IsNotExist(err) {
+		t.Error("Registry file should be created")
+	}
+
+	if err := InitRegistry(); err != nil {
+		t.Fatalf("Second InitRegistry should not fail: %v", err)
+	}
+}
+
+func TestDetectInstalledEditors(t *testing.T) {
+	tmpDir := t.TempDir()
+	os.MkdirAll(filepath.Join(tmpDir, ".config", "crush"), 0755)
+	os.WriteFile(filepath.Join(tmpDir, ".config", "crush", "crush.json"), []byte(`{}`), 0644)
+	os.MkdirAll(filepath.Join(tmpDir, ".cursor"), 0755)
+
+	editors := DetectInstalledEditors(tmpDir)
+	if len(editors) < 2 {
+		t.Errorf("Expected at least 2 editors, got %d", len(editors))
+	}
+
+	found := map[string]bool{}
+	for _, e := range editors {
+		found[e] = true
+	}
+	if !found["crush"] {
+		t.Error("Should detect crush")
+	}
+	if !found["cursor"] {
+		t.Error("Should detect cursor")
+	}
+}
+
+func TestCheckServerStatus(t *testing.T) {
+	tmpDir := t.TempDir()
+	os.Setenv("HOME", tmpDir)
+	defer os.Unsetenv("HOME")
+
+	SetRegistryPath(filepath.Join(tmpDir, "reg.yaml"))
+	SaveRegistry(DefaultRegistry())
+
+	status := CheckServerStatus("nonexistent")
+	if status.Error == "" {
+		t.Error("Should have error for nonexistent server")
+	}
+}

internal/orchestrator/orchestrator.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"regexp"
 	"strings"
@@ -20,24 +21,42 @@ var thinkRegex = regexp.MustCompile(`(?s)<[Tt]hink[^>]*>.*?</[Tt]hink>`)
 const maxHistorySize = 100
 
 type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
+	Role       string          `json:"role"`
+	Content    string          `json:"content,omitempty"`
+	ToolCalls  []ToolCallMsg   `json:"tool_calls,omitempty"`
+	ToolCallID string          `json:"tool_call_id,omitempty"`
+	Name       string          `json:"name,omitempty"`
+}
+
+type ToolCallMsg struct {
+	ID       string             `json:"id"`
+	Type     string             `json:"type"`
+	Function ToolCallFuncMsg    `json:"function"`
+}
+
+type ToolCallFuncMsg struct {
+	Name      string `json:"name"`
+	Arguments string `json:"arguments"`
 }
 
 type ChatRequest struct {
-	Model    string    `json:"model"`
-	Messages []Message `json:"messages"`
-	Stream   bool      `json:"stream"`
+	Model    string          `json:"model"`
+	Messages []Message       `json:"messages"`
+	Stream   bool            `json:"stream"`
+	Tools    json.RawMessage `json:"tools,omitempty"`
 }
 
 type ChatResponse struct {
 	Choices []struct {
 		Message struct {
-			Content string `json:"content"`
+			Content   string        `json:"content"`
+			ToolCalls []ToolCallMsg `json:"tool_calls"`
 		} `json:"message"`
 		Delta struct {
-			Content string `json:"content"`
+			Content   string        `json:"content"`
+			ToolCalls []ToolCallMsg `json:"tool_calls"`
 		} `json:"delta"`
+		FinishReason *string `json:"finish_reason"`
 	} `json:"choices"`
 	Usage struct {
 		TotalTokens int `json:"total_tokens"`
@@ -51,12 +70,18 @@ type Orchestrator struct {
 	history      []Message
 	histMu       sync.Mutex
 	systemPrompt string
+	tools        json.RawMessage
 }
 
 var sharedHTTPClient = &http.Client{
 	Timeout: 120 * time.Second,
 }
 
+// requestClient creates an HTTP client with the specified timeout.
+func requestClient(timeout time.Duration) *http.Client {
+	return &http.Client{Timeout: timeout}
+}
+
 func New(cfg *config.MuyueConfig) (*Orchestrator, error) {
 	var provider *config.AIProvider
 	for i := range cfg.AI.Providers {
@@ -86,6 +111,34 @@ func (o *Orchestrator) SetSystemPrompt(prompt string) {
 	o.systemPrompt = prompt
 }
 
+func (o *Orchestrator) SetTools(tools json.RawMessage) {
+	o.tools = tools
+}
+
+func (o *Orchestrator) ProviderName() string {
+	if o.provider == nil {
+		return ""
+	}
+	return o.provider.Name
+}
+
+func (o *Orchestrator) AppendHistory(msg Message) {
+	o.histMu.Lock()
+	defer o.histMu.Unlock()
+	o.history = append(o.history, msg)
+	if len(o.history) > maxHistorySize {
+		o.history = o.history[len(o.history)-maxHistorySize:]
+	}
+}
+
+func (o *Orchestrator) GetHistory() []Message {
+	o.histMu.Lock()
+	defer o.histMu.Unlock()
+	out := make([]Message, len(o.history))
+	copy(out, o.history)
+	return out
+}
+
 func (o *Orchestrator) Send(userMessage string) (string, error) {
 	o.histMu.Lock()
 	o.history = append(o.history, Message{
@@ -107,51 +160,13 @@ func (o *Orchestrator) Send(userMessage string) (string, error) {
 		Model:    o.provider.Model,
 		Messages: messages,
 		Stream:   false,
+		Tools:    o.tools,
 	}
 	o.histMu.Unlock()
 
-	body, err := json.Marshal(reqBody)
+	chatResp, providerName, err := o.sendWithFallback(reqBody, "")
 	if err != nil {
-		return "", fmt.Errorf("marshal request: %w", err)
-	}
-
-	baseURL := o.provider.BaseURL
-	if baseURL == "" {
-		baseURL = getProviderBaseURL(o.provider.Name)
-	}
-
-	url := strings.TrimRight(baseURL, "/") + "/chat/completions"
-
-	req, err := http.NewRequest("POST", url, bytes.NewReader(body))
-	if err != nil {
-		return "", fmt.Errorf("create request: %w", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+o.provider.APIKey)
-
-	resp, err := o.client.Do(req)
-	if err != nil {
-		return "", fmt.Errorf("send request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	respBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("read response: %w", err)
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("API error (%d): %s", resp.StatusCode, string(respBody))
-	}
-
-	var chatResp ChatResponse
-	if err := json.Unmarshal(respBody, &chatResp); err != nil {
-		return "", fmt.Errorf("parse response: %w", err)
-	}
-
-	if len(chatResp.Choices) == 0 {
-		return "", fmt.Errorf("no response from AI")
+		return "", err
 	}
 
 	content := cleanAIResponse(chatResp.Choices[0].Message.Content)
@@ -160,6 +175,7 @@ func (o *Orchestrator) Send(userMessage string) (string, error) {
 		Role:    "assistant",
 		Content: content,
 	})
+	_ = providerName
 	o.histMu.Unlock()
 
 	return content, nil
@@ -186,6 +202,7 @@ func (o *Orchestrator) SendStream(userMessage string, onChunk func(string)) (str
 		Model:    o.provider.Model,
 		Messages: messages,
 		Stream:   true,
+		Tools:    o.tools,
 	}
 	o.histMu.Unlock()
 
@@ -263,6 +280,168 @@ func (o *Orchestrator) SendStream(userMessage string, onChunk func(string)) (str
 	return content, nil
 }
 
+func (o *Orchestrator) SendWithTools(messages []Message) (*ChatResponse, error) {
+	fullMessages := make([]Message, 0, len(messages)+1)
+	if o.systemPrompt != "" {
+		fullMessages = append(fullMessages, Message{Role: "system", Content: o.systemPrompt})
+	}
+	fullMessages = append(fullMessages, messages...)
+
+	reqBody := ChatRequest{
+		Model:    o.provider.Model,
+		Messages: fullMessages,
+		Stream:   false,
+		Tools:    o.tools,
+	}
+
+	chatResp, _, err := o.sendWithFallback(reqBody, "")
+	if err != nil {
+		return nil, err
+	}
+
+	if len(chatResp.Choices) == 0 {
+		return nil, fmt.Errorf("no response from AI")
+	}
+
+	return chatResp, nil
+}
+
+// ChunkCallback is called for each streaming chunk.
+type ChunkCallback func(content string, toolCalls []ToolCallMsg)
+
+// SendWithToolsStream sends messages with streaming responses.
+// The callback receives chunks of content and tool_calls as they arrive.
+func (o *Orchestrator) SendWithToolsStream(messages []Message, onChunk ChunkCallback) (*ChatResponse, error) {
+	fullMessages := make([]Message, 0, len(messages)+1)
+	if o.systemPrompt != "" {
+		fullMessages = append(fullMessages, Message{Role: "system", Content: o.systemPrompt})
+	}
+	fullMessages = append(fullMessages, messages...)
+
+	reqBody := ChatRequest{
+		Model:    o.provider.Model,
+		Messages: fullMessages,
+		Stream:   true,
+		Tools:    o.tools,
+	}
+
+	body, err := json.Marshal(reqBody)
+	if err != nil {
+		return nil, fmt.Errorf("marshal request: %w", err)
+	}
+
+	provider := o.provider
+	baseURL := provider.BaseURL
+	if baseURL == "" {
+		baseURL = getProviderBaseURL(provider.Name)
+	}
+
+	url := strings.TrimRight(baseURL, "/") + "/chat/completions"
+
+	req, err := http.NewRequest("POST", url, bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("create request: %w", err)
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Authorization", "Bearer "+provider.APIKey)
+
+	resp, err := o.client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("send request: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		respBody, _ := io.ReadAll(resp.Body)
+		return nil, fmt.Errorf("API error (%d): %s", resp.StatusCode, string(respBody))
+	}
+
+	var fullContent strings.Builder
+	var accumulatedToolCalls []ToolCallMsg
+	var totalTokens int
+
+	scanner := bufio.NewScanner(resp.Body)
+	scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)
+
+	for scanner.Scan() {
+		line := scanner.Text()
+		if !strings.HasPrefix(line, "data: ") {
+			continue
+		}
+		data := strings.TrimPrefix(line, "data: ")
+		if data == "[DONE]" {
+			break
+		}
+
+		var chatResp ChatResponse
+		if err := json.Unmarshal([]byte(data), &chatResp); err != nil {
+			continue
+		}
+
+		if len(chatResp.Choices) > 0 {
+			chunk := chatResp.Choices[0].Delta.Content
+			if chunk != "" {
+				fullContent.WriteString(chunk)
+				onChunk(chunk, nil)
+			}
+
+			// Handle delta tool calls
+			if len(chatResp.Choices[0].Delta.ToolCalls) > 0 {
+				for _, tc := range chatResp.Choices[0].Delta.ToolCalls {
+					// Find or create the tool call in accumulated list
+					found := false
+					for i := range accumulatedToolCalls {
+						if accumulatedToolCalls[i].ID == tc.ID {
+							// Append arguments
+							accumulatedToolCalls[i].Function.Arguments += tc.Function.Arguments
+							found = true
+							break
+						}
+					}
+					if !found {
+						accumulatedToolCalls = append(accumulatedToolCalls, tc)
+					}
+				}
+				onChunk("", accumulatedToolCalls)
+			}
+
+			// Capture usage from final chunk
+			if chatResp.Usage.TotalTokens > 0 {
+				totalTokens = chatResp.Usage.TotalTokens
+			}
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("read stream: %w", err)
+	}
+
+	// Build final response
+	finalResp := &ChatResponse{
+		Usage: struct {
+			TotalTokens int `json:"total_tokens"`
+		}{TotalTokens: totalTokens},
+		Choices: []struct {
+			Message struct {
+				Content   string        `json:"content"`
+				ToolCalls []ToolCallMsg `json:"tool_calls"`
+			} `json:"message"`
+			Delta struct {
+				Content   string        `json:"content"`
+				ToolCalls []ToolCallMsg `json:"tool_calls"`
+			} `json:"delta"`
+			FinishReason *string `json:"finish_reason"`
+		}{},
+	}
+
+	finalContent := cleanAIResponse(fullContent.String())
+	finalResp.Choices[0].Message.Content = finalContent
+	finalResp.Choices[0].Message.ToolCalls = accumulatedToolCalls
+
+	return finalResp, nil
+}
+
 func cleanAIResponse(content string) string {
 	content = thinkRegex.ReplaceAllString(content, "")
 	lines := strings.Split(content, "\n")
@@ -301,3 +480,104 @@ func getProviderBaseURL(name string) string {
 		return ""
 	}
 }
+
+func (o *Orchestrator) getAvailableProviders() []*config.AIProvider {
+	var providers []*config.AIProvider
+	for i := range o.config.AI.Providers {
+		prov := &o.config.AI.Providers[i]
+		if prov.APIKey != "" {
+			providers = append(providers, prov)
+		}
+	}
+	return providers
+}
+
+func (o *Orchestrator) sendWithFallback(reqBody ChatRequest, baseURLOverride string) (*ChatResponse, string, error) {
+	providers := o.getAvailableProviders()
+
+	if len(providers) == 0 {
+		return nil, "", fmt.Errorf("no providers available")
+	}
+
+	providerOrder := make([]*config.AIProvider, 0, len(providers))
+	if o.provider != nil {
+		providerOrder = append(providerOrder, o.provider)
+	}
+	for _, p := range providers {
+		if o.provider == nil || p.Name != o.provider.Name {
+			providerOrder = append(providerOrder, p)
+		}
+	}
+
+	var lastErr error
+	var triedProviders []string
+	for _, prov := range providerOrder {
+		triedProviders = append(triedProviders, prov.Name)
+		baseURL := baseURLOverride
+		if baseURL == "" {
+			baseURL = prov.BaseURL
+			if baseURL == "" {
+				baseURL = getProviderBaseURL(prov.Name)
+			}
+		}
+
+		url := strings.TrimRight(baseURL, "/") + "/chat/completions"
+
+		body, err := json.Marshal(reqBody)
+		if err != nil {
+			lastErr = fmt.Errorf("marshal request: %w", err)
+			continue
+		}
+
+		req, err := http.NewRequest("POST", url, bytes.NewReader(body))
+		if err != nil {
+			lastErr = fmt.Errorf("create request: %w", err)
+			continue
+		}
+
+		req.Header.Set("Content-Type", "application/json")
+		
+		// Provider-specific headers
+		if prov.Name == "anthropic" {
+			req.Header.Set("x-api-key", prov.APIKey)
+			req.Header.Set("anthropic-version", "2023-06-01")
+		} else {
+			req.Header.Set("Authorization", "Bearer "+prov.APIKey)
+		}
+
+		resp, err := o.client.Do(req)
+		if err != nil {
+			lastErr = fmt.Errorf("send request to %s: %w", prov.Name, err)
+			continue
+		}
+		defer resp.Body.Close()
+
+		respBody, err := io.ReadAll(resp.Body)
+		if err != nil {
+			lastErr = fmt.Errorf("read response: %w", err)
+			continue
+		}
+
+		if resp.StatusCode != http.StatusOK {
+			lastErr = fmt.Errorf("API error (%d): %s", resp.StatusCode, string(respBody))
+			continue
+		}
+
+		var chatResp ChatResponse
+		if err := json.Unmarshal(respBody, &chatResp); err != nil {
+			lastErr = fmt.Errorf("parse response: %w", err)
+			continue
+		}
+
+		if len(chatResp.Choices) == 0 {
+			lastErr = fmt.Errorf("no response from AI")
+			continue
+		}
+
+		o.provider = prov
+		return &chatResp, prov.Name, nil
+	}
+
+	log.Printf("[orchestrator] fallback from %v to next provider", triedProviders)
+	return nil, "", lastErr
+}

internal/platform/platform.go

@@ -24,12 +24,12 @@ const (
 )
 
 type SystemInfo struct {
-	OS            OS
-	Arch          Arch
-	IsWSL         bool
-	Shell         string
-	Terminal      string
-	PackageManager string
+	OS             OS     `json:"os"`
+	Arch           Arch   `json:"arch"`
+	IsWSL          bool   `json:"is_wsl"`
+	Shell          string `json:"shell"`
+	Terminal       string `json:"terminal"`
+	PackageManager string `json:"package_manager"`
 }
 
 func Detect() SystemInfo {

internal/scanner/scanner.go

@@ -14,31 +14,31 @@ import (
 )
 
 type ToolStatus struct {
-	Name         string `yaml:"name"`
-	Installed    bool   `yaml:"installed"`
-	Version      string `yaml:"version"`
-	Path         string `yaml:"path"`
-	Latest       string `yaml:"latest"`
-	NeedsUpdate  bool   `yaml:"needs_update"`
-	Category     string `yaml:"category"`
+	Name        string `yaml:"name"         json:"name"`
+	Installed   bool   `yaml:"installed"    json:"installed"`
+	Version     string `yaml:"version"      json:"version"`
+	Path        string `yaml:"path"         json:"path"`
+	Latest      string `yaml:"latest"       json:"latest"`
+	NeedsUpdate bool   `yaml:"needs_update" json:"needs_update"`
+	Category    string `yaml:"category"     json:"category"`
 }
 
 type RuntimeStatus struct {
-	Name      string `yaml:"name"`
-	Installed bool   `yaml:"installed"`
-	Version   string `yaml:"version"`
+	Name      string `yaml:"name"      json:"name"`
+	Installed bool   `yaml:"installed" json:"installed"`
+	Version   string `yaml:"version"   json:"version"`
 }
 
 type ScanResult struct {
-	System       platform.SystemInfo `yaml:"system"`
-	Tools        []ToolStatus        `yaml:"tools"`
-	Runtimes     []RuntimeStatus     `yaml:"runtimes"`
-	ShellSetup   bool                `yaml:"shell_setup"`
-	GitConfigured bool               `yaml:"git_configured"`
+	System        platform.SystemInfo `yaml:"system"         json:"system"`
+	Tools         []ToolStatus        `yaml:"tools"          json:"tools"`
+	Runtimes      []RuntimeStatus     `yaml:"runtimes"       json:"runtimes"`
+	ShellSetup    bool                `yaml:"shell_setup"    json:"shell_setup"`
+	GitConfigured bool                `yaml:"git_configured" json:"git_configured"`
 }
 
 var (
-	cacheMu    sync.RWMutex
+	cacheMu     sync.RWMutex
 	cacheResult *ScanResult
 	cacheTime   time.Time
 	cacheTTL    = 5 * time.Minute
@@ -193,6 +193,43 @@ func checkGitConfig() bool {
 	return true
 }
 
+var editorsList = []struct {
+	name    string
+	cmd     []string
+	version []string
+}{
+	{"vim", []string{"vim"}, []string{"--version"}},
+	{"nvim", []string{"nvim"}, []string{"--version"}},
+	{"code", []string{"code"}, []string{"--version"}},
+	{"emacs", []string{"emacs"}, []string{"--version"}},
+	{"nano", []string{"nano"}, []string{"--version"}},
+	{"helix", []string{"hx"}, []string{"--version"}},
+	{"subl", []string{"subl"}, []string{"--version"}},
+	{"zed", []string{"zed"}, []string{"--version"}},
+}
+
+func ScanEditors() []ToolStatus {
+	var results []ToolStatus
+	for _, e := range editorsList {
+		status := ToolStatus{Name: e.name}
+		path, err := exec.LookPath(e.name)
+		if err != nil {
+			continue
+		}
+		status.Installed = true
+		status.Path = path
+		if len(e.version) > 0 {
+			cmd := exec.Command(e.cmd[0], e.version...)
+			out, err := cmd.Output()
+			if err == nil {
+				status.Version = strings.TrimSpace(string(out))
+			}
+		}
+		results = append(results, status)
+	}
+	return results
+}
+
 var versionRegex = regexp.MustCompile(`\d+\.\d+\.\d+`)
 
 func (s *ScanResult) Summary() string {

internal/skills/builtins.go

@@ -11,9 +11,10 @@ var builtinSkills = []Skill{
 		Name:        "env-setup",
 		Description: "Set up a complete development environment for any language. Detects missing tools, installs them, and configures the project.",
 		Author:      "muyue",
-		Version:     "1.0.0",
+		Version:     "1.1.0",
 		Target:      "both",
 		Tags:        []string{"setup", "environment", "install"},
+		Category:    "setup",
 		Content: `# Environment Setup
 
 Use this skill when setting up a new development environment or project.
@@ -58,9 +59,14 @@ Use this skill when setting up a new development environment or project.
 		Name:        "git-workflow",
 		Description: "Manage git branches, commits, and pull requests following best practices. Handles branching strategy, conventional commits, and PR creation.",
 		Author:      "muyue",
-		Version:     "1.0.0",
+		Version:     "1.1.0",
 		Target:      "both",
 		Tags:        []string{"git", "workflow", "branching", "commits"},
+		Category:    "workflow",
+		Dependencies: []SkillDependency{
+			{Type: "tool", Name: "git", Required: true},
+			{Type: "tool", Name: "gh", Required: false},
+		},
 		Content: `# Git Workflow
 
 Use this skill when the user needs to create branches, make commits, or manage pull requests.
@@ -114,9 +120,10 @@ Follow Conventional Commits:
 		Name:        "api-design",
 		Description: "Design and implement REST or GraphQL APIs following best practices. Includes endpoint design, error handling, and documentation.",
 		Author:      "muyue",
-		Version:     "1.0.0",
+		Version:     "1.1.0",
 		Target:      "both",
 		Tags:        []string{"api", "rest", "graphql", "design"},
+		Category:    "design",
 		Content: `# API Design
 
 Use this skill when designing or implementing an API.
@@ -171,9 +178,10 @@ Use this skill when designing or implementing an API.
 		Name:        "debug-assist",
 		Description: "Systematic debugging assistant. Helps identify, isolate, and fix bugs using a structured approach.",
 		Author:      "muyue",
-		Version:     "1.0.0",
+		Version:     "1.1.0",
 		Target:      "both",
 		Tags:        []string{"debug", "troubleshooting", "bugs"},
+		Category:    "debugging",
 		Content: `# Debug Assist
 
 Use this skill when the user reports a bug or asks for help debugging.
@@ -188,7 +196,7 @@ Use this skill when the user reports a bug or asks for help debugging.
 3. **Hypothesize** — Form a hypothesis about the root cause
 4. **Verify** — Add logging or breakpoints to confirm
 5. **Fix** — Make the minimal change to fix the issue
-6. **Test** — Verify the fix works and doesn't break other things
+6. **Test** — Verify the fix works and does not break other things
 7. **Prevent** — Add a test to prevent regression
 
 ## Common Patterns
@@ -211,9 +219,10 @@ Use this skill when the user reports a bug or asks for help debugging.
 		Name:        "code-review",
 		Description: "Perform a thorough code review. Checks for bugs, security issues, performance problems, and style consistency.",
 		Author:      "muyue",
-		Version:     "1.0.0",
+		Version:     "1.1.0",
 		Target:      "both",
 		Tags:        []string{"review", "quality", "security"},
+		Category:    "quality",
 		Content: `# Code Review
 
 Use this skill when reviewing code changes or pull requests.
@@ -221,7 +230,7 @@ Use this skill when reviewing code changes or pull requests.
 ## Review Checklist
 
 ### Correctness
-- Does the code do what it's supposed to?
+- Does the code do what it is supposed to?
 - Are edge cases handled?
 - Are there off-by-one errors?
 - Are error paths handled?
@@ -254,7 +263,7 @@ Use this skill when reviewing code changes or pull requests.
 ## Review Format
 
 1. Summary of changes
-2. Issues found (critical → minor)
+2. Issues found (critical to minor)
 3. Suggestions for improvement
 4. Positive observations
 
@@ -265,6 +274,351 @@ Use this skill when reviewing code changes or pull requests.
 - **Minor**: Style issues, naming, minor refactoring opportunities
 - **Suggestion**: Alternative approaches, improvements`,
 	},
+	{
+		Name:        "docker-setup",
+		Description: "Set up Docker and docker-compose for a project with best practices including multi-stage builds, health checks, and proper networking.",
+		Author:      "muyue",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"docker", "containers", "devops", "compose"},
+		Category:    "devops",
+		Dependencies: []SkillDependency{
+			{Type: "tool", Name: "docker", Required: true},
+		},
+		Content: `# Docker Setup
+
+Use this skill when the user needs Docker configuration for a project.
+
+## Dockerfile Best Practices
+
+1. Use multi-stage builds to reduce image size:
+   - Builder stage: install dependencies, compile
+   - Runtime stage: copy only the binary/artifacts
+
+2. Use specific base image tags (not ` + "`latest`" + `):
+   - ` + "`golang:1.24-alpine`" + ` for Go
+   - ` + "`node:22-slim`" + ` for Node.js
+   - ` + "`python:3.12-slim`" + ` for Python
+
+3. Order layers for cache efficiency:
+   - Copy dependency files first (go.mod, package.json, requirements.txt)
+   - Install dependencies
+   - Copy source code last
+
+4. Add health checks:
+   ` + "```" + `dockerfile
+   HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost:8080/health || exit 1
+   ` + "```" + `
+
+5. Run as non-root user:
+   ` + "```" + `dockerfile
+   RUN adduser -D appuser
+   USER appuser
+   ` + "```" + `
+
+## docker-compose.yml Structure
+
+` + "```" + `yaml
+version: "3.9"
+services:
+  app:
+    build: .
+    ports:
+      - "8080:8080"
+    environment:
+      - DATABASE_URL=postgres://user:pass@db:5432/app
+    depends_on:
+      db:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 30s
+      timeout: 3s
+      retries: 3
+
+  db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: pass
+      POSTGRES_DB: app
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U user"]
+      interval: 10s
+      timeout: 3s
+      retries: 5
+
+volumes:
+  pgdata:
+` + "```" + `
+
+## Error Handling
+
+- If Docker is not installed, provide install instructions for the platform
+- If port is already in use, suggest alternative ports
+- If build fails, check for missing .dockerignore and suggest one`,
+	},
+	{
+		Name:        "security-audit",
+		Description: "Perform a security audit on code, dependencies, and configuration. Checks for OWASP Top 10 vulnerabilities, dependency vulnerabilities, and misconfigurations.",
+		Author:      "muyue",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"security", "audit", "vulnerabilities", "owasp"},
+		Category:    "security",
+		Content: `# Security Audit
+
+Use this skill when the user needs a security review or vulnerability assessment.
+
+## Audit Checklist
+
+### Input Validation (OWASP A03:2021)
+- All user input is validated and sanitized
+- SQL queries use parameterized statements
+- File paths are validated (no path traversal)
+- Input length limits are enforced
+
+### Authentication and Authorization (OWASP A07:2021)
+- Passwords are hashed with bcrypt/argon2 (never MD5/SHA1)
+- JWT tokens have short expiry with refresh rotation
+- Session management is secure
+- RBAC or ABAC is properly implemented
+- API endpoints have proper auth checks
+
+### Data Protection (OWASP A02:2021)
+- Secrets are not in source code (use env vars or secret managers)
+- Sensitive data is encrypted at rest and in transit
+- PII is properly handled and not logged
+- TLS is enforced for all connections
+
+### Dependency Security (OWASP A06:2021)
+- Run ` + "`npm audit`" + `, ` + "`pip audit`" + `, or ` + "`go vuln check`" + `
+- Check for known CVEs in dependencies
+- Keep dependencies up to date
+- Use lock files for reproducible builds
+
+### Configuration Security
+- Debug mode is disabled in production
+- CORS is properly configured
+- Rate limiting is in place
+- Security headers are set (CSP, HSTS, X-Frame-Options)
+- Error messages do not leak internal details
+
+## Automated Checks
+
+Run these tools if available:
+- ` + "`gosec ./...`" + ` for Go security
+- ` + "`bandit -r .`" + ` for Python security
+- ` + "`npm audit`" + ` for Node.js vulnerabilities
+- ` + "`trivy fs .`" + ` for container/Dockerfile scanning
+
+## Report Format
+
+1. Executive Summary (risk level, total findings)
+2. Critical findings (immediate action required)
+3. High findings (fix within 24h)
+4. Medium findings (fix within sprint)
+5. Low findings (address when convenient)
+6. Recommendations`,
+	},
+	{
+		Name:        "mcp-setup",
+		Description: "Configure MCP (Model Context Protocol) servers for AI tools. Discovers, installs, and configures MCP servers across multiple editors.",
+		Author:      "muyue",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"mcp", "ai", "configuration", "editors"},
+		Category:    "setup",
+		Dependencies: []SkillDependency{
+			{Type: "tool", Name: "npx", Required: true},
+		},
+		Content: `# MCP Server Setup
+
+Use this skill when the user wants to configure MCP servers for their AI coding tools.
+
+## Supported Editors
+
+Muyue can generate MCP configs for:
+- **Crush**: ` + "`~/.config/crush/crush.json`" + ` (key: ` + "`mcps`" + `)
+- **Claude Code**: ` + "`~/.claude.json`" + ` (key: ` + "`mcpServers`" + `)
+- **Cursor**: ` + "`~/.cursor/mcp.json`" + ` (key: ` + "`mcpServers`" + `, adds ` + "`type: stdio`" + `)
+- **VS Code**: ` + "`~/.vscode/mcp.json`" + ` (key: ` + "`servers`" + `)
+- **Windsurf**: ` + "`~/.windsurf/mcp.json`" + ` (key: ` + "`mcpServers`" + `)
+
+## Common MCP Servers
+
+| Server | Package | Required Env |
+|--------|---------|-------------|
+| filesystem | @modelcontextprotocol/server-filesystem | None |
+| fetch | @modelcontextprotocol/server-fetch | None |
+| github | @modelcontextprotocol/server-github | GITHUB_PERSONAL_ACCESS_TOKEN |
+| brave-search | @modelcontextprotocol/server-brave-search | BRAVE_API_KEY |
+| memory | @modelcontextprotocol/server-memory | None |
+| postgres | @modelcontextprotocol/server-postgres | DATABASE_URL |
+| sqlite | @modelcontextprotocol/server-sqlite | None |
+| docker | @modelcontextprotocol/server-docker | None |
+
+## Setup Steps
+
+1. Ask which editors the user wants to configure
+2. Ask which MCP servers they need
+3. For servers requiring API keys, prompt for the key
+4. Generate configs for each selected editor
+5. Validate configs (check JSON is valid, commands exist)
+6. Test connectivity if possible
+
+## Credential Management
+
+- API keys should be stored in the Muyue config (encrypted)
+- When generating MCP configs, inject keys from the Muyue config
+- Never hardcode API keys in config files in version control
+- Suggest adding MCP config files to ` + "`.gitignore`" + `
+
+## Troubleshooting
+
+- If npx fails, suggest ` + "`npm install -g`" + ` the package
+- If a server does not start, check the command and args
+- If auth fails, verify the API key is correct and active`,
+	},
+	{
+		Name:        "lsp-setup",
+		Description: "Configure Language Server Protocol servers for code intelligence. Detects project languages, installs LSPs, and generates editor configs.",
+		Author:      "muyue",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"lsp", "language-server", "ide", "configuration"},
+		Category:    "setup",
+		Content: `# LSP Server Setup
+
+Use this skill when the user wants to set up language servers for code intelligence.
+
+## Supported Languages
+
+| Language | Server | Install Method |
+|----------|--------|---------------|
+| Go | gopls | ` + "`go install`" + ` |
+| Python | pyright | ` + "`npm install -g`" + ` |
+| TypeScript/JS | typescript-language-server | ` + "`npm install -g`" + ` |
+| Rust | rust-analyzer | ` + "`rustup component add`" + ` |
+| C/C++ | clangd | System package |
+| Lua | lua-language-server | ` + "`npm install -g`" + ` |
+| HTML | vscode-html-language-server | ` + "`npm install -g vscode-langservers-extracted`" + ` |
+| CSS | vscode-css-language-server | ` + "`npm install -g vscode-langservers-extracted`" + ` |
+| JSON | vscode-json-language-server | ` + "`npm install -g vscode-langservers-extracted`" + ` |
+| YAML | yaml-language-server | ` + "`npm install -g`" + ` |
+| Bash | bash-language-server | ` + "`npm install -g`" + ` |
+| Docker | dockerfile-language-server | ` + "`npm install -g`" + ` |
+| Vue | vue-language-server | ` + "`npm install -g`" + ` |
+| Svelte | svelte-language-server | ` + "`npm install -g`" + ` |
+
+## Auto-Detection
+
+Detect project languages from:
+- Config files: ` + "`go.mod`" + `, ` + "`package.json`" + `, ` + "`Cargo.toml`" + `, ` + "`pyproject.toml`" + `
+- Source file extensions: ` + "`*.go`" + `, ` + "`*.py`" + `, ` + "`*.ts`" + `, ` + "`*.rs`" + `
+
+## Editor Config Generation
+
+### Neovim
+Generate ` + "`lspconfig`" + ` setup snippet for each LSP.
+
+### Helix
+Generate ` + "`languages.toml`" + ` entries with language-server mappings.
+
+### VS Code / Cursor
+Generate ` + "`extensions.json`" + ` recommendations for each LSP.
+
+## Health Checks
+
+After installation, verify:
+1. The binary is in PATH
+2. The version matches expected
+3. A basic ` + "`initialize`" + ` request succeeds (if applicable)`,
+	},
+	{
+		Name:        "workflow-design",
+		Description: "Design development workflows and automations. Creates CI/CD pipelines, git hooks, and development process documentation.",
+		Author:      "muyue",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"workflow", "ci-cd", "automation", "process"},
+		Category:    "workflow",
+		Content: `# Workflow Design
+
+Use this skill when the user wants to establish development workflows or CI/CD pipelines.
+
+## CI/CD Pipeline Design
+
+### GitHub Actions Template
+
+` + "```" + `yaml
+name: CI
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with: { go-version: "1.24" }
+      - run: go vet ./...
+      - run: golint ./...
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with: { go-version: "1.24" }
+      - run: go test -race -coverprofile=coverage.out ./...
+      - run: go tool cover -func=coverage.out
+
+  build:
+    needs: [lint, test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: go build -o bin/app ./cmd/app
+` + "```" + `
+
+## Git Hooks
+
+Use ` + "`pre-commit`" + ` framework:
+- ` + "`pre-commit`" + `: lint, format check, trailing whitespace
+- ` + "`commit-msg`" + `: validate conventional commit format
+- ` + "`pre-push`" + `: run tests
+
+## Branch Protection Rules
+
+- Require PR reviews (at least 1 approval)
+- Require status checks to pass
+- Require up-to-date branch before merge
+- Require linear history (rebase merge)
+
+## Development Process
+
+1. Pick a task from the backlog
+2. Create a feature branch
+3. Implement with tests
+4. Run linter and tests locally
+5. Push and create PR
+6. Address review feedback
+7. Merge when approved and CI passes
+8. Delete feature branch
+
+## Error Handling
+
+- If CI fails, provide clear error output and suggested fixes
+- If hooks fail, explain what failed and how to fix
+- Suggest ` + "`--no-verify`" + ` only as a last resort, with a warning`,
+	},
 }
 
 func InstallBuiltinSkills() error {

internal/skills/skills.go

@@ -1,27 +1,53 @@
 package skills
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
-	"sort"
+	"regexp"
 	"strings"
 	"time"
 
 	"gopkg.in/yaml.v3"
 )
 
+type SkillDependency struct {
+	Type     string `yaml:"type,omitempty" json:"type,omitempty"`
+	Name     string `yaml:"name,omitempty" json:"name,omitempty"`
+	Version  string `yaml:"version,omitempty" json:"version,omitempty"`
+	Required bool   `yaml:"required,omitempty" json:"required,omitempty"`
+}
+
 type Skill struct {
-	Name        string    `yaml:"name" json:"name"`
-	Description string    `yaml:"description" json:"description"`
-	Content     string    `yaml:"content" json:"content"`
-	Author      string    `yaml:"author" json:"author"`
-	Version     string    `yaml:"version" json:"version"`
-	CreatedAt   time.Time `yaml:"created_at" json:"created_at"`
-	UpdatedAt   time.Time `yaml:"updated_at" json:"updated_at"`
-	Tags        []string  `yaml:"tags" json:"tags"`
-	Target      string    `yaml:"target" json:"target"`
-	FilePath    string    `yaml:"-" json:"-"`
+	Name         string            `yaml:"name" json:"name"`
+	Description  string            `yaml:"description" json:"description"`
+	Content      string            `yaml:"content" json:"content"`
+	Author       string            `yaml:"author" json:"author"`
+	Version      string            `yaml:"version" json:"version"`
+	CreatedAt    time.Time         `yaml:"created_at" json:"created_at"`
+	UpdatedAt    time.Time         `yaml:"updated_at" json:"updated_at"`
+	Tags         []string          `yaml:"tags" json:"tags"`
+	Target       string            `yaml:"target" json:"target"`
+	FilePath     string            `yaml:"-" json:"-"`
+	Dependencies []SkillDependency `yaml:"dependencies,omitempty" json:"dependencies,omitempty"`
+	Languages    []string          `yaml:"languages,omitempty" json:"languages,omitempty"`
+	Category     string            `yaml:"category,omitempty" json:"category,omitempty"`
+}
+
+type ValidationError struct {
+	Field   string `json:"field"`
+	Message string `json:"message"`
+}
+
+func (v ValidationError) Error() string {
+	return fmt.Sprintf("%s: %s", v.Field, v.Message)
+}
+
+type SkillTestResult struct {
+	Name    string `json:"name"`
+	Passed  bool   `json:"passed"`
+	Message string `json:"message"`
 }
 
 func SkillsDir() (string, error) {
@@ -66,10 +92,6 @@ func List() ([]Skill, error) {
 		skills = append(skills, *skill)
 	}
 
-	sort.Slice(skills, func(i, j int) bool {
-		return skills[i].Name < skills[j].Name
-	})
-
 	return skills, nil
 }
 
@@ -95,6 +117,10 @@ func Get(name string) (*Skill, error) {
 }
 
 func Create(skill *Skill) error {
+	if errs := Validate(skill); len(errs) > 0 {
+		return fmt.Errorf("validation failed: %v", errs)
+	}
+
 	dir, err := SkillsDir()
 	if err != nil {
 		return err
@@ -129,6 +155,28 @@ func Delete(name string) error {
 	return nil
 }
 
+func Update(skill *Skill) error {
+	if errs := Validate(skill); len(errs) > 0 {
+		return fmt.Errorf("validation failed: %v", errs)
+	}
+
+	dir, err := SkillsDir()
+	if err != nil {
+		return err
+	}
+
+	skillDir := filepath.Join(dir, skill.Name)
+	skillPath := filepath.Join(skillDir, "SKILL.md")
+
+	skill.UpdatedAt = time.Now()
+	content := renderSkill(skill)
+	if err := os.WriteFile(skillPath, []byte(content), 0644); err != nil {
+		return err
+	}
+
+	return Deploy(skill)
+}
+
 func Deploy(skill *Skill) error {
 	home, err := os.UserHomeDir()
 	if err != nil {
@@ -188,6 +236,206 @@ func undeployFromTargets(name string) {
 	os.RemoveAll(filepath.Join(home, ".claude", "skills", name))
 }
 
+func Validate(skill *Skill) []ValidationError {
+	var errs []ValidationError
+
+	if skill.Name == "" {
+		errs = append(errs, ValidationError{Field: "name", Message: "name is required"})
+	}
+
+	if skill.Name != "" {
+		if matched, _ := regexp.MatchString(`^[a-z0-9][a-z0-9-]*$`, skill.Name); !matched {
+			errs = append(errs, ValidationError{Field: "name", Message: "name must be lowercase alphanumeric with dashes"})
+		}
+	}
+
+	if skill.Description == "" {
+		errs = append(errs, ValidationError{Field: "description", Message: "description is required"})
+	}
+
+	if skill.Content == "" {
+		errs = append(errs, ValidationError{Field: "content", Message: "content is required"})
+	}
+
+	if skill.Target != "" && skill.Target != "crush" && skill.Target != "claude" && skill.Target != "both" {
+		errs = append(errs, ValidationError{Field: "target", Message: "target must be crush, claude, or both"})
+	}
+
+	if skill.Version != "" {
+		if matched, _ := regexp.MatchString(`^\d+\.\d+\.\d+$`, skill.Version); !matched {
+			errs = append(errs, ValidationError{Field: "version", Message: "version must be semver (e.g. 1.0.0)"})
+		}
+	}
+
+	for i, dep := range skill.Dependencies {
+		if dep.Type != "mcp_server" && dep.Type != "lsp" && dep.Type != "tool" && dep.Type != "runtime" && dep.Type != "" {
+			errs = append(errs, ValidationError{
+				Field:   fmt.Sprintf("dependencies[%d].type", i),
+				Message: "dependency type must be mcp_server, lsp, tool, or runtime",
+			})
+		}
+		if dep.Name == "" {
+			errs = append(errs, ValidationError{
+				Field:   fmt.Sprintf("dependencies[%d].name", i),
+				Message: "dependency name is required",
+			})
+		}
+	}
+
+	return errs
+}
+
+func CheckDependencies(skill *Skill) []SkillDependency {
+	var missing []SkillDependency
+	for _, dep := range skill.Dependencies {
+		switch dep.Type {
+		case "mcp_server":
+			if !isMCPServerAvailable(dep.Name) {
+				missing = append(missing, dep)
+			}
+		case "lsp", "tool", "runtime":
+			if !isToolAvailable(dep.Name) {
+				missing = append(missing, dep)
+			}
+		}
+	}
+	return missing
+}
+
+func isToolAvailable(name string) bool {
+	_, err := lookPath(name)
+	return err == nil
+}
+
+func lookPath(name string) (string, error) {
+	pathEnv := os.Getenv("PATH")
+	home, _ := os.UserHomeDir()
+	if home != "" {
+		pathEnv = home + "/.local/bin:" + home + "/go/bin:" + pathEnv
+	}
+	for _, dir := range filepath.SplitList(pathEnv) {
+		candidate := filepath.Join(dir, name)
+		if info, err := os.Stat(candidate); err == nil && !info.IsDir() {
+			return candidate, nil
+		}
+	}
+	return "", fmt.Errorf("%s not found", name)
+}
+
+func isMCPServerAvailable(name string) bool {
+	home, _ := os.UserHomeDir()
+	if home == "" {
+		return false
+	}
+	configPath := filepath.Join(home, ".config", "crush", "crush.json")
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return false
+	}
+	var cfg map[string]interface{}
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return false
+	}
+	mcps, ok := cfg["mcps"].(map[string]interface{})
+	if !ok {
+		return false
+	}
+	_, exists := mcps[name]
+	return exists
+}
+
+func Export(name string, exportPath string) error {
+	skill, err := Get(name)
+	if err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll(filepath.Dir(exportPath), 0755); err != nil {
+		return err
+	}
+
+	content := renderSkill(skill)
+	return os.WriteFile(exportPath, []byte(content), 0644)
+}
+
+func Import(exportPath string) (*Skill, error) {
+	data, err := os.ReadFile(exportPath)
+	if err != nil {
+		return nil, fmt.Errorf("read export file: %w", err)
+	}
+
+	skill, err := parseSkill(data)
+	if err != nil {
+		return nil, err
+	}
+
+	name := filepath.Base(filepath.Dir(exportPath))
+	if skill.Name == "" {
+		skill.Name = strings.TrimSuffix(filepath.Base(exportPath), ".md")
+		if skill.Name == "SKILL" {
+			skill.Name = filepath.Base(filepath.Dir(exportPath))
+		}
+	}
+
+	_ = name
+	if errs := Validate(skill); len(errs) > 0 {
+		return nil, fmt.Errorf("validation failed: %v", errs)
+	}
+
+	return skill, nil
+}
+
+func DryRun(name string, sampleTask string) SkillTestResult {
+	skill, err := Get(name)
+	if err != nil {
+		return SkillTestResult{Name: name, Passed: false, Message: fmt.Sprintf("skill not found: %s", err)}
+	}
+
+	if skill.Content == "" {
+		return SkillTestResult{Name: name, Passed: false, Message: "skill has no content"}
+	}
+
+	if len(skill.Dependencies) > 0 {
+		missing := CheckDependencies(skill)
+		if len(missing) > 0 {
+			var names []string
+			for _, d := range missing {
+				names = append(names, d.Name)
+			}
+			return SkillTestResult{
+				Name:    name,
+				Passed:  false,
+				Message: fmt.Sprintf("missing dependencies: %s", strings.Join(names, ", ")),
+			}
+		}
+	}
+
+	if sampleTask != "" {
+		tags := skill.Tags
+		taskLower := strings.ToLower(sampleTask)
+		matched := false
+		for _, tag := range tags {
+			if strings.Contains(taskLower, strings.ToLower(tag)) {
+				matched = true
+				break
+			}
+		}
+		if len(tags) > 0 && !matched {
+			return SkillTestResult{
+				Name:    name,
+				Passed:  true,
+				Message: "skill loaded but sample task does not match skill tags",
+			}
+		}
+	}
+
+	return SkillTestResult{
+		Name:    name,
+		Passed:  true,
+		Message: "skill validated successfully",
+	}
+}
+
 func parseSkill(data []byte) (*Skill, error) {
 	content := string(data)
 
@@ -227,9 +475,25 @@ func renderSkill(skill *Skill) string {
 	if skill.Target != "" {
 		b.WriteString(fmt.Sprintf("target: %s\n", skill.Target))
 	}
+	if skill.Category != "" {
+		b.WriteString(fmt.Sprintf("category: %s\n", skill.Category))
+	}
 	if len(skill.Tags) > 0 {
 		b.WriteString(fmt.Sprintf("tags: [%s]\n", strings.Join(skill.Tags, ", ")))
 	}
+	if len(skill.Languages) > 0 {
+		b.WriteString(fmt.Sprintf("languages: [%s]\n", strings.Join(skill.Languages, ", ")))
+	}
+	if len(skill.Dependencies) > 0 {
+		b.WriteString("dependencies:\n")
+		for _, dep := range skill.Dependencies {
+			req := ""
+			if dep.Required {
+				req = ", required: true"
+			}
+			b.WriteString(fmt.Sprintf("  - type: %s, name: %s%s\n", dep.Type, dep.Name, req))
+		}
+	}
 	b.WriteString("---\n\n")
 	b.WriteString(skill.Content)
 	b.WriteString("\n")
@@ -245,7 +509,7 @@ DESCRIPTION: %s
 TARGET: %s (crush = Crush with GLM, claude = Claude Code, both = both tools)
 
 The skill must follow this EXACT format:
-1. YAML frontmatter with: name, description
+1. YAML frontmatter with: name, description, tags, dependencies (if needed)
 2. Markdown body with detailed instructions
 
 The skill should be practical, specific, and actionable.
@@ -255,5 +519,10 @@ Include:
 - Examples where relevant
 - Error handling guidance
 
+If the skill requires specific tools, MCP servers, or LSP servers, declare them as dependencies:
+  - type: mcp_server, name: <server-name>
+  - type: lsp, name: <language-server-name>
+  - type: tool, name: <tool-name>
+
 Output ONLY the skill file content, starting with ---`, name, description, target)
 }

internal/skills/skills_test.go

@@ -113,7 +113,7 @@ func TestCreateAndGet(t *testing.T) {
 		Description: "Test description",
 		Content:     "Test content body",
 		Author:      "tester",
-		Version:     "0.1",
+		Version:     "1.0.0",
 		Target:      "both",
 	}
 
@@ -198,3 +198,242 @@ func TestInstallBuiltinSkills(t *testing.T) {
 		t.Error("Expected env-setup skill")
 	}
 }
+
+func TestValidate(t *testing.T) {
+	skill := &Skill{
+		Name:        "valid-skill",
+		Description: "A valid skill",
+		Content:     "## Steps\nDo things",
+		Version:     "1.0.0",
+		Target:      "both",
+	}
+
+	errs := Validate(skill)
+	if len(errs) != 0 {
+		t.Errorf("Valid skill should have no errors, got %v", errs)
+	}
+}
+
+func TestValidateMissingFields(t *testing.T) {
+	skill := &Skill{}
+	errs := Validate(skill)
+	if len(errs) == 0 {
+		t.Error("Empty skill should have validation errors")
+	}
+
+	fields := map[string]bool{}
+	for _, e := range errs {
+		fields[e.Field] = true
+	}
+	if !fields["name"] {
+		t.Error("Should require name")
+	}
+	if !fields["description"] {
+		t.Error("Should require description")
+	}
+	if !fields["content"] {
+		t.Error("Should require content")
+	}
+}
+
+func TestValidateBadVersion(t *testing.T) {
+	skill := &Skill{
+		Name:        "test-skill",
+		Description: "desc",
+		Content:     "content",
+		Version:     "not-semver",
+	}
+	errs := Validate(skill)
+	hasVersionErr := false
+	for _, e := range errs {
+		if e.Field == "version" {
+			hasVersionErr = true
+		}
+	}
+	if !hasVersionErr {
+		t.Error("Should reject non-semver version")
+	}
+}
+
+func TestValidateBadTarget(t *testing.T) {
+	skill := &Skill{
+		Name:        "test",
+		Description: "desc",
+		Content:     "content",
+		Target:      "invalid",
+	}
+	errs := Validate(skill)
+	hasTargetErr := false
+	for _, e := range errs {
+		if e.Field == "target" {
+			hasTargetErr = true
+		}
+	}
+	if !hasTargetErr {
+		t.Error("Should reject invalid target")
+	}
+}
+
+func TestValidateBadName(t *testing.T) {
+	skill := &Skill{
+		Name:        "INVALID",
+		Description: "desc",
+		Content:     "content",
+	}
+	errs := Validate(skill)
+	hasNameErr := false
+	for _, e := range errs {
+		if e.Field == "name" {
+			hasNameErr = true
+		}
+	}
+	if !hasNameErr {
+		t.Error("Should reject uppercase name")
+	}
+}
+
+func TestValidateDependencies(t *testing.T) {
+	skill := &Skill{
+		Name:        "test",
+		Description: "desc",
+		Content:     "content",
+		Dependencies: []SkillDependency{
+			{Type: "mcp_server", Name: "github", Required: true},
+			{Type: "invalid_type", Name: "test"},
+		},
+	}
+	errs := Validate(skill)
+	hasDepErr := false
+	for _, e := range errs {
+		if e.Field == "dependencies[1].type" {
+			hasDepErr = true
+		}
+	}
+	if !hasDepErr {
+		t.Error("Should reject invalid dependency type")
+	}
+}
+
+func TestExportImport(t *testing.T) {
+	tmpDir := t.TempDir()
+	os.Setenv("HOME", tmpDir)
+	defer os.Setenv("HOME", tmpDir)
+
+	skill := &Skill{
+		Name:        "export-test",
+		Description: "Export test skill",
+		Content:     "## Content",
+		Author:      "tester",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"test"},
+	}
+	Create(skill)
+
+	exportPath := filepath.Join(tmpDir, "export", "export-test.md")
+	if err := Export("export-test", exportPath); err != nil {
+		t.Fatalf("Export failed: %v", err)
+	}
+
+	if _, err := os.Stat(exportPath); os.IsNotExist(err) {
+		t.Error("Export file should exist")
+	}
+
+	imported, err := Import(exportPath)
+	if err != nil {
+		t.Fatalf("Import failed: %v", err)
+	}
+	if imported.Description != "Export test skill" {
+		t.Errorf("Expected 'Export test skill', got %s", imported.Description)
+	}
+}
+
+func TestDryRun(t *testing.T) {
+	tmpDir := t.TempDir()
+	os.Setenv("HOME", tmpDir)
+	defer os.Setenv("HOME", tmpDir)
+
+	skill := &Skill{
+		Name:        "dry-run-test",
+		Description: "Dry run test",
+		Content:     "## Steps\nDo something",
+		Version:     "1.0.0",
+		Target:      "both",
+		Tags:        []string{"test"},
+	}
+	Create(skill)
+
+	result := DryRun("dry-run-test", "test something")
+	if !result.Passed {
+		t.Errorf("DryRun should pass, got: %s", result.Message)
+	}
+}
+
+func TestDryRunMissing(t *testing.T) {
+	result := DryRun("nonexistent", "")
+	if result.Passed {
+		t.Error("DryRun of nonexistent skill should fail")
+	}
+}
+
+func TestUpdate(t *testing.T) {
+	tmpDir := t.TempDir()
+	os.Setenv("HOME", tmpDir)
+	defer os.Setenv("HOME", tmpDir)
+
+	skill := &Skill{
+		Name:        "update-test",
+		Description: "Original",
+		Content:     "Original content",
+		Version:     "1.0.0",
+		Target:      "both",
+	}
+	Create(skill)
+
+	skill.Description = "Updated"
+	skill.Content = "Updated content"
+	skill.Version = "2.0.0"
+	if err := Update(skill); err != nil {
+		t.Fatalf("Update failed: %v", err)
+	}
+
+	got, err := Get("update-test")
+	if err != nil {
+		t.Fatalf("Get failed: %v", err)
+	}
+	if got.Description != "Updated" {
+		t.Errorf("Expected 'Updated', got %s", got.Description)
+	}
+}
+
+func TestBuiltinSkillCount(t *testing.T) {
+	if len(builtinSkills) < 5 {
+		t.Errorf("Expected at least 5 builtin skills, got %d", len(builtinSkills))
+	}
+
+	expectedSkills := []string{"env-setup", "git-workflow", "api-design", "debug-assist", "code-review", "docker-setup", "security-audit", "mcp-setup", "lsp-setup", "workflow-design"}
+	for _, name := range expectedSkills {
+		found := false
+		for _, s := range builtinSkills {
+			if s.Name == name {
+				found = true
+				break
+			}
+		}
+		if !found {
+			t.Errorf("Expected builtin skill: %s", name)
+		}
+	}
+}
+
+func TestBuiltinSkillsHaveDependencies(t *testing.T) {
+	hasDeps := 0
+	for _, s := range builtinSkills {
+		if len(s.Dependencies) > 0 {
+			hasDeps++
+		}
+	}
+	if hasDeps == 0 {
+		t.Error("At least some builtin skills should declare dependencies")
+	}
+}

internal/version/version.go

@@ -1,11 +1,33 @@
 package version
 
+import (
+	"fmt"
+	"runtime"
+)
+
 const (
 	Name    = "muyue"
-	Version = "0.3.2"
+	Version = "0.3.5"
 	Author  = "La Légion de Muyue"
 )
 
+var (
+	// BuildDate is set at build time
+	BuildDate = ""
+)
+
 func FullVersion() string {
 	return Name + " v" + Version
 }
+
+// FullInfo returns full version information.
+func FullInfo() string {
+	info := fmt.Sprintf("%-12s %s\n", "Version:", Version)
+	info += fmt.Sprintf("%-12s %s\n", "Author:", Author)
+	info += fmt.Sprintf("%-12s %s\n", "Go:", runtime.Version())
+	info += fmt.Sprintf("%-12s %s\n", "Platform:", runtime.GOOS+"/"+runtime.GOARCH)
+	if BuildDate != "" {
+		info += fmt.Sprintf("%-12s %s\n", "Build:", BuildDate)
+	}
+	return info
+}

internal/workflow/engine.go

@@ -0,0 +1,362 @@
+package workflow
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	"github.com/muyue/muyue/internal/agent"
+	"github.com/muyue/muyue/internal/config"
+)
+
+type Status string
+
+const (
+	StatusPending   Status = "pending"
+	StatusRunning   Status = "running"
+	StatusDone      Status = "done"
+	StatusFailed    Status = "failed"
+	StatusSkipped   Status = "skipped"
+	StatusAwaiting  Status = "awaiting_approval"
+)
+
+type StepType string
+
+const (
+	TypeToolCall   StepType = "tool_call"
+	TypeCondition  StepType = "condition"
+	TypeParallel   StepType = "parallel"
+	TypeApproval   StepType = "approval"
+)
+
+type Step struct {
+	ID          string          `json:"id"`
+	Name        string          `json:"name"`
+	Type        StepType        `json:"type"`
+	Tool        string          `json:"tool,omitempty"`
+	Args        json.RawMessage `json:"args,omitempty"`
+	Status      Status          `json:"status"`
+	Result      string          `json:"result,omitempty"`
+	Error       string          `json:"error,omitempty"`
+	Condition   string          `json:"condition,omitempty"`
+	DependsOn   []string        `json:"depends_on,omitempty"`
+	ApproveRole string          `json:"approve_role,omitempty"`
+	StartedAt   *time.Time      `json:"started_at,omitempty"`
+	EndedAt     *time.Time      `json:"ended_at,omitempty"`
+}
+
+type Workflow struct {
+	ID          string    `json:"id"`
+	Name        string    `json:"name"`
+	Description string    `json:"description"`
+	Type        string    `json:"type"`
+	Steps       []Step    `json:"steps"`
+	Status      Status    `json:"status"`
+	CreatedAt   time.Time `json:"created_at"`
+	UpdatedAt   time.Time `json:"updated_at"`
+}
+
+type Engine struct {
+	mu            sync.RWMutex
+	workflows     map[string]*Workflow
+	agentRegistry *agent.Registry
+	storePath     string
+}
+
+func NewEngine(registry *agent.Registry) (*Engine, error) {
+	dir, err := config.ConfigDir()
+	if err != nil {
+		dir = "/tmp/muyue"
+	}
+
+	storePath := filepath.Join(dir, "workflows.json")
+	engine := &Engine{
+		workflows:     make(map[string]*Workflow),
+		agentRegistry: registry,
+		storePath:     storePath,
+	}
+
+	engine.load()
+	return engine, nil
+}
+
+func (e *Engine) load() {
+	data, err := os.ReadFile(e.storePath)
+	if err != nil {
+		return
+	}
+
+	var workflows []*Workflow
+	if err := json.Unmarshal(data, &workflows); err != nil {
+		return
+	}
+
+	for _, w := range workflows {
+		e.workflows[w.ID] = w
+	}
+}
+
+func (e *Engine) save() error {
+	dir := filepath.Dir(e.storePath)
+	os.MkdirAll(dir, 0755)
+
+	e.mu.RLock()
+	workflows := make([]*Workflow, 0, len(e.workflows))
+	for _, w := range e.workflows {
+		workflows = append(workflows, w)
+	}
+	e.mu.RUnlock()
+
+	data, err := json.MarshalIndent(workflows, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(e.storePath, data, 0600)
+}
+
+func (e *Engine) Create(name, description, wfType string, steps []Step) *Workflow {
+	wf := &Workflow{
+		ID:          fmt.Sprintf("wf-%d", time.Now().UnixNano()),
+		Name:        name,
+		Description: description,
+		Type:        wfType,
+		Steps:       steps,
+		Status:      StatusPending,
+		CreatedAt:   time.Now(),
+		UpdatedAt:   time.Now(),
+	}
+
+	for i := range wf.Steps {
+		if wf.Steps[i].ID == "" {
+			wf.Steps[i].ID = fmt.Sprintf("step-%d", i)
+		}
+		if wf.Steps[i].Status == "" {
+			wf.Steps[i].Status = StatusPending
+		}
+	}
+
+	e.mu.Lock()
+	e.workflows[wf.ID] = wf
+	e.mu.Unlock()
+
+	e.save()
+	return wf
+}
+
+func (e *Engine) Get(id string) (*Workflow, bool) {
+	e.mu.RLock()
+	defer e.mu.RUnlock()
+	wf, ok := e.workflows[id]
+	return wf, ok
+}
+
+func (e *Engine) List() []*Workflow {
+	e.mu.RLock()
+	defer e.mu.RUnlock()
+	result := make([]*Workflow, 0, len(e.workflows))
+	for _, w := range e.workflows {
+		result = append(result, w)
+	}
+	return result
+}
+
+func (e *Engine) Delete(id string) error {
+	e.mu.Lock()
+	defer e.mu.Unlock()
+	if _, ok := e.workflows[id]; !ok {
+		return fmt.Errorf("workflow not found: %s", id)
+	}
+	delete(e.workflows, id)
+	return e.save()
+}
+
+func (e *Engine) UpdateStep(workflowID, stepID string, update func(*Step)) error {
+	e.mu.Lock()
+	defer e.mu.Unlock()
+
+	wf, ok := e.workflows[workflowID]
+	if !ok {
+		return fmt.Errorf("workflow not found: %s", workflowID)
+	}
+
+	for i := range wf.Steps {
+		if wf.Steps[i].ID == stepID {
+			update(&wf.Steps[i])
+			wf.UpdatedAt = time.Now()
+			e.save()
+			return nil
+		}
+	}
+
+	return fmt.Errorf("step not found: %s", stepID)
+}
+
+func (e *Engine) UpdateWorkflowStatus(workflowID string, status Status) error {
+	e.mu.Lock()
+	defer e.mu.Unlock()
+
+	wf, ok := e.workflows[workflowID]
+	if !ok {
+		return fmt.Errorf("workflow not found: %s", workflowID)
+	}
+
+	wf.Status = status
+	wf.UpdatedAt = time.Now()
+	return e.save()
+}
+
+func (e *Engine) Execute(ctx context.Context, workflowID string, onStep func(step *Step, event string)) error {
+	wf, ok := e.Get(workflowID)
+	if !ok {
+		return fmt.Errorf("workflow not found: %s", workflowID)
+	}
+
+	if err := e.UpdateWorkflowStatus(workflowID, StatusRunning); err != nil {
+		return err
+	}
+
+	stepStatuses := make(map[string]Status)
+	for _, step := range wf.Steps {
+		stepStatuses[step.ID] = StatusPending
+	}
+
+	resolveDeps := func(stepID string) bool {
+		step := wf.findStep(stepID)
+		if step == nil {
+			return false
+		}
+		for _, dep := range step.DependsOn {
+			if stepStatuses[dep] != StatusDone {
+				return false
+			}
+		}
+		return true
+	}
+
+	executeStep := func(step *Step) error {
+		now := time.Now()
+		e.UpdateStep(workflowID, step.ID, func(s *Step) {
+			s.Status = StatusRunning
+			s.StartedAt = &now
+		})
+
+		if onStep != nil {
+			onStep(step, "started")
+		}
+
+		var result string
+		var stepErr error
+
+		switch step.Type {
+		case TypeToolCall:
+			if step.Tool == "" {
+				stepErr = fmt.Errorf("tool not specified for step %s", step.ID)
+			} else {
+				call := agent.ToolCall{
+					ID:        step.ID,
+					Name:      step.Tool,
+					Arguments: step.Args,
+				}
+				resp, err := e.agentRegistry.Execute(ctx, call)
+				if err != nil {
+					stepErr = err
+				} else {
+					result = resp.Content
+					if resp.IsError {
+						stepErr = fmt.Errorf("%s", result)
+					}
+				}
+			}
+
+		case TypeApproval:
+			e.UpdateStep(workflowID, step.ID, func(s *Step) {
+				s.Status = StatusAwaiting
+			})
+			if onStep != nil {
+				onStep(step, "awaiting_approval")
+			}
+			return nil
+
+		case TypeCondition:
+			result = fmt.Sprintf("condition '%s' evaluated", step.Condition)
+
+		default:
+			stepErr = fmt.Errorf("unknown step type: %s", step.Type)
+		}
+
+		endTime := time.Now()
+		if stepErr != nil {
+			e.UpdateStep(workflowID, step.ID, func(s *Step) {
+				s.Status = StatusFailed
+				s.Error = stepErr.Error()
+				s.EndedAt = &endTime
+			})
+			if onStep != nil {
+				onStep(step, "failed")
+			}
+		} else {
+			e.UpdateStep(workflowID, step.ID, func(s *Step) {
+				s.Status = StatusDone
+				s.Result = result
+				s.EndedAt = &endTime
+			})
+			stepStatuses[step.ID] = StatusDone
+			if onStep != nil {
+				onStep(step, "done")
+			}
+		}
+
+		return stepErr
+	}
+
+	hasFailures := false
+
+	for _, step := range wf.Steps {
+		if step.Type == TypeParallel {
+			continue
+		}
+
+		for !resolveDeps(step.ID) {
+			time.Sleep(100 * time.Millisecond)
+		}
+
+		if err := executeStep(&step); err != nil {
+			hasFailures = true
+			break
+		}
+	}
+
+	if hasFailures {
+		e.UpdateWorkflowStatus(workflowID, StatusFailed)
+	} else {
+		e.UpdateWorkflowStatus(workflowID, StatusDone)
+	}
+
+	return nil
+}
+
+func (w *Workflow) findStep(id string) *Step {
+	for i := range w.Steps {
+		if w.Steps[i].ID == id {
+			return &w.Steps[i]
+		}
+	}
+	return nil
+}
+
+func (e *Engine) ApproveStep(workflowID, stepID string) error {
+	return e.UpdateStep(workflowID, stepID, func(s *Step) {
+		s.Status = StatusDone
+	})
+}
+
+func (e *Engine) SkipStep(workflowID, stepID string) error {
+	return e.UpdateStep(workflowID, stepID, func(s *Step) {
+		s.Status = StatusSkipped
+	})
+}

internal/workflow/planner.go

@@ -0,0 +1,172 @@
+package workflow
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/muyue/muyue/internal/config"
+	"github.com/muyue/muyue/internal/orchestrator"
+)
+
+type Planner struct {
+	orchestrator *orchestrator.Orchestrator
+}
+
+func NewPlanner(cfg *config.MuyueConfig) (*Planner, error) {
+	orb, err := orchestrator.New(cfg)
+	if err != nil {
+		return nil, err
+	}
+	orb.SetSystemPrompt(plannerSystemPrompt)
+	return &Planner{orchestrator: orb}, nil
+}
+
+func (p *Planner) GeneratePlan(ctx context.Context, goal string) ([]Step, error) {
+	prompt := buildPlanPrompt(goal)
+
+	messages := []orchestrator.Message{
+		{Role: "user", Content: prompt},
+	}
+
+	resp, err := p.orchestrator.SendWithTools(messages)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(resp.Choices) == 0 || resp.Choices[0].Message.Content == "" {
+		return nil, fmt.Errorf("no plan generated")
+	}
+
+	content := resp.Choices[0].Message.Content
+	plan, err := parsePlanResponse(content)
+	if err != nil {
+		return nil, err
+	}
+
+	return plan, nil
+}
+
+func buildPlanPrompt(goal string) string {
+	return fmt.Sprintf(`Tu es un planificateur de workflows pour Muyue. L'utilisateur veut accomplir la tâche suivante:
+
+"%s"
+
+Analyse cette tâche et génère un plan d'exécution en une série d'étapes. Chaque étape est un appel d'outil.
+
+Les outils disponibles sont:
+- terminal: Exécuter une commande shell
+- read_file: Lire un fichier
+- list_files: Lister les fichiers d'un répertoire
+- search_files: Rechercher des fichiers par pattern
+- grep_content: Rechercher du texte dans des fichiers
+- get_config: Lire la configuration Muyue
+- set_provider: Configurer un provider AI
+- manage_ssh: Gérer les connexions SSH
+- web_fetch: Récupérer le contenu d'une URL
+
+Réponds UNIQUEMENT avec un JSON valide représentant un tableau d'étapes, sans texte avant ou après:
+
+[
+  {"name": "Nom de l'étape", "tool": "terminal", "args": {"command": "ls -la"}},
+  {"name": "Lire le fichier config", "tool": "read_file", "args": {"path": "~/.muyue/config.json"}}
+]
+
+Règles:
+- Chaque étape doit avoir: name, tool, args
+- Les args varient selon le tool (voir les définitions)
+- Sois précis dans les commandes
+- Sépare en étapes logiques
+- Ne génère pas plus de 10 étapes`, goal)
+}
+
+func parsePlanResponse(content string) ([]Step, error) {
+	content = strings.TrimSpace(content)
+
+	var jsonStr string
+	if strings.HasPrefix(content, "```json") {
+		lines := strings.Split(content, "\n")
+		var jsonLines []string
+		for _, line := range lines[1:] {
+			if strings.HasPrefix(line, "```") {
+				break
+			}
+			jsonLines = append(jsonLines, line)
+		}
+		jsonStr = strings.Join(jsonLines, "\n")
+	} else if strings.HasPrefix(content, "```") {
+		lines := strings.Split(content, "\n")
+		var jsonLines []string
+		for _, line := range lines[1:] {
+			if strings.HasPrefix(line, "```") {
+				break
+			}
+			jsonLines = append(jsonLines, line)
+		}
+		jsonStr = strings.Join(jsonLines, "\n")
+	} else {
+		jsonStr = content
+	}
+
+	var rawSteps []map[string]interface{}
+	if err := json.Unmarshal([]byte(jsonStr), &rawSteps); err != nil {
+		return nil, fmt.Errorf("failed to parse plan JSON: %v\nContent: %s", err, content)
+	}
+
+	steps := make([]Step, 0, len(rawSteps))
+	for i, raw := range rawSteps {
+		step := Step{
+			ID:     fmt.Sprintf("step-%d", i),
+			Status: StatusPending,
+		}
+
+		if name, ok := raw["name"].(string); ok {
+			step.Name = name
+		} else {
+			step.Name = fmt.Sprintf("Step %d", i+1)
+		}
+
+		if tool, ok := raw["tool"].(string); ok {
+			step.Tool = tool
+			step.Type = TypeToolCall
+		}
+
+		if args, ok := raw["args"].(map[string]interface{}); ok {
+			argsJSON, err := json.Marshal(args)
+			if err == nil {
+				step.Args = argsJSON
+			}
+		}
+
+		if tool, ok := raw["type"].(string); ok {
+			switch tool {
+			case "approval":
+				step.Type = TypeApproval
+			case "condition":
+				step.Type = TypeCondition
+				if cond, ok := raw["condition"].(string); ok {
+					step.Condition = cond
+				}
+			default:
+				step.Type = TypeToolCall
+			}
+		}
+
+		steps = append(steps, step)
+	}
+
+	return steps, nil
+}
+
+const plannerSystemPrompt = `Tu es un assistant de planification de workflows pour Muyue. Tu génères des plans d'exécution sous forme de JSON. Chaque plan est une séquence d'étapes (steps) représentant des appels d'outils.
+
+Pour générer un plan:
+1. Comprends l'objectif de l'utilisateur
+2. Identifie les outils nécessaires
+3. Décompose en étapes logiques
+4. Spécifie les paramètres de chaque outil
+
+Réponds toujours en JSON valide, sans texte additionnel.`
+
+var _ = plannerSystemPrompt

web/src/api/client.js

@@ -22,12 +22,30 @@ const api = {
   getLSP: () => request('/lsp'),
   getMCP: () => request('/mcp'),
   getUpdates: () => request('/updates'),
+  getEditors: () => request('/editors'),
   runScan: () => request('/scan', { method: 'POST' }),
   installTools: (tools) => request('/install', { method: 'POST', body: JSON.stringify({ tools }) }),
   configureMCP: () => request('/mcp/configure', { method: 'POST' }),
+  configureMCPForEditor: (editor) => request('/mcp/configure', { method: 'POST', body: JSON.stringify({ editor }) }),
+  getMCPStatus: () => request('/mcp/status'),
+  getMCPRegistry: () => request('/mcp/registry'),
+  getLSPHealth: () => request('/lsp/health'),
+  autoInstallLSP: (projectDir) => request('/lsp/auto-install', { method: 'POST', body: JSON.stringify({ project_dir: projectDir || '' }) }),
+  generateLSPConfig: (editor, names) => request('/lsp/editor-config', { method: 'POST', body: JSON.stringify({ editor, names }) }),
+  validateSkill: (name) => request('/skills/validate', { method: 'POST', body: JSON.stringify({ name }) }),
+  testSkill: (name, sampleTask) => request('/skills/test', { method: 'POST', body: JSON.stringify({ name, sample_task: sampleTask || '' }) }),
+  exportSkill: (name) => request('/skills/export', { method: 'POST', body: JSON.stringify({ name }) }),
+  importSkill: (path) => request('/skills/import', { method: 'POST', body: JSON.stringify({ import_path: path }) }),
+  getDashboardStatus: () => request('/dashboard/status'),
+  getProvidersQuota: () => request('/providers/quota'),
+  getRecentCommands: () => request('/recent-commands'),
+  getRunningProcesses: () => request('/running-processes'),
+  getSystemMetrics: () => request('/system/metrics'),
   savePreferences: (prefs) => request('/preferences', { method: 'PUT', body: JSON.stringify(prefs) }),
   saveProfile: (profile) => request('/config/profile', { method: 'PUT', body: JSON.stringify(profile) }),
   saveProvider: (provider) => request('/config/provider', { method: 'PUT', body: JSON.stringify(provider) }),
+  resetConfig: () => request('/config/reset', { method: 'POST' }),
+  applyStarshipTheme: (theme) => request('/starship/apply-theme', { method: 'POST', body: JSON.stringify({ theme }) }),
   validateProvider: (provider) => request('/providers/validate', { method: 'POST', body: JSON.stringify(provider) }),
   runUpdate: (tool) => request('/update/run', { method: 'POST', body: JSON.stringify({ tool: tool || '' }) }),
   runCommand: (command, cwd) => request('/terminal', { method: 'POST', body: JSON.stringify({ command, cwd }) }),
@@ -38,7 +56,12 @@ const api = {
   saveTerminalSettings: (settings) => request('/terminal/settings', { method: 'PUT', body: JSON.stringify(settings) }),
   getChatHistory: () => request('/chat/history'),
   clearChat: () => request('/chat/clear', { method: 'POST' }),
-  sendChat: (message, stream = true, onChunk) => {
+  summarizeChat: () => request('/chat/summarize', { method: 'POST' }),
+  getShellChatHistory: () => request('/shell/chat/history'),
+  clearShellChat: () => request('/shell/chat/clear', { method: 'POST' }),
+  analyzeSystem: () => request('/shell/analyze', { method: 'POST' }),
+  getShellAnalysis: () => request('/shell/analysis'),
+  sendChat: (message, stream = true, onChunk, signal) => {
     if (!stream) {
       return request('/chat', { method: 'POST', body: JSON.stringify({ message, stream: false }) })
     }
@@ -47,6 +70,7 @@ const api = {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ message, stream: true }),
+        signal,
       }).then(async (res) => {
         if (!res.ok) {
           const err = await res.json().catch(() => ({ error: res.statusText }))
@@ -71,6 +95,8 @@ const api = {
                 if (onChunk) onChunk(full, data)
               } else if (data.thinking !== undefined || data.thinking_end) {
                 if (onChunk) onChunk(full, data)
+              } else if (data.tool_call || data.tool_result) {
+                if (onChunk) onChunk(full, data)
               }
             } catch {}
           }
@@ -79,6 +105,52 @@ const api = {
       }).catch(reject)
     })
   },
+  sendShellChat: (message, context = {}, stream = true, onChunk, signal) => {
+    const payload = {
+      message,
+      cwd: context.cwd || '',
+      platform: context.platform || '',
+      stream,
+    }
+    if (!stream) {
+      return request('/shell/chat', { method: 'POST', body: JSON.stringify(payload) })
+    }
+    return new Promise((resolve, reject) => {
+      fetch(`${API_BASE}/shell/chat`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+        signal,
+      }).then(async (res) => {
+        if (!res.ok) {
+          const err = await res.json().catch(() => ({ error: res.statusText }))
+          reject(new Error(err.error || res.statusText))
+          return
+        }
+        const reader = res.body.getReader()
+        const decoder = new TextDecoder()
+        let full = ''
+        while (true) {
+          const { done, value } = await reader.read()
+          if (done) break
+          const text = decoder.decode(value, { stream: true })
+          for (const line of text.split('\n')) {
+            if (!line.startsWith('data: ')) continue
+            try {
+              const data = JSON.parse(line.slice(6))
+              if (data.error) { reject(new Error(data.error)); return }
+              if (data.done) { resolve({ content: full, tokens: data.tokens }); return }
+              if (data.content) {
+                full = data.content
+                if (onChunk) onChunk(full, data)
+              }
+            } catch {}
+          }
+        }
+        resolve({ content: full })
+      }).catch(reject)
+    })
+  },
 }
 
 export default api

web/src/components/App.jsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback, useMemo } from 'react'
+import { useState, useEffect, useCallback, useMemo, useRef } from 'react'
 import { LayoutDashboard, Sparkles, Terminal, Settings } from 'lucide-react'
 import api from '../api/client'
 import { getTheme, applyTheme } from '../themes'
@@ -13,6 +13,9 @@ export default function App() {
   const [activeTab, setActiveTab] = useState('dash')
   const [info, setInfo] = useState({})
   const [clock, setClock] = useState(new Date())
+  const [isSudo, setIsSudo] = useState(false)
+  const [dashRefreshKey, setDashRefreshKey] = useState(0)
+  const dashRefreshRef = useRef(null)
   const [updates, setUpdates] = useState([])
   const [tools, setTools] = useState([])
   const [config, setConfig] = useState(null)
@@ -27,7 +30,7 @@ export default function App() {
   ], [t])
 
   useEffect(() => {
-    api.getInfo().then(setInfo).catch(() => {})
+    api.getInfo().then(d => { setInfo(d); setIsSudo(!!d.sudo) }).catch(() => {})
     api.getTools().then(d => setTools(d.tools || [])).catch(() => {})
     api.getUpdates().then(d => setUpdates(d.updates || [])).catch(() => {})
     api.getConfig().then(d => {
@@ -60,6 +63,11 @@ export default function App() {
       if (map[e.code]) {
         e.preventDefault()
         setActiveTab(map[e.code])
+        return
+      }
+      if (e.ctrlKey && e.code === 'KeyR') {
+        e.preventDefault()
+        if (dashRefreshRef.current) dashRefreshRef.current()
       }
     }
     window.addEventListener('keydown', onKey)
@@ -68,38 +76,28 @@ export default function App() {
 
   const switchTab = useCallback((tabId) => setActiveTab(tabId), [])
 
+  useEffect(() => {
+    const handler = () => setActiveTab('shell')
+    window.addEventListener('navigate-to-shell', handler)
+    return () => window.removeEventListener('navigate-to-shell', handler)
+  }, [])
+
   const hasUpdates = updates.some(u => u.needsUpdate)
   const installed = tools.filter(tool => tool.installed).length
 
   const WINDOW_SHORTCUTS = useMemo(() => ({
-    dash: [
-      { keys: `${layout.keys.ctrl}+${layout.keys.range}`, desc: t('statusbar.switchWindow') },
-    ],
+    dash: [],
     studio: [
       { keys: layout.keys.enter, desc: t('statusbar.sendMessage') },
       { keys: `${layout.keys.shift}+${layout.keys.enter}`, desc: t('statusbar.newLine') },
-      { keys: `${layout.keys.ctrl}+${layout.keys.range}`, desc: t('statusbar.switchWindow') },
     ],
     shell: [
       { keys: layout.keys.enter, desc: t('statusbar.runCommand') },
       { keys: `${layout.keys.up}/${layout.keys.down}`, desc: t('statusbar.commandHistory') },
-      { keys: `${layout.keys.ctrl}+${layout.keys.range}`, desc: t('statusbar.switchWindow') },
-    ],
-    config: [
-      { keys: `${layout.keys.ctrl}+${layout.keys.range}`, desc: t('statusbar.switchWindow') },
     ],
+    config: [],
   }), [layout, t])
 
-  const renderContent = () => {
-    switch (activeTab) {
-      case 'dash': return <Dashboard api={api} />
-      case 'studio': return <Studio api={api} />
-      case 'shell': return <Shell api={api} />
-      case 'config': return <Config api={api} />
-      default: return null
-    }
-  }
-
   return (
     <div className="app-layout">
       <header className="header">
@@ -141,12 +139,21 @@ export default function App() {
         </span>
       </header>
 
-      <main className="content fade-in" key={`${activeTab}-${TABS.length}`}>
-        {renderContent()}
+      <main className="content">
+        <div className={activeTab === 'dash' ? '' : 'tab-hidden'}><Dashboard api={api} refreshRef={dashRefreshRef} /></div>
+        <div className={activeTab === 'studio' ? '' : 'tab-hidden'}><Studio api={api} /></div>
+        <div className={activeTab === 'shell' ? '' : 'tab-hidden'}><Shell api={api} /></div>
+        <div className={activeTab === 'config' ? '' : 'tab-hidden'}><Config api={api} /></div>
       </main>
 
       <footer className="statusbar">
         <div className="statusbar-left">
+          {isSudo && <span className="statusbar-sudo">⚡ ROOT</span>}
+          {activeTab === 'dash' && (
+            <span className="statusbar-shortcut">
+              <kbd>{layout.keys.ctrl}+R</kbd> refresh
+            </span>
+          )}
           <FooterShortcuts shortcuts={WINDOW_SHORTCUTS[activeTab] || []} />
         </div>
         <div className="statusbar-right">

web/src/components/Config.jsx

@@ -1,14 +1,11 @@
 import { useState, useEffect, useCallback } from 'react'
-import { User, Brain, RefreshCw, Globe, Wrench, Monitor } from 'lucide-react'
-import { useI18n, LANGUAGES } from '../i18n'
-import { getLayoutList } from '../i18n/keyboards'
+import { User, Brain, RefreshCw, Wrench, Monitor, AlertTriangle } from 'lucide-react'
+import { useI18n } from '../i18n'
 
 const PANELS = [
   { id: 'profile', icon: User },
   { id: 'providers', icon: Brain },
-  { id: 'terminal', icon: Monitor },
   { id: 'updates', icon: RefreshCw },
-  { id: 'locale', icon: Globe },
   { id: 'skills', icon: Wrench },
   { id: 'system', icon: Monitor },
 ]
@@ -26,23 +23,14 @@ export default function Config({ api }) {
   const [editProfile, setEditProfile] = useState(false)
   const [editProvider, setEditProvider] = useState(null)
   const [profileForm, setProfileForm] = useState({})
-  const [providerForm, setProviderForm] = useState({})
+  const [providerForm, setProviderForm] = useState({}) // keyed by provider name
   const [toast, setToast] = useState(null)
 
 
-  const layouts = getLayoutList()
-
   const loadData = useCallback(() => {
     api.getConfig().then(d => {
       setConfig(d)
-      setProfileForm({
-        name: d.profile?.name || '',
-        pseudo: d.profile?.pseudo || '',
-        email: d.profile?.email || '',
-        editor: d.profile?.preferences?.editor || '',
-        shell: d.profile?.preferences?.shell || '',
-      })
-
+      setProfileForm(d.profile ? JSON.parse(JSON.stringify(d.profile)) : {})
     }).catch(() => {})
     api.getProviders().then(d => setProviders(d.providers || [])).catch(() => {})
     api.getSkills().then(d => setSkillList(d.skills || [])).catch(() => {})
@@ -73,28 +61,15 @@ export default function Config({ api }) {
     setChecking(false)
   }
 
-  const handleUpdateTool = async (tool) => {
-    setUpdating(tool)
-    try {
-      await api.runUpdate(tool)
-      await handleCheckUpdates()
-      showToast(`${tool} ✓`)
-    } catch (err) {
-      showToast(`${t('config.error')}: ${err.message}`)
-    }
-    setUpdating(null)
+  const handleUpdateTool = (tool) => {
+    window.dispatchEvent(new CustomEvent('navigate-to-shell', {}))
+    window.dispatchEvent(new CustomEvent('ask-ai-terminal', { detail: { message: `Met à jour l'outil ${tool} sur mon système. Exécute les commandes nécessaires.` } }))
   }
 
-  const handleUpdateAll = async () => {
-    setUpdating('__all__')
-    try {
-      await api.runUpdate('')
-      await handleCheckUpdates()
-      showToast(t('config.saved'))
-    } catch (err) {
-      showToast(`${t('config.error')}: ${err.message}`)
-    }
-    setUpdating(null)
+  const handleUpdateAll = () => {
+    const toUpdate = updates.filter(u => u.needsUpdate).map(u => u.tool)
+    window.dispatchEvent(new CustomEvent('navigate-to-shell', {}))
+    window.dispatchEvent(new CustomEvent('ask-ai-terminal', { detail: { message: `Met à jour tous les outils suivants sur mon système : ${toUpdate.join(', ')}. Exécute les commandes nécessaires une par une.` } }))
   }
 
   const handleSaveProfile = async () => {
@@ -108,9 +83,11 @@ export default function Config({ api }) {
     }
   }
 
-  const handleSaveProvider = async () => {
+  const handleSaveProvider = async (name) => {
+    const form = providerForm[name]
+    if (!form) return
     try {
-      await api.saveProvider(providerForm)
+      await api.saveProvider({ name, ...form })
       setEditProvider(null)
       loadData()
       showToast(t('config.saved'))
@@ -120,12 +97,15 @@ export default function Config({ api }) {
   }
 
   const openProviderEdit = (p) => {
-    setProviderForm({
-      name: p.name,
-      api_key: p.apiKey || '',
-      model: p.model || '',
-      base_url: p.baseURL || '',
-    })
+    setProviderForm(prev => ({
+      ...prev,
+      [p.name]: {
+        name: p.name,
+        api_key: p.apiKey || '',
+        model: p.model || '',
+        base_url: p.baseURL || '',
+      },
+    }))
     setEditProvider(p.name)
   }
 
@@ -184,13 +164,6 @@ export default function Config({ api }) {
               t={t}
             />
           )}
-          {activePanel === 'locale' && (
-            <PanelLocale
-              language={keyboard} layouts={layouts}
-              setLanguage={setLanguage} setKeyboard={setKeyboard}
-              t={t}
-            />
-          )}
           {activePanel === 'skills' && (
             <PanelSkills skillList={skillList} t={t} />
           )}
@@ -205,93 +178,188 @@ export default function Config({ api }) {
 }
 
 function PanelProfile({ config, editProfile, profileForm, setProfileForm, setEditProfile, handleSaveProfile, t }) {
+  const updateField = (path, value) => {
+    setProfileForm(prev => {
+      const next = JSON.parse(JSON.stringify(prev))
+      const keys = path.split('.')
+      let target = next
+      for (let i = 0; i < keys.length - 1; i++) {
+        if (target[keys[i]] == null) target[keys[i]] = {}
+        target = target[keys[i]]
+      }
+      target[keys[keys.length - 1]] = value
+      return next
+    })
+  }
+
+  const profile = editProfile ? profileForm : config?.profile
+
+  if (!profile) {
+    return (
+      <div className="config-profile-center">
+        <div className="config-card">
+          <div className="empty-state">{t('config.loadingProfile')}</div>
+        </div>
+      </div>
+    )
+  }
+
+  const personalKeys = Object.entries(profile).filter(([k, v]) => k !== 'preferences' && typeof v !== 'object')
+  const personalObj = Object.fromEntries(personalKeys)
+  const preferences = profile.preferences || null
+
   return (
-    <div className="config-card">
-      {config?.profile && !editProfile ? (
-        <>
-          <div className="config-card-row">
-            <span className="config-card-label">{t('config.name')}</span>
-            <span className="config-card-value">{config.profile.name || '—'}</span>
-          </div>
-          <div className="config-card-row">
-            <span className="config-card-label">{t('config.pseudo')}</span>
-            <span className="config-card-value">{config.profile.pseudo || '—'}</span>
-          </div>
-          <div className="config-card-row">
-            <span className="config-card-label">{t('config.email')}</span>
-            <span className="config-card-value">{config.profile.email || '—'}</span>
-          </div>
-          <div className="config-card-row">
-            <span className="config-card-label">{t('config.editor')}</span>
-            <span className="config-card-value mono">{config.profile.preferences?.editor || '—'}</span>
-          </div>
-          <div className="config-card-row">
-            <span className="config-card-label">{t('config.shell')}</span>
-            <span className="config-card-value mono">{config.profile.preferences?.shell || '—'}</span>
-          </div>
-          <div className="config-card-row">
-            <span className="config-card-label">{t('config.languages')}</span>
-            <span className="config-card-value">{config.profile.languages?.join(', ') || '—'}</span>
-          </div>
-          <div className="config-card-actions">
-            <button className="primary sm" onClick={() => setEditProfile(true)}>{t('config.editProfile')}</button>
-          </div>
-        </>
-      ) : editProfile ? (
-        <>
-          <FormInput label={t('config.name')} value={profileForm.name} onChange={v => setProfileForm(p => ({ ...p, name: v }))} />
-          <FormInput label={t('config.pseudo')} value={profileForm.pseudo} onChange={v => setProfileForm(p => ({ ...p, pseudo: v }))} />
-          <FormInput label={t('config.email')} value={profileForm.email} onChange={v => setProfileForm(p => ({ ...p, email: v }))} type="email" />
-          <FormInput label={t('config.editor')} value={profileForm.editor} onChange={v => setProfileForm(p => ({ ...p, editor: v }))} />
-          <FormInput label={t('config.shell')} value={profileForm.shell} onChange={v => setProfileForm(p => ({ ...p, shell: v }))} />
-          <div className="config-card-actions">
-            <button className="primary sm" onClick={handleSaveProfile}>{t('config.save')}</button>
-            <button className="ghost sm" onClick={() => setEditProfile(false)}>{t('config.cancel')}</button>
-          </div>
-        </>
-      ) : (
-        <div className="empty-state">{t('config.loadingProfile')}</div>
-      )}
+    <div className="config-profile-center">
+      <div className="config-card">
+        <div className="section-title">{t('config.profileInfo') || 'Informations personnelles'}</div>
+        <RenderFields obj={personalObj} path="" editing={editProfile} onChange={updateField} t={t} />
+      </div>
+      <div className="config-card">
+        <div className="section-title">{t('config.profilePrefs') || 'Préférences'}</div>
+        {preferences ? (
+          <RenderFields obj={preferences} path="preferences" editing={editProfile} onChange={updateField} t={t} />
+        ) : (
+          <div className="config-card-row"><span className="config-card-value" style={{ color: 'var(--text-disabled)' }}>—</span></div>
+        )}
+      </div>
+      <div className="config-card">
+        <div className="config-card-actions" style={{ justifyContent: 'center' }}>
+          {editProfile ? (
+            <>
+              <button className="primary sm" onClick={handleSaveProfile}>{t('config.save')}</button>
+              <button className="ghost sm" onClick={() => setEditProfile(false)}>{t('config.cancel')}</button>
+            </>
+          ) : (
+            <button className="primary sm" onClick={() => {
+              setProfileForm(config.profile ? JSON.parse(JSON.stringify(config.profile)) : {})
+              setEditProfile(true)
+            }}>{t('config.editProfile')}</button>
+          )}
+        </div>
+      </div>
     </div>
   )
 }
 
+function RenderFields({ obj, path, editing, onChange, t }) {
+  if (!obj || typeof obj !== 'object') return null
+
+  return Object.entries(obj).filter(([, v]) => v === null || typeof v !== 'object').map(([key, value]) => {
+    const fieldPath = path ? `${path}.${key}` : key
+    const label = getFieldLabel(key, t)
+
+    if (editing) {
+      if (typeof value === 'boolean') {
+        return (
+          <div key={key} className="config-card-row">
+            <span className="config-card-label">{label}</span>
+            <label style={{ display: 'flex', alignItems: 'center', gap: 8, cursor: 'pointer' }}>
+              <input type="checkbox" checked={value} onChange={e => onChange(fieldPath, e.target.checked)} />
+              <span style={{ fontSize: 12, color: 'var(--text-tertiary)' }}>{value ? 'On' : 'Off'}</span>
+            </label>
+          </div>
+        )
+      }
+      if (Array.isArray(value)) {
+        return (
+          <div key={key} className="config-form-field">
+            <label className="config-form-label">{label}</label>
+            <input className="config-form-input" value={value.join(', ')} onChange={e => onChange(fieldPath, e.target.value.split(',').map(s => s.trim()).filter(Boolean))} />
+          </div>
+        )
+      }
+      return (
+        <div key={key} className="config-form-field">
+          <label className="config-form-label">{label}</label>
+          <input className="config-form-input" type={typeof value === 'number' ? 'number' : 'text'} value={value ?? ''} onChange={e => onChange(fieldPath, typeof value === 'number' ? Number(e.target.value) : e.target.value)} />
+        </div>
+      )
+    }
+
+    if (typeof value === 'boolean') {
+      return (
+        <div key={key} className="config-card-row">
+          <span className="config-card-label">{label}</span>
+          <span className="config-card-value">{value ? 'On' : 'Off'}</span>
+        </div>
+      )
+    }
+    if (Array.isArray(value)) {
+      return (
+        <div key={key} className="config-card-row">
+          <span className="config-card-label">{label}</span>
+          <span className="config-card-value">{value.length > 0 ? value.join(', ') : '—'}</span>
+        </div>
+      )
+    }
+    return (
+      <div key={key} className="config-card-row">
+        <span className="config-card-label">{label}</span>
+        <span className="config-card-value">{value != null && value !== '' ? String(value) : '—'}</span>
+      </div>
+    )
+  })
+}
+
+function getFieldLabel(key, t) {
+  const translated = t(`config.${key}`)
+  if (translated !== `config.${key}`) return translated
+  return key.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase())
+}
+
 function PanelProviders({ providers, editProvider, providerForm, setProviderForm, setEditProvider, openProviderEdit, handleSaveProvider, api, loadData, t }) {
   const [validating, setValidating] = useState(null)
-  const [validationStatus, setValidationStatus] = useState(null)
+  const [keyStatus, setKeyStatus] = useState({})
 
-  const handleValidate = async (name, apiKey, model, baseUrl) => {
-    setValidating(name)
-    setValidationStatus(null)
+  const validateKey = async (p) => {
+    setValidating(p.name)
     try {
-      await api.validateProvider({ name, api_key: apiKey, model, base_url: baseUrl })
-      setValidationStatus({ provider: name, valid: true })
+      await api.validateProvider({ name: p.name, api_key: p.apiKey, model: p.model, base_url: p.baseURL || '' })
+      setKeyStatus(prev => ({ ...prev, [p.name]: { valid: true, checked: true } }))
     } catch (err) {
-      const msg = err.message || ''
-      if (msg.includes('invalid_api_key')) {
-        setValidationStatus({ provider: name, valid: false, error: t('config.keyInvalid') })
-      } else {
-        setValidationStatus({ provider: name, valid: false, error: `${t('config.connectionFailed')}: ${msg}` })
-      }
+      setKeyStatus(prev => ({ ...prev, [p.name]: { valid: false, checked: true, error: err.message || 'Clé invalide' } }))
     }
     setValidating(null)
   }
 
+  useEffect(() => {
+    providers.forEach(p => {
+      if (p.apiKey && !keyStatus[p.name]) {
+        validateKey(p)
+      } else if (!p.apiKey) {
+        setKeyStatus(prev => ({ ...prev, [p.name]: { valid: false, checked: true, error: 'Aucune clé' } }))
+      }
+    })
+  }, [providers])
+
+  const handleValidate = async (name, apiKey, model, baseUrl) => {
+    setValidating(name)
+    try {
+      await api.validateProvider({ name, api_key: apiKey, model, base_url: baseUrl })
+      setKeyStatus(prev => ({ ...prev, [name]: { valid: true, checked: true } }))
+    } catch (err) {
+      setKeyStatus(prev => ({ ...prev, [name]: { valid: false, checked: true, error: err.message || 'Clé invalide' } }))
+    }
+    setValidating(null)
+  }
+
+  const displayed = providers.filter(p => p.name === 'minimax' || p.name === 'zai')
+
   return (
     <div className="config-providers-list">
-      <div className="provider-setup-hint">{t('config.setupDescription')}</div>
-      {providers.map((p, i) => {
+      {displayed.map((p, i) => {
         const isEditing = editProvider === p.name
-        const isValidationTarget = validationStatus?.provider === p.name
+        const currentModel = providerForm[p.name]?.model || p.model
+        const status = keyStatus[p.name]
+
         return (
           <div key={i} className="config-card provider-card-v2">
             <div className="provider-card-top">
               <div className="provider-card-identity">
-                <span className="provider-card-name">{p.name}</span>
-                {p.apiKey && <span className="badge ok">{t('config.keyConfigured')}</span>}
-                {!p.apiKey && <span className="badge error">{t('config.noKey')}</span>}
-                {isValidationTarget && validationStatus?.valid && <span className="badge ok">{t('config.keyValid')}</span>}
-                {isValidationTarget && !validationStatus?.valid && <span className="badge error">{validationStatus?.error}</span>}
+                <span className="provider-card-name">{p.name.toUpperCase()}</span>
+                {p.active && <span className="badge ok" style={{ marginLeft: 6 }}>active</span>}
+                {status?.checked && status?.valid && <span className="badge ok">✓ {t('config.keyValid')}</span>}
+                {status?.checked && !status?.valid && <span className="badge error">✗ {status.error || t('config.keyInvalid')}</span>}
               </div>
             </div>
 
@@ -302,29 +370,33 @@ function PanelProviders({ providers, editProvider, providerForm, setProviderForm
                   <input
                     className="config-form-input"
                     type="password"
-                    placeholder={t('config.tokenPlaceholder')}
-                    value={isEditing ? providerForm.api_key : ''}
+                    placeholder={p.apiKey ? '••••••••' : t('config.tokenPlaceholder')}
+                    value={isEditing ? (providerForm[p.name]?.api_key || '') : ''}
                     onChange={e => {
                       if (!isEditing) openProviderEdit(p)
-                      setProviderForm(f => ({ ...f, api_key: e.target.value }))
+                      setProviderForm(prev => ({
+                        ...prev,
+                        [p.name]: { ...(prev[p.name] || {}), api_key: e.target.value },
+                      }))
                     }}
                   />
                 </div>
                 <div className="provider-setup-token-actions">
                   <button
                     className="sm primary"
-                    disabled={validating === p.name || !providerForm.api_key}
-                    onClick={() => handleValidate(p.name, providerForm.api_key, providerForm.model, providerForm.base_url)}
+                    disabled={validating === p.name || !providerForm[p.name]?.api_key}
+                    onClick={() => handleValidate(p.name, providerForm[p.name]?.api_key, currentModel, providerForm[p.name]?.base_url)}
                   >
                     {validating === p.name ? t('config.validating') : t('config.validateKey')}
                   </button>
-                  {isValidationTarget && validationStatus?.valid && (
-                    <button className="sm" onClick={handleSaveProvider}>{t('config.save')}</button>
+                  {isEditing && (
+                    <button className="sm" onClick={() => handleSaveProvider(p.name)}>{t('config.save')}</button>
                   )}
                 </div>
               </div>
-              <div className="provider-card-meta" style={{ marginTop: 8 }}>
-                <span className="mono">{p.model || '—'}</span>
+              <div className="provider-card-model">
+                <span className="provider-card-model-label">{t('config.model')}</span>
+                <span className="provider-card-model-value">{p.model || '—'}</span>
               </div>
             </div>
           </div>
@@ -334,7 +406,14 @@ function PanelProviders({ providers, editProvider, providerForm, setProviderForm
   )
 }
 
-function PanelUpdates({ updates, checking, updating, needsUpdateCount, installedCount, missingCount, handleCheckUpdates, handleUpdateTool, handleUpdateAll, t }) {
+function PanelUpdates({ updates, tools, checking, updating, needsUpdateCount, installedCount, missingCount, handleCheckUpdates, handleUpdateTool, handleUpdateAll, t }) {
+  const handleInstallTool = (tool) => {
+    window.dispatchEvent(new CustomEvent('navigate-to-shell', {}))
+    window.dispatchEvent(new CustomEvent('ask-ai-terminal', { detail: { message: `Installe l'outil ${tool} sur mon système. Vérifie d'abord s'il est déjà installé, puis installe-le si nécessaire avec les commandes appropriées.` } }))
+  }
+
+  const missingTools = tools.filter(tool => !tool.installed)
+
   return (
     <>
       <div className="config-card">
@@ -357,6 +436,30 @@ function PanelUpdates({ updates, checking, updating, needsUpdateCount, installed
         </div>
       </div>
 
+      {missingTools.length > 0 && (
+        <>
+          <div className="section-title" style={{ marginTop: 12, marginBottom: 4 }}>{t('config.missing') || 'Modules manquants'}</div>
+          <div className="config-update-list">
+            {missingTools.map((tool, i) => (
+              <div key={`miss-${i}`} className="config-update-row">
+                <div className="config-update-info">
+                  <span className="config-update-name">{tool.name}</span>
+                  <span className="config-update-versions">
+                    <span style={{ color: 'var(--danger)' }}>{t('config.notInstalled') || 'Non installé'}</span>
+                  </span>
+                </div>
+                <button
+                  className="sm primary"
+                  onClick={() => handleInstallTool(tool.name)}
+                >
+                  {t('config.install') || 'Installer'}
+                </button>
+              </div>
+            ))}
+          </div>
+        </>
+      )}
+
       {updates.length === 0 ? (
         <div className="config-card">
           <div className="empty-state">{t('config.noUpdates')}</div>
@@ -392,64 +495,90 @@ function PanelUpdates({ updates, checking, updating, needsUpdateCount, installed
   )
 }
 
-function PanelLocale({ language, keyboard, layouts, setLanguage, setKeyboard, t }) {
-  return (
-    <div className="config-card">
-      <div className="config-card-group">
-        <span className="config-card-group-label">{t('config.language')}</span>
-        <div className="chip-row">
-          {LANGUAGES.map(lang => (
-            <div
-              key={lang.id}
-              className={`chip ${language === lang.id ? 'active' : ''}`}
-              onClick={() => setLanguage(lang.id)}
-            >
-              {lang.name}
-            </div>
-          ))}
-        </div>
-      </div>
-      <div className="config-card-group">
-        <span className="config-card-group-label">{t('config.keyboardLayout')}</span>
-        <div className="chip-row">
-          {layouts.map(l => (
-            <div
-              key={l.id}
-              className={`chip ${keyboard === l.id ? 'active' : ''}`}
-              onClick={() => setKeyboard(l.id)}
-            >
-              {l.name}
-            </div>
-          ))}
-        </div>
-      </div>
-    </div>
-  )
-}
+
 
 function PanelSkills({ skillList, t }) {
+  const [selected, setSelected] = useState(null)
+
+  if (skillList.length === 0) {
+    return <div className="empty-state" style={{ color: 'var(--text-disabled)', padding: 40 }}>{t('config.noSkills')}</div>
+  }
+
   return (
-    <div className="config-card">
-      {skillList.length === 0 ? (
-        <div className="empty-state">
-          {t('config.noSkills')}
-          <span style={{ fontFamily: 'var(--font-mono)' }}>{t('config.runSkillsInit')}</span>
-        </div>
-      ) : (
-        skillList.map((s, i) => (
-          <div key={i} className="config-skill-row">
-            <span className="config-skill-name">{s.name}</span>
-            <span className="badge neutral">{s.target || 'both'}</span>
-            <span className="config-skill-desc">{s.description}</span>
+    <>
+      <div className="skill-tiles">
+        {skillList.map((s, i) => (
+          <div key={i} className="skill-tile" onClick={() => setSelected(s)}>
+            <div className="skill-tile-name">{s.name}</div>
+            <div className="skill-tile-desc">{s.description}</div>
+            <div className="skill-tile-tags">
+              {s.target && <span className="badge neutral">{s.target}</span>}
+              {s.version && <span className="badge">{s.version}</span>}
+              {s.category && <span className="badge" style={{ opacity: 0.7 }}>{s.category}</span>}
+            </div>
           </div>
-        ))
+        ))}
+      </div>
+      {selected && (
+        <div className="skill-detail-overlay" onClick={() => setSelected(null)}>
+          <div className="skill-detail-panel" onClick={e => e.stopPropagation()}>
+            <div className="skill-detail-header">
+              <span className="skill-detail-name">{selected.name}</span>
+              <button className="ghost sm" onClick={() => setSelected(null)}>✕</button>
+            </div>
+            <div className="skill-detail-body">
+              <div className="skill-detail-section">
+                <div className="skill-detail-label">Description</div>
+                <div style={{ fontSize: 13, color: 'var(--text-secondary)' }}>{selected.description}</div>
+              </div>
+              <div className="skill-detail-section">
+                <div className="skill-detail-label">Métadonnées</div>
+                <div className="skill-detail-meta">
+                  {selected.target && <span className="badge neutral">{selected.target}</span>}
+                  {selected.version && <span className="badge">{selected.version}</span>}
+                  {selected.category && <span className="badge">{selected.category}</span>}
+                  {selected.author && <span className="badge ghost">{selected.author}</span>}
+                  {selected.languages && selected.languages.map(l => <span key={l} className="badge ghost">{l}</span>)}
+                </div>
+              </div>
+              {selected.tags && selected.tags.length > 0 && (
+                <div className="skill-detail-section">
+                  <div className="skill-detail-label">Tags</div>
+                  <div className="chip-row">
+                    {selected.tags.map(tag => <span key={tag} className="badge">{tag}</span>)}
+                  </div>
+                </div>
+              )}
+              {selected.content && (
+                <div className="skill-detail-section">
+                  <div className="skill-detail-label">Contenu</div>
+                  <div className="skill-detail-content">{selected.content}</div>
+                </div>
+              )}
+              {selected.dependencies && selected.dependencies.length > 0 && (
+                <div className="skill-detail-section">
+                  <div className="skill-detail-label">Dépendances</div>
+                  <div className="skill-detail-deps">
+                    {selected.dependencies.map((d, i) => (
+                      <div key={i} className="skill-detail-dep">
+                        <span className="badge">{d.type}</span>
+                        <span>{d.name}</span>
+                        {d.required === false && <span style={{ fontSize: 11, color: 'var(--text-disabled)' }}>optionnel</span>}
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
       )}
-    </div>
+    </>
   )
 }
 
 function PanelSystem({ api, t }) {
-  const [resetConfirm, setResetConfirm] = useState(false)
+  const [showResetModal, setShowResetModal] = useState(false)
   const [toast, setToast] = useState(null)
 
   const showToast = (msg) => {
@@ -460,7 +589,7 @@ function PanelSystem({ api, t }) {
   const handleReset = async () => {
     try {
       await api.resetConfig()
-      setResetConfirm(false)
+      setShowResetModal(false)
       showToast(t('config.resetDone'))
       setTimeout(() => window.location.reload(), 1500)
     } catch (err) {
@@ -468,49 +597,66 @@ function PanelSystem({ api, t }) {
     }
   }
 
-  const handleApplyStarship = async () => {
-    try {
-      await api.applyStarshipTheme('charm')
-      showToast(t('config.starshipApplied'))
-    } catch (err) {
-      showToast(`${t('config.error')}: ${err.message}`)
-    }
+  const handleApplyStarship = () => {
+    window.dispatchEvent(new CustomEvent('navigate-to-shell', {}))
+    window.dispatchEvent(new CustomEvent('ask-ai-terminal', { detail: { message: `Vérifie si starship est installé sur le système. S'il ne l'est pas, installe-le (avec curl ou le gestionnaire de paquets). Ensuite, applique la configuration du thème "charm" pour starship. Assure-toi que starship est bien initialisé dans le shell de l'utilisateur.` } }))
   }
 
   return (
     <>
       {toast && <div className="config-toast">{toast}</div>}
+
+      <div className="section-title" style={{ marginBottom: 8 }}>Configuration Système</div>
       <div className="config-card">
         <div className="config-card-row" style={{ marginBottom: 16 }}>
           <span className="config-card-label" style={{ fontWeight: 600 }}>{t('config.applyStarship')}</span>
         </div>
-        <div style={{ fontSize: 12, color: 'var(--muted)', marginBottom: 12 }}>
-          {t('config.starshipApplied')}
+        <div style={{ fontSize: 12, color: 'var(--text-tertiary)', marginBottom: 12 }}>
+          Vérifie l'installation de starship et configure le thème charm via l'IA.
         </div>
         <button className="sm primary" onClick={handleApplyStarship}>
           {t('config.applyStarship')}
         </button>
       </div>
-      <div className="config-card" style={{ marginTop: 12 }}>
+
+      <div className="section-title" style={{ marginTop: 20, marginBottom: 8, color: 'var(--danger)' }}>
+        <AlertTriangle size={14} style={{ verticalAlign: 'middle', marginRight: 6 }} />
+        Zone Rouge
+      </div>
+      <div className="config-card" style={{ borderColor: 'var(--danger)', borderWidth: 1, borderStyle: 'solid' }}>
         <div className="config-card-row" style={{ marginBottom: 16 }}>
-          <span className="config-card-label" style={{ fontWeight: 600 }}>{t('config.resetConfig')}</span>
+          <span className="config-card-label" style={{ fontWeight: 600, color: 'var(--danger)' }}>{t('config.resetConfig')}</span>
         </div>
-        {resetConfirm ? (
-          <div>
-            <div style={{ fontSize: 12, color: 'var(--warning)', marginBottom: 12 }}>
-              {t('config.resetConfirm')}
+        <div style={{ fontSize: 12, color: 'var(--text-tertiary)', marginBottom: 12 }}>
+          Cette action supprimera toute votre configuration et relancera l'application.
+        </div>
+        <button className="sm ghost danger" onClick={() => setShowResetModal(true)}>
+          {t('config.resetConfig')}
+        </button>
+      </div>
+
+      {showResetModal && (
+        <div className="shell-modal-overlay" onClick={() => setShowResetModal(false)}>
+          <div className="shell-modal" onClick={e => e.stopPropagation()}>
+            <div className="shell-modal-header" style={{ color: 'var(--danger)' }}>
+              <AlertTriangle size={16} style={{ verticalAlign: 'middle', marginRight: 8 }} />
+              {t('config.resetConfig')}
             </div>
-            <div style={{ display: 'flex', gap: 8 }}>
-              <button className="sm" onClick={() => setResetConfirm(false)}>{t('config.cancel')}</button>
-              <button className="sm danger" onClick={handleReset}>{t('config.resetConfig')}</button>
+            <div className="shell-modal-body">
+              <p style={{ color: 'var(--warning)', fontSize: 13, marginBottom: 12 }}>
+                {t('config.resetConfirm')}
+              </p>
+              <p style={{ color: 'var(--text-tertiary)', fontSize: 12 }}>
+                Cette action est irréversible. Toute votre configuration (profil, clés API, préférences) sera supprimée.
+              </p>
+            </div>
+            <div className="shell-modal-footer">
+              <button className="ghost" onClick={() => setShowResetModal(false)}>{t('config.cancel')}</button>
+              <button className="danger" onClick={handleReset}>{t('config.resetConfig')}</button>
             </div>
           </div>
-        ) : (
-          <button className="sm ghost danger" onClick={() => setResetConfirm(true)}>
-            {t('config.resetConfig')}
-          </button>
-        )}
-      </div>
+        </div>
+      )}
     </>
   )
 }

web/src/components/Dashboard.jsx

@@ -1,56 +1,258 @@
-import { useState } from 'react'
+import { useState, useEffect, useCallback, useRef } from 'react'
 import { useI18n } from '../i18n'
 
-export default function Dashboard({ api }) {
+const MAX_POINTS = 30
+
+const POLL_INTERVAL = 5000
+const MAX_IDLE_POLLS = 3
+
+function MiniGraph({ data, max, color, label, unit }) {
+  if (!data || data.length < 2) return <div className="dash-graph-empty">collecting...</div>
+  const m = max || Math.max(...data, 1)
+  const w = 100
+  const h = 32
+  const points = data.map((v, i) => {
+    const x = (i / (data.length - 1)) * w
+    const y = h - (v / m) * h
+    return `${x},${y}`
+  }).join(' ')
+  const last = data[data.length - 1]
+  return (
+    <div className="dash-graph-wrap">
+      <div className="dash-graph-header">
+        <span className="dash-graph-label">{label}</span>
+        <span className="dash-graph-value" style={{ color }}>{last.toFixed(1)}{unit}</span>
+      </div>
+      <svg viewBox={`0 0 ${w} ${h}`} className="dash-graph-svg" preserveAspectRatio="none">
+        <defs>
+          <linearGradient id={`fg-${color.replace('#','').replace('var(','').replace(')','')}`} x1="0" y1="0" x2="0" y2="1">
+            <stop offset="0%" stopColor={color} stopOpacity="0.3" />
+            <stop offset="100%" stopColor={color} stopOpacity="0.02" />
+          </linearGradient>
+        </defs>
+        <polygon fill={`url(#fg-${color.replace('#','').replace('var(','').replace(')','')})`} points={`${points} ${w},${h} 0,${h}`} />
+        <polyline fill="none" stroke={color} strokeWidth="1.5" points={points} vectorEffect="non-scaling-stroke" />
+      </svg>
+    </div>
+  )
+}
+
+export default function Dashboard({ api, refreshRef }) {
   const { t } = useI18n()
-  const [notifications, setNotifications] = useState([])
+  const [quota, setQuota] = useState(null)
+  const [recentCmds, setRecentCmds] = useState([])
+  const [processes, setProcesses] = useState([])
+  const [metrics, setMetrics] = useState(null)
+  const [copiedSet, setCopiedSet] = useState(new Set())
+  const cpuRef = useRef([])
+  const memRef = useRef([])
+  const netRxRef = useRef([])
+  const netTxRef = useRef([])
+
+  const loadData = useCallback(async () => {
+    try {
+      const [quotaData, cmdData, procData, metricsData] = await Promise.all([
+        api.getProvidersQuota().catch(() => null),
+        api.getRecentCommands().catch(() => ({ commands: [] })),
+        api.getRunningProcesses().catch(() => ({ processes: [] })),
+        api.getSystemMetrics().catch(() => null),
+      ])
+      setQuota(quotaData?.providers || [])
+      setRecentCmds(cmdData.commands || [])
+      setProcesses(procData.processes || [])
+      if (metricsData) {
+        setMetrics(metricsData)
+        cpuRef.current = [...cpuRef.current, metricsData.cpu_percent].slice(-MAX_POINTS)
+        memRef.current = [...memRef.current, metricsData.mem_percent].slice(-MAX_POINTS)
+        netRxRef.current = [...netRxRef.current, metricsData.net_rx_kbs].slice(-MAX_POINTS)
+        netTxRef.current = [...netTxRef.current, metricsData.net_tx_kbs].slice(-MAX_POINTS)
+      }
+    } catch (err) {
+      console.error('Dashboard load error:', err)
+    }
+  }, [api])
+
+  useEffect(() => {
+    loadData()
+    if (refreshRef) refreshRef.current = loadData
+    let active = true
+    let idleTicks = 0
+    const iv = setInterval(() => {
+      const hidden = document.querySelector('.dash-grid')?.closest('.tab-hidden')
+      if (hidden) {
+        idleTicks++
+        if (idleTicks >= MAX_IDLE_POLLS) return
+      } else {
+        idleTicks = 0
+      }
+      if (active) loadData()
+    }, POLL_INTERVAL)
+    return () => { active = false; clearInterval(iv) }
+  }, [loadData, refreshRef])
+
+  const minimax = (quota || []).find(p => p.name === 'minimax')
+  const zai = (quota || []).find(p => p.name === 'zai')
+
+  const EXCLUDE_CMDS = ['ls', 'cd', 'pwd', 'clear', 'exit', 'history', 'cat', 'echo', 'grep', 'export', 'alias', 'unalias', 'set', 'unset', 'source', '.', 'fg', 'bg', 'jobs', 'wait', 'true', 'false', 'yes', 'sleep', 'date', 'whoami', 'id', 'uname', 'hostname', 'uptime', 'df', 'free', 'top', 'htop', 'nano', 'vi', 'vim', 'less', 'more', 'tail', 'head', 'man', 'info', 'which', 'whereis', 'type', 'command', 'hash', 'builtin', 'help']
+
+  const topCmds = (() => {
+    const counts = {}
+    for (const c of recentCmds) {
+      const base = c.cmd.split(/\s+/)[0]
+      if (!base || base.length < 2 || EXCLUDE_CMDS.includes(base)) continue
+      if (!/^[a-zA-Z@.\/]/.test(base)) continue
+      counts[base] = (counts[base] || 0) + 1
+    }
+    return Object.entries(counts)
+      .sort((a, b) => b[1] - a[1])
+      .slice(0, 5)
+      .map(([cmd, count]) => ({ cmd, count }))
+  })()
+
+  const maxCount = topCmds.length > 0 ? topCmds[0].count : 1
+
+  const copyCmd = (cmd, key) => {
+    navigator.clipboard.writeText(cmd)
+    setCopiedSet(prev => new Set(prev).add(key))
+    setTimeout(() => setCopiedSet(prev => { const next = new Set(prev); next.delete(key); return next }), 1500)
+  }
+
+  const relativeTime = (ts) => {
+    if (!ts) return ''
+    const diff = Math.floor((Date.now() - new Date(ts).getTime()) / 1000)
+    if (diff < 60) return `${diff}s`
+    if (diff < 3600) return `${Math.floor(diff / 60)}m`
+    if (diff < 86400) return `${Math.floor(diff / 3600)}h`
+    return `${Math.floor(diff / 86400)}d`
+  }
+
+  const recentUnique = (() => {
+    const seen = new Set()
+    return recentCmds.filter(c => {
+      if (seen.has(c.cmd)) return false
+      seen.add(c.cmd)
+      return true
+    })
+  })()
 
   return (
-    <div className="dashboard-layout">
-      <div className="dashboard-content">
-        <div className="dashboard-grid">
-          <div className="dashboard-section">
-            <div className="dashboard-section-header">
-              <div className="dashboard-section-title">{t('studio.workflows')}</div>
-            </div>
-            <div className="dashboard-workflows-inline">
-              <div className="workflow-section">
-                <div className="section-label">{t('studio.workflows')}</div>
-                <div className="empty-state" style={{ padding: 20 }}>
-                  {t('studio.noWorkflow')}
-                </div>
-              </div>
-              <div className="workflow-section">
-                <div className="section-label">{t('studio.activeAgents')}</div>
-                <div className="empty-state" style={{ padding: 20 }}>
-                  {t('studio.noWorkflow')}
-                </div>
-              </div>
-            </div>
-          </div>
+    <div className="dash-grid">
+      {/* CPU */}
+      <div className="dash-card">
+        <div className="dash-card-head">
+          <span className="dash-label">CPU</span>
+          <span className="dash-count">{metrics ? metrics.cpu_percent.toFixed(0) : '—'}%</span>
+        </div>
+        <MiniGraph data={cpuRef.current} max={100} color="var(--accent)" label="CPU" unit="%" />
+      </div>
 
-          <div className="dashboard-section">
-            <div className="dashboard-section-header">
-              <div className="dashboard-section-title">{t('dashboard.activityLog')}</div>
-              {notifications.length > 0 && (
-                <span className="badge warn">{notifications.length}</span>
-              )}
-            </div>
-            {notifications.length === 0 ? (
-              <div className="empty-state">{t('dashboard.noUpdateData')}</div>
-            ) : (
-              <div className="dashboard-notifications-inline">
-                {notifications.map(n => (
-                  <div key={n.id} className={`notif-row notif-${n.type}`}>
-                    <span className="notif-time">
-                      {n.time.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit', second: '2-digit' })}
-                    </span>
-                    <span className="notif-text">{n.text}</span>
-                  </div>
-                ))}
+      {/* RAM */}
+      <div className="dash-card">
+        <div className="dash-card-head">
+          <span className="dash-label">RAM</span>
+          <span className="dash-count">{metrics ? `${metrics.mem_used_mb.toFixed(0)}/${metrics.mem_total_mb.toFixed(0)}` : '—'}</span>
+        </div>
+        <MiniGraph data={memRef.current} max={100} color="#a78bfa" label="RAM" unit="%" />
+      </div>
+
+      {/* Network */}
+      <div className="dash-card">
+        <div className="dash-card-head">
+          <span className="dash-label">Network</span>
+          <span className="dash-count">{metrics ? `↓${metrics.net_rx_kbs.toFixed(0)} ↑${metrics.net_tx_kbs.toFixed(0)}` : '—'}</span>
+        </div>
+        <MiniGraph data={netRxRef.current} max={null} color="#34d399" label="RX" unit=" KB/s" />
+        <MiniGraph data={netTxRef.current} max={null} color="#f59e0b" label="TX" unit=" KB/s" />
+      </div>
+
+      {/* API Quota */}
+      <div className="dash-card">
+        <div className="dash-card-head">
+          <span className="dash-label">API Quota</span>
+        </div>
+        <div className="dash-quota-list">
+          {minimax && minimax.data?.models?.map((m, i) => (
+            <div key={i} className="dash-quota-row">
+              <span className="dash-quota-name">{String(m.model).replace('MiniMax-', '')}</span>
+              <div className="dash-bar">
+                <div className="dash-bar-fill" style={{ width: `${Math.min(100, (m.used / m.total) * 100)}%` }} />
               </div>
-            )}
+              <span className="dash-quota-val">{m.used}/{m.total}</span>
+            </div>
+          ))}
+          {minimax && minimax.data?.models?.length === 0 && (
+            <div className="dash-quota-row">
+              <span className="dash-quota-name">MiniMax</span>
+              <span className="dash-quota-val" style={{ color: 'var(--text-tertiary)' }}>{minimax.error || 'no data'}</span>
+            </div>
+          )}
+          {zai && zai.data?.models?.map((m, i) => (
+            <div key={i} className="dash-quota-row">
+              <span className="dash-quota-name">{String(m.model)}</span>
+              <div className="dash-bar">
+                <div className="dash-bar-fill" style={{ width: `${Math.min(100, (m.used / m.total) * 100)}%` }} />
+              </div>
+              <span className="dash-quota-val">{m.used}/{m.total}</span>
+            </div>
+          ))}
+          {zai && !zai.data?.models?.length && (
+            <div className="dash-quota-row">
+              <span className="dash-quota-name">Z.AI</span>
+              <span className="dash-quota-val" style={{ color: 'var(--text-tertiary)' }}>{zai.error || 'no data'}</span>
+            </div>
+          )}
+          {!minimax && !zai && <span className="dash-quota-val" style={{ color: 'var(--text-tertiary)' }}>No providers</span>}
+        </div>
+      </div>
+
+      {/* Running Processes */}
+      <div className="dash-card">
+        <div className="dash-card-head">
+          <span className="dash-label">Processes</span>
+          <span className="dash-count">{processes.length}</span>
+        </div>
+        <div className="dash-proc-list">
+          {processes.length === 0 && <span className="dash-empty">No relevant processes</span>}
+          {processes.map((p, i) => (
+            <div key={i} className="dash-proc-row">
+              <span className="dash-proc-name">{p.name}</span>
+              <span className="dash-proc-res">cpu {p.cpu}% · mem {p.mem}%</span>
+            </div>
+          ))}
+        </div>
+      </div>
+
+      {/* Recent Commands */}
+      <div className="dash-card dash-cmd-card">
+        <div className="dash-card-head">
+          <span className="dash-label">Recent Commands</span>
+          <span className="dash-count">{recentUnique.length}</span>
+        </div>
+        {topCmds.length > 0 && (
+          <div className="dash-cmd-freq">
+            <span className="dash-cmd-freq-title">Most used</span>
+            {topCmds.map((c, i) => (
+              <div key={i} className="dash-cmd-freq-row" onClick={() => copyCmd(c.cmd, `top-${i}`)} title={c.cmd}>
+                <span className="dash-cmd-freq-name">{copiedSet.has(`top-${i}`) ? '✓ Copié' : c.cmd}</span>
+                <div className="dash-cmd-freq-bar-wrap">
+                  <div className="dash-cmd-freq-bar" style={{ width: `${(c.count / maxCount) * 100}%` }} />
+                </div>
+                <span className="dash-cmd-freq-count">{c.count}×</span>
+              </div>
+            ))}
           </div>
+        )}
+        <div className="dash-cmd-list">
+          {recentUnique.length === 0 && <span className="dash-empty">No history</span>}
+          {recentUnique.map((c, i) => (
+            <div key={i} className="dash-cmd-row" onClick={() => copyCmd(c.cmd, `list-${i}`)} title={c.cmd + ' · click to copy'}>
+              <div className="dash-cmd-left">
+                <span className="dash-cmd-text">{c.cmd.length > 38 ? c.cmd.slice(0, 35) + '...' : c.cmd}</span>
+                <span className="dash-cmd-time">{relativeTime(c.ts)}</span>
+              </div>
+              <span className="dash-cmd-copy">{copiedSet.has(`list-${i}`) ? '✓' : '⎘'}</span>
+            </div>
+          ))}
         </div>
       </div>
     </div>

web/src/components/OnboardingWizard.jsx

@@ -1,18 +1,19 @@
-import { useState } from 'react'
-import { Sparkles, ArrowRight } from 'lucide-react'
+import { useState, useEffect, useRef } from 'react'
+import { Sparkles, ArrowRight, ArrowLeft, Loader } from 'lucide-react'
 import { useI18n, LANGUAGES } from '../i18n'
 import { getLayoutList } from '../i18n/keyboards'
 
 const STEPS = [
-  { key: 'welcome', title: 'welcome', field: null },
-  { key: 'name', title: 'name', field: 'name' },
-  { key: 'language', title: 'language', field: 'language' },
-  { key: 'keyboard', title: 'keyboard', field: 'keyboard' },
-  { key: 'editor', title: 'editor', field: 'editor' },
-  { key: 'done', title: 'done', field: null },
+  { key: 'welcome', title: 'welcome' },
+  { key: 'name', title: 'name' },
+  { key: 'language', title: 'language' },
+  { key: 'keyboard', title: 'keyboard' },
+  { key: 'apikey', title: 'apikey' },
+  { key: 'editor', title: 'editor' },
+  { key: 'done', title: 'done' },
 ]
 
-const EDITOR_SUGGESTIONS = ['vim', 'nvim', 'vscode', 'emacs', 'nano', 'helix']
+const BASE_EDITORS = ['vim', 'nvim', 'vscode', 'emacs', 'nano', 'helix']
 
 export default function OnboardingWizard({ api, onComplete }) {
   const { t, language, keyboard, setLanguage, setKeyboard } = useI18n()
@@ -21,34 +22,190 @@ export default function OnboardingWizard({ api, onComplete }) {
     name: '',
     language: 'fr',
     keyboard: 'azerty',
+    apikey: '',
     editor: '',
   })
+  const [editorList, setEditorList] = useState(BASE_EDITORS)
   const [saving, setSaving] = useState(false)
+  const [error, setError] = useState(null)
+  const [requiredError, setRequiredError] = useState(false)
+  const [validating, setValidating] = useState(false)
+  const [keyValid, setKeyValid] = useState(false)
+  const [scanning, setScanning] = useState(false)
+  const [scanMessage, setScanMessage] = useState('')
+  const scanAbortRef = useRef(null)
 
   const current = STEPS[step]
   const layouts = getLayoutList()
 
   const goNext = () => {
-    if (step < STEPS.length - 1) setStep(step + 1)
+    if (step < STEPS.length - 1) {
+      if (!canProceed) { setRequiredError(true); return }
+      setRequiredError(false)
+      setStep(step + 1)
+    }
   }
 
+  const canProceed = (() => {
+    switch (current.key) {
+      case 'welcome': return true
+      case 'name': return answers.name.trim().length > 0
+      case 'language': return !!answers.language
+      case 'keyboard': return !!answers.keyboard
+      case 'apikey': return keyValid && !scanning
+      case 'editor': return true
+      case 'done': return true
+      default: return true
+    }
+  })()
+
+  const goPrev = () => {
+    if (step > 0) setStep(step - 1)
+  }
+
+  const cycleOption = (key, list, dir) => {
+    const idx = list.findIndex(item => item.id === answers[key])
+    const next = (idx + dir + list.length) % list.length
+    setAnswers(a => ({ ...a, [key]: list[next].id }))
+  }
+
+  const cycleOptionEditor = (dir) => {
+    const idx = editorList.findIndex(ed => ed === answers.editor)
+    const next = (idx + dir + editorList.length) % editorList.length
+    setAnswers(a => ({ ...a, editor: editorList[next] }))
+  }
+
+  const handleScanViaChat = async (apikey) => {
+    setScanning(true)
+    setScanMessage('Recherche des éditeurs sur votre système...')
+    setError(null)
+    try {
+      const detected = []
+      const fallback = async () => {
+        setScanMessage('Utilisation du scan local...')
+        const data = await api.getEditors()
+        return (data.editors || []).map(e => e.name)
+      }
+      const prompt = 'Liste tous les éditeurs de texte et IDE installés sur ce système. Exécute les commandes nécessaires pour les détecter (which, command -v, etc.). Réponds UNIQUEMENT avec les noms séparés par des virgules, sans aucune autre explication. Exemples: vim, nvim, code, emacs, nano, helix, subl, zed'
+      const ctrl = new AbortController()
+      scanAbortRef.current = ctrl
+      const full = await api.sendChat(prompt, true, (text, data) => {
+        if (data.tool_call) setScanMessage('Exécution: ' + (data.tool_call.name || '...'))
+        else if (data.tool_result) setScanMessage('Analyse des résultats...')
+        else if (data.content) setScanMessage('Réception: ' + text.slice(0, 60) + (text.length > 60 ? '...' : ''))
+      }, ctrl.signal)
+      const names = full.split(/[,\n]/).map(s => s.replace(/[^a-zA-Z0-9._-]/g, '')).filter(Boolean)
+      if (names.length > 0) {
+        detected.push(...names)
+      } else {
+        detected.push(...(await fallback()))
+      }
+      setEditorList([...new Set(detected.map(n => n.toLowerCase()))])
+      setScanMessage('')
+    } catch (err) {
+      try {
+        setScanMessage('Fallback: scan local...')
+        const data = await api.getEditors()
+        const detected = (data.editors || []).map(e => e.name)
+        setEditorList([...new Set(detected)])
+      } catch {}
+      setScanMessage('')
+    }
+    setScanning(false)
+  }
+
+  useEffect(() => {
+    const handler = (e) => {
+      if (e.key === 'Escape') { goPrev(); return }
+      if (current.key === 'language') {
+        if (e.key === 'Tab' || e.key === 'ArrowRight') { e.preventDefault(); cycleOption('language', LANGUAGES, 1); return }
+        if (e.key === 'ArrowLeft') { e.preventDefault(); cycleOption('language', LANGUAGES, -1); return }
+      }
+      if (current.key === 'keyboard') {
+        if (e.key === 'Tab' || e.key === 'ArrowRight') { e.preventDefault(); cycleOption('keyboard', layouts, 1); return }
+        if (e.key === 'ArrowLeft') { e.preventDefault(); cycleOption('keyboard', layouts, -1); return }
+      }
+      if (current.key === 'editor') {
+        if (e.key === 'Tab' || e.key === 'ArrowRight') { e.preventDefault(); cycleOptionEditor(1); return }
+        if (e.key === 'ArrowLeft') { e.preventDefault(); cycleOptionEditor(-1); return }
+      }
+      if (e.key === 'Tab') { e.preventDefault(); const input = document.querySelector('.onboarding-input'); if (input) input.focus(); return }
+      if (e.key === 'Enter' && current.key !== 'done' && current.key !== 'editor') { e.preventDefault(); goNext() }
+    }
+    window.addEventListener('keydown', handler)
+    return () => window.removeEventListener('keydown', handler)
+  }, [step, current, answers, editorList])
+
+  useEffect(() => {
+    return () => { if (scanAbortRef.current) scanAbortRef.current.abort() }
+  }, [])
+
+  useEffect(() => {
+    if (current.key === 'done' && !saving) {
+      handleSave()
+    }
+  }, [step])
+
+  const handleValidateKey = async () => {
+    if (!answers.apikey.trim()) return
+    setValidating(true)
+    setError(null)
+    try {
+      await api.validateProvider({
+        name: 'minimax',
+        api_key: answers.apikey,
+        model: 'MiniMax-M2.7',
+        base_url: 'https://api.minimax.io/v1',
+      })
+      setKeyValid(true)
+      await api.saveProvider({
+        name: 'minimax',
+        api_key: answers.apikey,
+        model: 'MiniMax-M2.7',
+        base_url: 'https://api.minimax.io/v1',
+        active: true,
+      })
+      handleScanViaChat(answers.apikey)
+    } catch (err) {
+      setError(err.message || 'Clé invalide')
+      setKeyValid(false)
+    }
+    setValidating(false)
+  }
+
+
+
   const handleSave = async () => {
     setSaving(true)
+    setError(null)
     try {
-      await api.saveProfile({
+      const profile = {
         name: answers.name,
         pseudo: answers.name.split(' ')[0] || 'user',
         editor: answers.editor,
-      })
+      }
+      if (answers.apikey.trim()) {
+        profile.apikey = answers.apikey
+      }
+      await api.saveProfile(profile)
       await api.savePreferences({
         language: answers.language,
         keyboard_layout: answers.keyboard,
       })
+      if (answers.apikey.trim()) {
+        await api.saveProvider({
+          name: 'minimax',
+          api_key: answers.apikey,
+          model: 'MiniMax-M2.7',
+          base_url: 'https://api.minimax.io/v1',
+          active: true,
+        })
+      }
       onComplete()
     } catch (err) {
-      console.error(err)
+      setError(err.message || 'Erreur lors de la sauvegarde')
+      setSaving(false)
     }
-    setSaving(false)
   }
 
   return (
@@ -60,9 +217,10 @@ export default function OnboardingWizard({ api, onComplete }) {
         </div>
 
         <div className="onboarding-progress">
-          {STEPS.map((_, i) => (
-            <div key={i} className={`onboarding-dot ${i === step ? 'active' : ''} ${i < step ? 'done' : ''}`} />
-          ))}
+          {STEPS.filter(s => s.key !== 'done').map(s => {
+            const i = STEPS.indexOf(s)
+            return <div key={s.key} className={`onboarding-dot ${i === step ? 'active' : ''} ${i < step ? 'done' : ''}`} />
+          })}
         </div>
 
         <div className="onboarding-body">
@@ -82,15 +240,16 @@ export default function OnboardingWizard({ api, onComplete }) {
                 className="onboarding-input"
                 placeholder="Votre nom..."
                 value={answers.name}
-                onChange={e => setAnswers(a => ({ ...a, name: e.target.value }))}
+                onChange={e => { setAnswers(a => ({ ...a, name: e.target.value })); setRequiredError(false) }}
                 autoFocus
               />
+              {requiredError && <div className="onboarding-required">Veuillez entrer votre nom</div>}
             </div>
           )}
 
           {current.key === 'language' && (
             <div className="onboarding-step">
-              <div className="onboarding-title">Quelle langue pr\u00e9f\u00e9rez-vous ?</div>
+              <div className="onboarding-title">Quelle langue préférez-vous ?</div>
               <div className="onboarding-chips">
                 {LANGUAGES.map(lang => (
                   <div
@@ -122,11 +281,52 @@ export default function OnboardingWizard({ api, onComplete }) {
             </div>
           )}
 
+          {current.key === 'apikey' && (
+            <div className="onboarding-step">
+              <div className="onboarding-title">Clé API MiniMax</div>
+              <div className="onboarding-desc">
+                Entrez votre clé API MiniMax pour activer l'assistant IA. La clé est obligatoire pour continuer.
+              </div>
+              <input
+                className="onboarding-input"
+                placeholder="sk-xxxxxxxxxxxxxxxx"
+                type="password"
+                value={answers.apikey}
+                onChange={e => { setAnswers(a => ({ ...a, apikey: e.target.value })); setKeyValid(false); setError(null) }}
+                autoFocus
+              />
+              {error && !keyValid && <div className="onboarding-required">{error}</div>}
+              {keyValid && !scanning && <div className="onboarding-valid">Clé valide ✓ — Appuyez sur Entrée pour continuer</div>}
+              {scanning && (
+                <div className="onboarding-scanning">
+                  <Loader size={14} className="spin-icon" />
+                  <span>{scanMessage}</span>
+                </div>
+              )}
+              {requiredError && <div className="onboarding-required">Veuillez valider votre clé API pour continuer</div>}
+              <div style={{ display: 'flex', gap: 8, marginTop: 4 }}>
+                <button
+                  className="sm primary"
+                  onClick={handleValidateKey}
+                  disabled={validating || !answers.apikey.trim()}
+                >
+                  {validating ? 'Validation...' : 'Valider la clé'}
+                </button>
+              </div>
+              {!keyValid && !error && answers.apikey.trim() && (
+                <div className="onboarding-hint">Entrez votre clé puis cliquez "Valider la clé"</div>
+              )}
+            </div>
+          )}
+
           {current.key === 'editor' && (
             <div className="onboarding-step">
-              <div className="onboarding-title">Quel \u00e9diteur utilisez-vous ?</div>
+              <div className="onboarding-title">Quel éditeur utilisez-vous ?</div>
+              <div className="onboarding-desc">
+                {scanning ? 'Détection en cours...' : 'Sélectionnez votre éditeur.'}
+              </div>
               <div className="onboarding-chips">
-                {EDITOR_SUGGESTIONS.map(ed => (
+                {editorList.map(ed => (
                   <div
                     key={ed}
                     className={`chip ${answers.editor === ed ? 'active' : ''}`}
@@ -136,37 +336,51 @@ export default function OnboardingWizard({ api, onComplete }) {
                   </div>
                 ))}
               </div>
-              <input
-                className="onboarding-input"
-                style={{ marginTop: 12 }}
-                placeholder="Autre (vim, nvim, vscode...)"
-                value={answers.editor}
-                onChange={e => setAnswers(a => ({ ...a, editor: e.target.value }))}
-                autoFocus
-              />
             </div>
           )}
 
           {current.key === 'done' && (
             <div className="onboarding-step">
-              <div className="onboarding-title">C'est parti ! 🚀</div>
-              <div className="onboarding-desc">
-                Votre profil est configur\u00e9. Vous pouvez toujours ajuster les param\u00e8tres dans l'onglet Configuration.
-              </div>
+              {saving ? (
+                <>
+                  <div className="onboarding-title">Configuration en cours...</div>
+                  <div className="onboarding-desc">Sauvegarde de vos préférences.</div>
+                </>
+              ) : error ? (
+                <>
+                  <div className="onboarding-title" style={{ color: 'var(--error)' }}>Erreur</div>
+                  <div className="onboarding-desc" style={{ color: 'var(--error)' }}>{error}</div>
+                  <button className="primary" style={{ alignSelf: 'flex-start', marginTop: 8 }} onClick={() => handleSave()}>Réessayer</button>
+                </>
+              ) : (
+                <>
+                  <div className="onboarding-title">C'est parti ! 🚀</div>
+                  <div className="onboarding-desc">
+                    Votre profil est configuré. Vous pouvez toujours ajuster les paramètres dans l'onglet Configuration.
+                  </div>
+                </>
+              )}
             </div>
           )}
         </div>
 
         <div className="onboarding-footer">
-          {current.key === 'done' ? (
-            <button className="primary" onClick={handleSave} disabled={saving}>
-              {saving ? '...' : 'Commencer'}
+          {step > 0 && step < STEPS.length - 1 && (
+            <button className="ghost" onClick={goPrev}>
+              <ArrowLeft size={14} /> Précédent
             </button>
-          ) : (
+          )}
+          <div style={{ flex: 1 }} />
+          {step < STEPS.length - 1 && (
             <button className="primary" onClick={goNext}>
               Suivant <ArrowRight size={14} />
             </button>
           )}
+          {step === STEPS.length - 1 && !saving && !error && (
+            <button className="primary" onClick={handleSave}>
+              Commencer
+            </button>
+          )}
         </div>
       </div>
 
@@ -218,6 +432,26 @@ export default function OnboardingWizard({ api, onComplete }) {
           padding: 16px 20px; border-top: 1px solid var(--border);
           background: var(--bg-surface);
         }
+        .onboarding-required {
+          font-size: 12px; color: var(--error); margin-top: 4px;
+        }
+        .onboarding-valid {
+          font-size: 12px; color: var(--success); margin-top: 4px;
+        }
+        .onboarding-hint {
+          font-size: 12px; color: var(--text-tertiary); margin-top: 4px;
+        }
+        .onboarding-scanning {
+          display: flex; align-items: center; gap: 8px;
+          font-size: 13px; color: var(--accent); margin-top: 4px;
+        }
+        .spin-icon {
+          animation: spin 1s linear infinite;
+        }
+        @keyframes spin {
+          from { transform: rotate(0deg); }
+          to { transform: rotate(360deg); }
+        }
       `}</style>
     </div>
   )

web/src/components/Shell.jsx

@@ -2,11 +2,70 @@ import { useState, useRef, useEffect, useCallback } from 'react'
 import { Terminal as XTerm } from '@xterm/xterm'
 import { FitAddon } from '@xterm/addon-fit'
 import { WebLinksAddon } from '@xterm/addon-web-links'
-import { Plus, X, Monitor, Globe, ChevronDown, Pencil, Trash2 } from 'lucide-react'
+import { Plus, X, Monitor, Globe, ChevronDown, Pencil, Trash2, Search, Copy, Send, Eye } from 'lucide-react'
 import '@xterm/xterm/css/xterm.css'
 import { useI18n } from '../i18n'
 
 const MAX_TABS = 7
+const SHELL_MAX_TOKENS = 100000
+const TABS_STORAGE_KEY = 'muyue_shell_tabs'
+const TERMINAL_BUFFER_KEY = 'muyue_terminal_buffers'
+
+function renderContent(text) {
+  const parts = []
+  const codeBlockRegex = /(```[\s\S]*?```)/g
+  let match
+  let lastIndex = 0
+  while ((match = codeBlockRegex.exec(text)) !== null) {
+    if (match.index > lastIndex) {
+      parts.push({ type: 'text', content: text.slice(lastIndex, match.index) })
+    }
+    const full = match[1]
+    const firstNewline = full.indexOf('\n')
+    const lang = firstNewline > -1 ? full.slice(3, firstNewline).trim() : ''
+    const code = firstNewline > -1 ? full.slice(firstNewline + 1, -3) : full.slice(3, -3)
+    parts.push({ type: 'code', lang, content: code })
+    lastIndex = match.index + full.length
+  }
+  if (lastIndex < text.length) {
+    const remaining = text.slice(lastIndex)
+    const openBlock = remaining.match(/```(\w*)\n?([\s\S]*)$/)
+    if (openBlock) {
+      if (openBlock.index > 0) {
+        parts.push({ type: 'text', content: remaining.slice(0, openBlock.index) })
+      }
+      parts.push({ type: 'code', lang: openBlock[1] || '', content: openBlock[2] || '' })
+    } else {
+      parts.push({ type: 'text', content: remaining })
+    }
+  }
+  return parts
+}
+
+function formatText(text) {
+  let html = text
+    .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+
+  html = html
+    .replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
+    .replace(/`([^`]+)`/g, '<code class="inline-code">$1</code>')
+    .replace(/^### (.+)$/gm, '<h4 class="msg-h4">$1</h4>')
+    .replace(/^## (.+)$/gm, '<h3 class="msg-h3">$1</h3>')
+    .replace(/^# (.+)$/gm, '<h2 class="msg-h2">$1</h2>')
+    .replace(/^\s*[-*] (.+)$/gm, '<div class="msg-bullet">• $1</div>')
+    .replace(/^\s*(\d+)[.)] (.+)$/gm, '<div class="msg-step"><span class="msg-step-num">$1</span> $2</div>')
+    .replace(/\n/g, '<br/>')
+
+  html = html
+    .replace(/<br\/>\s*<br\/>/g, '<br/>')
+    .replace(/<br\/>\s*(<h[234]|<div class="msg-)/g, '$1')
+    .replace(/(<\/h[234]|<\/div>)\s*<br\/>/g, '$1')
+    .replace(/\s+on\w+=["'][^"']*["']/gi, '')
+    .replace(/javascript:/gi, '')
+    .replace(/data:/gi, '')
+
+  return html
+}
 
 const THEMES = {
   default: {
@@ -73,7 +132,7 @@ function createTerminal(container, settings = {}) {
   const theme = getTheme(settings.theme || 'default')
   const term = new XTerm({
     cursorBlink: true,
-    fontSize: settings.fontSize || 14,
+    fontSize: settings.fontSize || 12,
     fontFamily: settings.fontFamily || "'JetBrains Mono', 'Fira Code', 'Cascadia Code', 'SF Mono', 'Menlo', monospace",
     theme,
     allowTransparency: false,
@@ -90,7 +149,7 @@ function createTerminal(container, settings = {}) {
   return { term, fitAddon }
 }
 
-function connectWebSocket(term, fitAddon, initPayload) {
+function connectWebSocket(term, fitAddon, initPayload, onStateChange, onFirstMessage) {
   const proto = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
   const ws = new WebSocket(`${proto}//${window.location.host}/api/ws/terminal`)
 
@@ -100,9 +159,15 @@ function connectWebSocket(term, fitAddon, initPayload) {
     if (dims) {
       ws.send(JSON.stringify({ type: 'resize', rows: dims.rows, cols: dims.cols }))
     }
+    if (onStateChange) onStateChange(true)
   })
 
+  let firstMessage = true
   ws.addEventListener('message', (event) => {
+    if (firstMessage) {
+      firstMessage = false
+      if (onFirstMessage) onFirstMessage()
+    }
     try {
       const msg = JSON.parse(event.data)
       if (msg.type === 'output') {
@@ -117,16 +182,12 @@ function connectWebSocket(term, fitAddon, initPayload) {
 
   ws.addEventListener('close', () => {
     term.write('\r\n\x1b[33m— Connection closed —\x1b[0m\r\n')
+    if (onStateChange) onStateChange(false)
   })
 
   ws.addEventListener('error', () => {
     term.write('\r\n\x1b[31m— Connection error —\x1b[0m\r\n')
-  })
-
-  term.onData((data) => {
-    if (ws.readyState === WebSocket.OPEN) {
-      ws.send(JSON.stringify({ type: 'input', data }))
-    }
+    if (onStateChange) onStateChange(false)
   })
 
   term.onResize(({ rows, cols }) => {
@@ -142,11 +203,33 @@ export default function Shell({ api }) {
   const { t } = useI18n()
   const tabsRef = useRef({})
   const nextIdRef = useRef(1)
+  const settingsRef = useRef({ fontSize: 12, fontFamily: "'JetBrains Mono', 'Fira Code', monospace", theme: 'default' })
+  const pendingCommandsRef = useRef({})
 
-  const [tabs, setTabs] = useState([
+  const savedTabs = (() => {
+    try {
+      const raw = localStorage.getItem(TABS_STORAGE_KEY)
+      if (raw) {
+        const parsed = JSON.parse(raw)
+        if (Array.isArray(parsed) && parsed.length > 0) {
+          return parsed.map(t => ({ ...t, connected: false }))
+        }
+      }
+    } catch {}
+    return null
+  })()
+
+  const [tabs, setTabs] = useState(savedTabs || [
     { id: 1, name: 'Local Shell', type: 'local', shell: '', connected: false },
   ])
-  const [activeTab, setActiveTab] = useState(1)
+  const [activeTab, setActiveTab] = useState(() => {
+    if (savedTabs) {
+      return savedTabs[0]?.id || 1
+    }
+    return 1
+  })
+  const activeTabRef = useRef(activeTab)
+  useEffect(() => { activeTabRef.current = activeTab }, [activeTab])
   const [sshConnections, setSshConnections] = useState([])
   const [systemTerminals, setSystemTerminals] = useState([])
   const [showMenu, setShowMenu] = useState(false)
@@ -154,26 +237,63 @@ export default function Shell({ api }) {
   const [editingTab, setEditingTab] = useState(null)
   const [editName, setEditName] = useState('')
   const [terminalSettings, setTerminalSettings] = useState({
-    fontSize: 14,
+    fontSize: 12,
     fontFamily: "'JetBrains Mono', 'Fira Code', 'Cascadia Code', 'SF Mono', 'Menlo', monospace",
     theme: 'default',
   })
 
+  useEffect(() => { settingsRef.current = terminalSettings }, [terminalSettings])
+
   const [sshForm, setSshForm] = useState({
     name: '', host: '', port: 22, user: '', key_path: '',
   })
 
-  const [aiMessages, setAiMessages] = useState([
-    { role: 'ai', content: t('shell.aiWelcome') }
-  ])
+  const [aiMessages, setAiMessages] = useState([])
   const [aiInput, setAiInput] = useState('')
   const [aiLoading, setAiLoading] = useState(false)
+  const [aiTokens, setAiTokens] = useState(0)
+  const [aiAtLimit, setAiAtLimit] = useState(false)
+  const [analyzing, setAnalyzing] = useState(false)
+  const [showAnalysis, setShowAnalysis] = useState(false)
+  const [analysisContent, setAnalysisContent] = useState('')
   const aiMessagesRef = useRef(null)
+  const aiLoadedRef = useRef(false)
+  const aiLoadingRef = useRef(false)
 
   useEffect(() => {
     aiMessagesRef.current?.scrollTo(0, aiMessagesRef.current.scrollHeight)
   }, [aiMessages])
 
+  useEffect(() => {
+    api.getShellAnalysis?.().then(d => {
+      if (d?.analysis) setAnalysisContent(d.analysis)
+    }).catch(() => {
+      const stored = localStorage.getItem('shell_analysis')
+      if (stored) setAnalysisContent(stored)
+    })
+  }, [])
+
+  useEffect(() => {
+    if (aiLoadedRef.current) return
+    aiLoadedRef.current = true
+    api.getShellChatHistory().then(d => {
+      if (d.messages && d.messages.length > 0) {
+        setAiMessages(d.messages)
+      } else {
+        setAiMessages([{ role: 'assistant', content: t('shell.aiWelcome') || 'Système Analyste prêt. Tapez /help pour les commandes.' }])
+      }
+      setAiTokens(d.tokens || 0)
+      setAiAtLimit(d.at_limit || false)
+    }).catch(() => {
+      setAiMessages([{ role: 'assistant', content: 'Système Analyste prêt.' }])
+    })
+  }, [])
+
+  useEffect(() => {
+    const maxId = tabs.reduce((max, t) => Math.max(max, t.id), 0)
+    nextIdRef.current = maxId + 1
+  }, [])
+
   useEffect(() => {
     api.getTerminalSessions().then(d => {
       setSshConnections(d.ssh || [])
@@ -182,7 +302,7 @@ export default function Shell({ api }) {
     api.getConfig().then(d => {
       if (d.terminal) {
         setTerminalSettings({
-          fontSize: d.terminal.font_size || 14,
+          fontSize: d.terminal.font_size || 12,
           fontFamily: d.terminal.font_family || "'JetBrains Mono', 'Fira Code', 'Cascadia Code', 'SF Mono', 'Menlo', monospace",
           theme: d.terminal.theme || 'default',
         })
@@ -196,10 +316,11 @@ export default function Shell({ api }) {
     const container = document.getElementById(`terminal-${tabId}`)
     if (!container) return
 
+    const s = settingsRef.current
     const { term, fitAddon } = createTerminal(container, {
-      fontSize: terminalSettings.fontSize,
-      fontFamily: terminalSettings.fontFamily,
-      theme: terminalSettings.theme,
+      fontSize: s.fontSize,
+      fontFamily: s.fontFamily,
+      theme: s.theme,
     })
 
     let initPayload
@@ -220,62 +341,222 @@ export default function Shell({ api }) {
       }
     }
 
-    const ws = connectWebSocket(term, fitAddon, initPayload)
+    let disposed = false
 
-    ws.onopen = () => {
-      setTabs(prev => prev.map(t => t.id === tabId ? { ...t, connected: true } : t))
+    const saveBuffer = () => {
+      try {
+        const buf = term.buffer.active
+        const lines = []
+        for (let i = 0; i < buf.length; i++) {
+          const line = buf.getLine(i)
+          if (line) lines.push(line.translateToString(true))
+        }
+        const savedBuffers = JSON.parse(sessionStorage.getItem(TERMINAL_BUFFER_KEY) || '{}')
+        savedBuffers[tabId] = lines.join('\n')
+        sessionStorage.setItem(TERMINAL_BUFFER_KEY, JSON.stringify(savedBuffers))
+      } catch (e) { console.warn('[Shell] Buffer save failed:', e) }
     }
 
-    ws.onclose = () => {
-      setTabs(prev => prev.map(t => t.id === tabId ? { ...t, connected: false } : t))
+    const onWsState = (connected) => {
+      if (disposed) return
+      if (!connected) saveBuffer()
+      setTabs(prev => prev.map(t => t.id === tabId ? { ...t, connected } : t))
     }
 
-    ws.onerror = () => {
-      setTabs(prev => prev.map(t => t.id === tabId ? { ...t, connected: false } : t))
+    const restoreBuffer = () => {
+      try {
+        const savedBuffers = JSON.parse(sessionStorage.getItem(TERMINAL_BUFFER_KEY) || '{}')
+        if (savedBuffers[tabId]) {
+          term.write('\x1b[90m— session restaurée —\x1b[0m\r\n')
+          term.write(savedBuffers[tabId])
+        }
+      } catch (e) { console.warn('[Shell] Buffer restore failed:', e) }
     }
 
+    const ws = connectWebSocket(term, fitAddon, initPayload, onWsState, restoreBuffer)
+
+    const clearBufferOnClear = () => {
+      try {
+        const buf = term.buffer.active
+        const lineY = buf.length - 1
+        const line = buf.getLine(lineY)
+        if (line) {
+          const text = line.translateToString(true).trim().toLowerCase()
+          if (text === 'clear' || text === '$ clear' || text.endsWith(' clear')) {
+            const savedBuffers = JSON.parse(sessionStorage.getItem(TERMINAL_BUFFER_KEY) || '{}')
+            delete savedBuffers[tabId]
+            sessionStorage.setItem(TERMINAL_BUFFER_KEY, JSON.stringify(savedBuffers))
+          }
+        }
+      } catch (e) { console.warn('[Shell] Clear detection failed:', e) }
+    }
+
+    term.onData((data) => {
+      if (data === '\r') clearBufferOnClear()
+      if (ws.readyState === WebSocket.OPEN) {
+        ws.send(JSON.stringify({ type: 'input', data }))
+      }
+    })
+
     const onResize = () => {
-      const el = document.getElementById(`terminal-${tabId}`)
-      if (el && el.offsetParent !== null) {
-        fitAddon.fit()
-      }
+      fitAddon.fit()
     }
 
     const resizeObserver = new ResizeObserver(onResize)
     resizeObserver.observe(container)
     window.addEventListener('resize', onResize)
 
-    tabsRef.current[tabId] = { term, fitAddon, ws, resizeObserver, onResize }
+    const bufferSaveInterval = setInterval(() => { if (!disposed) saveBuffer() }, 5000)
+
+    console.log(`[Shell] initTerminal tab=${tabId} type=${tab.type} name="${tab.name}" shell="${tab.shell || '(default)'}"`)
+    tabsRef.current[tabId] = { term, fitAddon, ws, resizeObserver, onResize, bufferSaveInterval, saveBuffer, disposed: () => disposed }
+    tabsRef.current[tabId]._markDisposed = () => { disposed = true }
+    console.log(`[Shell] initTerminal tab=${tabId} done, tabsRef keys:`, Object.keys(tabsRef.current))
+
+    const pending = pendingCommandsRef.current[tabId]
+    if (pending && pending.length > 0) {
+      console.log(`[Shell] Flushing ${pending.length} pending commands for tab ${tabId}`)
+      for (const cmd of pending) {
+        if (ws.readyState === WebSocket.OPEN) {
+          ws.send(JSON.stringify({ type: 'input', data: cmd + '\r' }))
+        }
+      }
+      delete pendingCommandsRef.current[tabId]
+    }
   }, [])
 
-  useEffect(() => {
-    const tab = tabs.find(t => t.id === activeTab)
-    if (!tab) return
-
-    const container = document.getElementById(`terminal-${tab.id}`)
-    if (!container) return
-
-    if (!tabsRef.current[tab.id]) {
-      const timer = setTimeout(() => {
-        initTerminal(tab.id, tab)
-        requestAnimationFrame(() => {
-          const entry = tabsRef.current[tab.id]
-          if (entry) entry.fitAddon.fit()
-        })
-      }, 100)
-      return () => clearTimeout(timer)
-    } else {
-      requestAnimationFrame(() => {
+  const initPendingTabs = useCallback(() => {
+    for (const tab of tabsRef.current._tabList || []) {
+      if (!tabsRef.current[tab.id]) {
+        const container = document.getElementById(`terminal-${tab.id}`)
+        if (container && container.offsetHeight > 0) {
+          initTerminal(tab.id, tab)
+        }
+      }
+    }
+    requestAnimationFrame(() => {
+      for (const tab of tabsRef.current._tabList || []) {
         const entry = tabsRef.current[tab.id]
         if (entry) entry.fitAddon.fit()
+      }
+      setTimeout(() => {
+        for (const tab of tabsRef.current._tabList || []) {
+          const entry = tabsRef.current[tab.id]
+          if (entry) entry.fitAddon.fit()
+        }
+      }, 150)
+    })
+  }, [initTerminal])
+
+  useEffect(() => {
+    tabsRef.current._tabList = tabs
+  }, [tabs])
+
+  useEffect(() => {
+    let cancelled = false
+    const pending = []
+
+    const tryInitTab = (tab, attempt) => {
+      if (cancelled) return
+      const shellCol = document.querySelector('.shell-terminal-col')
+      if (!shellCol || shellCol.offsetParent === null) {
+        pending.push(setTimeout(() => tryInitTab(tab, attempt + 1), 200))
+        return
+      }
+      const container = document.getElementById(`terminal-${tab.id}`)
+      if (!container) {
+        pending.push(setTimeout(() => tryInitTab(tab, attempt + 1), 100))
+        return
+      }
+      if (container.offsetHeight === 0) {
+        pending.push(setTimeout(() => tryInitTab(tab, attempt + 1), 100))
+        return
+      }
+      if (!tabsRef.current[tab.id]) {
+        initTerminal(tab.id, tab)
+      }
+      requestAnimationFrame(() => {
+        if (cancelled) return
+        const entry = tabsRef.current[tab.id]
+        if (entry) {
+          entry.fitAddon.fit()
+          setTimeout(() => { if (!cancelled) entry.fitAddon.fit() }, 100)
+        }
+      })
+      if (!tabsRef.current[tab.id]) {
+        tryInitTab(tab, 0)
+      }
+    }
+
+    const wrapper = document.querySelector('.shell-layout')?.parentElement
+    let observer
+    if (wrapper) {
+      observer = new MutationObserver(() => {
+        if (!wrapper.classList.contains('tab-hidden') && wrapper.offsetParent !== null) {
+          initPendingTabs()
+        }
+      })
+      observer.observe(wrapper, { attributes: true, attributeFilter: ['class'] })
+    }
+
+    return () => {
+      cancelled = true
+      pending.forEach(clearTimeout)
+      observer?.disconnect()
+    }
+  }, [tabs, initTerminal, initPendingTabs])
+
+  useEffect(() => {
+    const entry = tabsRef.current[activeTab]
+    if (entry) {
+      requestAnimationFrame(() => {
+        if (activeTabRef.current === activeTab) {
+          entry.fitAddon.fit()
+        }
       })
     }
-  }, [activeTab, tabs, initTerminal])
+  }, [activeTab])
+
+  useEffect(() => {
+    const iv = setInterval(() => {
+      const wrapper = document.querySelector('.shell-layout')?.parentElement
+      if (wrapper && wrapper.classList.contains('tab-hidden')) return
+      const entry = tabsRef.current[activeTabRef.current]
+      if (entry) {
+        entry.fitAddon.fit()
+      }
+    }, 2000)
+    return () => clearInterval(iv)
+  }, [tabs])
+
+  useEffect(() => {
+    return () => {
+      for (const [tabId, entry] of Object.entries(tabsRef.current)) {
+        entry._markDisposed?.()
+        if (entry.bufferSaveInterval) clearInterval(entry.bufferSaveInterval)
+        window.removeEventListener('resize', entry.onResize)
+        entry.resizeObserver?.disconnect()
+        entry.ws?.close()
+        entry.term?.dispose()
+      }
+      tabsRef.current = {}
+    }
+  }, [])
 
   useEffect(() => {
     const onKey = (e) => {
       if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') return
-      if (!e.altKey) return
+      if (!e.altKey && !(e.key === 'Tab' && e.shiftKey)) return
+
+      if (e.key === 'Tab' && e.shiftKey) {
+        const shellTab = document.querySelector('.shell-layout')
+        if (!shellTab || shellTab.closest('.tab-hidden')) return
+        e.preventDefault()
+        const idx = tabs.findIndex(t => t.id === activeTab)
+        const next = (idx + 1) % tabs.length
+        setActiveTab(tabs[next].id)
+        return
+      }
 
       const num = parseInt(e.key)
       if (num >= 1 && num <= tabs.length) {
@@ -290,8 +571,8 @@ export default function Shell({ api }) {
   const addLocalTab = (shell, name) => {
     if (tabs.length >= MAX_TABS) return
     const id = nextIdRef.current++
-    const newTab = { id, name: name || `${t('shell.localShell')} ${tabs.length + 1}`, type: 'local', shell: shell || '', connected: false }
-    setTabs(prev => [...prev, newTab])
+    const newTab = { id, name: name || `${t('shell.localShell')} ${tabs.length}`, type: 'local', shell: shell || '', connected: false }
+    setTabs(prev => { const next = [...prev, newTab]; localStorage.setItem(TABS_STORAGE_KEY, JSON.stringify(next.map(t => ({ id: t.id, name: t.name, type: t.type, shell: t.shell, host: t.host, port: t.port, user: t.user, key_path: t.key_path })))); return next })
     setActiveTab(id)
     setShowMenu(false)
   }
@@ -309,25 +590,34 @@ export default function Shell({ api }) {
       key_path: conn.key_path || '',
       connected: false,
     }
-    setTabs(prev => [...prev, newTab])
+    setTabs(prev => { const next = [...prev, newTab]; localStorage.setItem(TABS_STORAGE_KEY, JSON.stringify(next.map(t => ({ id: t.id, name: t.name, type: t.type, shell: t.shell, host: t.host, port: t.port, user: t.user, key_path: t.key_path })))); return next })
     setActiveTab(id)
     setShowMenu(false)
   }
 
   const closeTab = (tabId, e) => {
     if (e) e.stopPropagation()
-    if (tabs.length <= 1) return
 
-    if (tabsRef.current[tabId]) {
-      const { ws, resizeObserver, onResize, term } = tabsRef.current[tabId]
-      window.removeEventListener('resize', onResize)
-      resizeObserver.disconnect()
-      ws.close()
-      term.dispose()
+    const entry = tabsRef.current[tabId]
+    if (entry) {
+      entry._markDisposed?.()
+      entry.saveBuffer?.()
+      if (entry.bufferSaveInterval) clearInterval(entry.bufferSaveInterval)
+      window.removeEventListener('resize', entry.onResize)
+      entry.resizeObserver.disconnect()
+      entry.ws.close()
+      entry.term.dispose()
       delete tabsRef.current[tabId]
     }
 
+    try {
+      const savedBuffers = JSON.parse(sessionStorage.getItem(TERMINAL_BUFFER_KEY) || '{}')
+      delete savedBuffers[tabId]
+      sessionStorage.setItem(TERMINAL_BUFFER_KEY, JSON.stringify(savedBuffers))
+    } catch (e) { console.warn('[Shell] Buffer cleanup failed:', e) }
+
     setTabs(prev => {
+      if (prev.length <= 1) return prev
       const next = prev.filter(t => t.id !== tabId)
       if (activeTab === tabId && next.length > 0) {
         setActiveTab(next[next.length - 1].id)
@@ -372,67 +662,123 @@ export default function Shell({ api }) {
     }
   }
 
-  const handleAiSend = async () => {
-    if (!aiInput.trim() || aiLoading) return
-    const text = aiInput.trim()
-    setAiMessages(prev => [...prev, { role: 'user', content: text }])
-    setAiInput('')
+  const sendToTerminal = useCallback((code, tabId) => {
+    const targetId = tabId || activeTabRef.current
+    const entry = tabsRef.current[targetId]
+    if (!entry) {
+      console.warn(`[Shell] sendToTerminal: tab ${targetId} not ready. Queueing. tabsRef:`, Object.keys(tabsRef.current), 'activeTab:', activeTabRef.current, 'requested:', tabId)
+      if (!pendingCommandsRef.current[targetId]) pendingCommandsRef.current[targetId] = []
+      pendingCommandsRef.current[targetId].push(code)
+      return
+    }
+    if (!entry.ws || entry.ws.readyState !== WebSocket.OPEN) {
+      console.warn(`[Shell] sendToTerminal: WS not open for tab ${targetId} (state=${entry.ws?.readyState}). Queueing.`)
+      if (!pendingCommandsRef.current[targetId]) pendingCommandsRef.current[targetId] = []
+      pendingCommandsRef.current[targetId].push(code)
+      return
+    }
+    console.log(`[Shell] sendToTerminal: tab ${targetId} ← ${code.length} chars`)
+    entry.ws.send(JSON.stringify({ type: 'input', data: code + '\r' }))
+  }, [])
+
+  const focusAiTerminal = useCallback(() => {
+    const entry = tabsRef.current[activeTabRef.current]
+    if (entry) entry.term.focus()
+  }, [])
+
+  const _sendAiMessage = useCallback(async (text, fromEvent = false) => {
+    if (!text || !text.trim() || aiLoadingRef.current || aiAtLimit) return
+    const trimmed = text.trim()
+    aiLoadingRef.current = true
+
+    if (!fromEvent) {
+      setAiInput('')
+      focusAiTerminal()
+    }
+
+    if (trimmed === '/clear') {
+      try {
+        await api.clearShellChat()
+        setAiMessages([{ role: 'assistant', content: t('shell.aiWelcome') || 'Contexte effacé. Prêt.' }])
+        setAiTokens(0)
+        setAiAtLimit(false)
+      } catch {}
+      aiLoadingRef.current = false
+      return
+    }
+
+    if (trimmed === '/help') {
+      setAiMessages(prev => [...prev,
+        { role: 'user', content: trimmed },
+        { role: 'assistant', content: 'Commandes disponibles:\n• /clear — Effacer la conversation\n• /help — Afficher l\'aide\n\nJe ne peux pas exécuter de code. Les blocs de code proposés peuvent être copiés ou envoyés directement au terminal actif.' }
+      ])
+      aiLoadingRef.current = false
+      return
+    }
+
+    const currentTab = activeTabRef.current
+    console.log(`[Shell] _sendAiMessage: activeTab=${currentTab}, fromEvent=${fromEvent}, text="${trimmed.slice(0, 50)}"`)
+    setAiMessages(prev => [...prev, { role: 'user', content: trimmed, _tabId: currentTab }])
     setAiLoading(true)
+
     try {
-      const res = await api.runCommand(`echo "AI: ${text}"`, '')
-      const output = res.output || t('shell.noResponse')
-      parseAndAddAiMessages(output)
+      let accumulated = ''
+      await api.sendShellChat(trimmed, {}, true, (partial) => {
+        accumulated = partial
+        setAiMessages(prev => {
+          const filtered = prev.filter(m => !m._streaming)
+          return [...filtered, { role: 'assistant', content: partial, _streaming: true, _tabId: currentTab }]
+        })
+      })
+
+      setAiMessages(prev => {
+        const filtered = prev.filter(m => !m._streaming)
+        return [...filtered, { role: 'assistant', content: accumulated, _tabId: currentTab }]
+      })
+      api.getShellChatHistory().then(d => {
+        setAiTokens(d.tokens || 0)
+        setAiAtLimit(d.at_limit || false)
+      }).catch(() => {})
     } catch (err) {
-      setAiMessages(prev => [...prev, { role: 'ai', content: `${t('shell.error')}: ${err.message}` }])
+      if (err.message?.includes('context limit')) {
+        setAiAtLimit(true)
+      }
+      setAiMessages(prev => [...prev.filter(m => !m._streaming), { role: 'assistant', content: `Erreur: ${err.message}` }])
     }
     setAiLoading(false)
-  }
+    aiLoadingRef.current = false
+  }, [api, t, aiAtLimit, focusAiTerminal])
 
-  const parseAndAddAiMessages = (text) => {
-    const lines = text.split('\n')
-    let buffer = ''
-    let inBlock = false
+  const handleAiSend = () => _sendAiMessage(aiInput, false)
 
-    const flushBuffer = () => {
-      if (buffer.trim()) {
-        setAiMessages(prev => [...prev, { role: 'ai', content: buffer.trim() }])
-      }
-      buffer = ''
+  useEffect(() => {
+    const handler = (e) => {
+      const msg = e.detail?.message
+      if (!msg) return
+      setAiInput(msg)
+      setTimeout(() => _sendAiMessage(msg, true), 100)
     }
+    window.addEventListener('ask-ai-terminal', handler)
+    return () => window.removeEventListener('ask-ai-terminal', handler)
+  }, [_sendAiMessage])
 
-    for (const line of lines) {
-      const toolMatch = line.match(/^\[TOOL_CALL:\{.*\}\]$/)
-      if (toolMatch) {
-        flushBuffer()
-        try {
-          const toolData = JSON.parse(toolMatch[0].slice(10, -1))
-          setAiMessages(prev => [...prev, {
-            role: 'tool',
-            content: `${t('shell.toolLaunched')}: ${toolData.tool || 'tool'}`,
-            args: toolData.task || toolData.args || '',
-          }])
-        } catch {
-          setAiMessages(prev => [...prev, { role: 'tool', content: line, args: '' }])
-        }
-      } else if (line.match(/^(Reflexion|Thought|thinking):/i) || line.startsWith('>')) {
-        if (buffer.trim() && !inBlock) {
-          flushBuffer()
-        }
-        inBlock = true
-        const cleaned = line.replace(/^(Reflexion|Thought|thinking):\s*/i, '').replace(/^>\s*/, '')
-        if (buffer) buffer += ' '
-        buffer += cleaned
-      } else {
-        if (inBlock && buffer.trim()) {
-          setAiMessages(prev => [...prev, { role: 'thinking', content: buffer.trim() }])
-          buffer = ''
-        }
-        inBlock = false
-        if (buffer) buffer += '\n'
-        buffer += line
+  const handleAnalyze = async () => {
+    setAnalyzing(true)
+    setAiMessages(prev => [...prev, { role: 'system', content: 'Analyse du système en cours...' }])
+    try {
+      const d = await api.analyzeSystem()
+      if (d.analysis) {
+        setAnalysisContent(d.analysis)
+        localStorage.setItem('shell_analysis', d.analysis)
       }
+      setAiMessages(prev => [...prev.filter(m => m.content !== 'Analyse du système en cours...'), {
+        role: 'system',
+        content: 'Analyse système terminée et sauvegardée. Le contexte système est maintenant disponible.'
+      }])
+    } catch (err) {
+      setAiMessages(prev => prev.filter(m => m.content !== 'Analyse du système en cours...'))
     }
-    flushBuffer()
+    setAnalyzing(false)
   }
 
   return (
@@ -542,21 +888,48 @@ export default function Shell({ api }) {
             <div
               key={tab.id}
               id={`terminal-${tab.id}`}
-              className="shell-xterm-instance"
-              style={{ display: activeTab === tab.id ? 'block' : 'none' }}
+              className={`shell-xterm-instance${activeTab === tab.id ? ' active' : ''}`}
             />
           ))}
         </div>
       </div>
 
       <div className="shell-ai-col">
-        <div className="ai-panel-header">{t('shell.aiAssistant')}</div>
+        <div className="ai-panel-header">
+          <span>Analyste Système</span>
+          <div style={{ display: 'flex', gap: 6 }}>
+            <button
+              className="shell-analyze-btn"
+              onClick={() => setShowAnalysis(true)}
+              disabled={!analysisContent}
+              title="Voir l'analyse"
+            >
+              <Eye size={13} />
+              Analyse
+            </button>
+            <button
+              className="shell-analyze-btn"
+              onClick={handleAnalyze}
+              disabled={analyzing}
+              title="Analyser le système"
+            >
+              <Search size={13} />
+              {analyzing ? '...' : 'Analyser'}
+            </button>
+          </div>
+        </div>
+        <div className="shell-ai-token-bar">
+          <div className="shell-ai-token-track">
+            <div
+              className={`shell-ai-token-fill ${aiTokens >= SHELL_MAX_TOKENS * 0.8 ? 'warn' : ''}`}
+              style={{ width: `${Math.min(100, (aiTokens / SHELL_MAX_TOKENS) * 100)}%` }}
+            />
+          </div>
+          <span className="shell-ai-token-text">{Math.round(aiTokens / 1000)}k/{Math.round(SHELL_MAX_TOKENS / 1000)}k</span>
+        </div>
         <div className="ai-panel-messages" ref={aiMessagesRef}>
           {aiMessages.map((msg, i) => (
-            <div key={i} className={`ai-message ${msg.role}`}>
-              {msg.content}
-              {msg.args && <div className="tool-args">{msg.args}</div>}
-            </div>
+            <ShellAIMessage key={i} msg={msg} sendToTerminal={sendToTerminal} terminalTabId={msg._tabId || activeTab} />
           ))}
           {aiLoading && <div style={{ textAlign: 'center', padding: 8 }}><span className="spinner" /></div>}
         </div>
@@ -565,12 +938,36 @@ export default function Shell({ api }) {
             value={aiInput}
             onChange={e => setAiInput(e.target.value)}
             onKeyDown={e => e.key === 'Enter' && handleAiSend()}
-            placeholder={t('shell.askAi')}
+            placeholder={aiAtLimit ? '/clear pour continuer' : t('shell.askAi')}
+            disabled={aiAtLimit && aiInput !== '/clear'}
           />
-          <button className="sm" onClick={handleAiSend} disabled={!aiInput.trim()}>{t('shell.send')}</button>
+          <button className="sm" onClick={handleAiSend} disabled={(!aiInput.trim() && !aiAtLimit) || (aiAtLimit && aiInput !== '/clear')}>{t('shell.send')}</button>
         </div>
       </div>
 
+      {showAnalysis && analysisContent && (
+        <div className="shell-modal-overlay" onClick={() => setShowAnalysis(false)}>
+          <div className="shell-analysis-modal" onClick={e => e.stopPropagation()}>
+            <div className="shell-analysis-modal-header">
+              <span>Analyse Système</span>
+              <button className="shell-tab-close" onClick={() => setShowAnalysis(false)}><X size={16} /></button>
+            </div>
+            <div className="shell-analysis-modal-body">
+              {renderContent(analysisContent).map((part, i) =>
+                part.type === 'code' ? (
+                  <div key={i} className="shell-code-block">
+                    {part.lang && <div className="shell-code-lang">{part.lang}</div>}
+                    <pre><code>{part.content}</code></pre>
+                  </div>
+                ) : (
+                  <span key={i} dangerouslySetInnerHTML={{ __html: formatText(part.content) }} />
+                )
+              )}
+            </div>
+          </div>
+        </div>
+      )}
+
       {showSshModal && (
         <div className="shell-modal-overlay" onClick={() => setShowSshModal(false)}>
           <div className="shell-modal" onClick={e => e.stopPropagation()}>
@@ -623,3 +1020,42 @@ export default function Shell({ api }) {
     </div>
   )
 }
+
+function ShellAIMessage({ msg, sendToTerminal, terminalTabId }) {
+  const role = msg.role === 'user' ? 'user' : msg.role === 'system' ? 'system' : 'assistant'
+  const content = msg.content || ''
+
+  if (role === 'user') {
+    return <div className={`ai-message user`}>{content}</div>
+  }
+
+  if (role === 'system') {
+    return <div className={`ai-message system`}>{content}</div>
+  }
+
+  const parts = renderContent(content)
+
+  return (
+    <div className={`ai-message assistant`}>
+      {parts.map((part, i) => {
+        if (part.type === 'code') {
+          return (
+            <div key={i} className="shell-code-block">
+              {part.lang && <div className="shell-code-lang">{part.lang}</div>}
+              <pre><code>{part.content}</code></pre>
+              <div className="shell-code-actions">
+                <button onClick={() => navigator.clipboard.writeText(part.content)} title="Copier">
+                  <Copy size={12} /> Copier
+                </button>
+                <button onClick={() => sendToTerminal(part.content, terminalTabId)} title="Envoyer au terminal">
+                  <Send size={12} /> Terminal
+                </button>
+              </div>
+            </div>
+          )
+        }
+        return <span key={i} dangerouslySetInnerHTML={{ __html: formatText(part.content) }} />
+      })}
+    </div>
+  )
+}

web/src/components/Studio.jsx

@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect, useCallback } from 'react'
+import { useState, useRef, useEffect, useCallback, useMemo } from 'react'
 import { useI18n } from '../i18n'
 
 const RANKS = {
@@ -47,23 +47,46 @@ function renderContent(text) {
     lastIndex = match.index + full.length
   }
   if (lastIndex < text.length) {
-    parts.push({ type: 'text', content: text.slice(lastIndex) })
+    const remaining = text.slice(lastIndex)
+    const openBlock = remaining.match(/```(\w*)\n?([\s\S]*)$/)
+    if (openBlock) {
+      if (openBlock.index > 0) {
+        parts.push({ type: 'text', content: remaining.slice(0, openBlock.index) })
+      }
+      parts.push({ type: 'code', lang: openBlock[1] || '', content: openBlock[2] || '' })
+    } else {
+      parts.push({ type: 'text', content: remaining })
+    }
   }
   return parts
 }
 
 function formatText(text) {
-  return text
+  let html = text
     .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+  
+  html = html
     .replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
     .replace(/`([^`]+)`/g, '<code class="inline-code">$1</code>')
     .replace(/^### (.+)$/gm, '<h4 class="msg-h4">$1</h4>')
     .replace(/^## (.+)$/gm, '<h3 class="msg-h3">$1</h3>')
-    .replace(/^\s*[-*] (.+)$/gm, '<span class="msg-bullet">$1</span>')
-    .replace(/^\s*(\d+)[.)] (.+)$/gm, '<span class="msg-step"><span class="msg-step-num">$1</span>$2</span>')
+    .replace(/^# (.+)$/gm, '<h2 class="msg-h2">$1</h2>')
+    .replace(/^\s*[-*] (.+)$/gm, '<div class="msg-bullet">• $1</div>')
+    .replace(/^\s*(\d+)[.)] (.+)$/gm, '<div class="msg-step"><span class="msg-step-num">$1</span> $2</div>')
+    .replace(/\n/g, '<br/>')
+  
+  html = html
+    .replace(/<br\/>\s*<br\/>/g, '<br/>')
+    .replace(/<br\/>\s*(<h[234]|<div class="msg-)/g, '$1')
+    .replace(/(<\/h[234]|<\/div>)\s*<br\/>/g, '$1')
+    .replace(/\s+on\w+=["'][^"']*["']/gi, '')
+    .replace(/javascript:/gi, '')
+    .replace(/data:/gi, '')
+  
+  return html
 }
 
-function ThinkingBlock({ content, done }) {
+function ThinkingBlock({ content, done, raw }) {
   return (
     <div className={`feed-thinking-block ${done ? 'done' : 'active'}`}>
       <div className="feed-thinking-header">
@@ -73,7 +96,74 @@ function ThinkingBlock({ content, done }) {
         <span>Reflexion</span>
         {!done && <span className="feed-thinking-dots"><span/><span/><span/></span>}
       </div>
-      <div className="feed-thinking-content">{content}</div>
+      <div className="feed-thinking-content">
+        {raw ? <span dangerouslySetInnerHTML={{ __html: content }} /> : content}
+      </div>
+    </div>
+  )
+}
+
+const TOOL_ICONS = {
+  terminal: '⌨',
+  crush_run: '⚡',
+  read_file: '📄',
+  list_files: '📁',
+  search_files: '🔍',
+  grep_content: '🔎',
+  get_config: '⚙',
+  set_provider: '🔑',
+  manage_ssh: '🌐',
+  web_fetch: '🌐',
+}
+
+const TOOL_LABELS = {
+  terminal: 'Terminal',
+  crush_run: 'Crush Agent',
+  read_file: 'Read File',
+  list_files: 'List Files',
+  search_files: 'Search Files',
+  grep_content: 'Grep',
+  get_config: 'Config',
+  set_provider: 'Set Provider',
+  manage_ssh: 'SSH',
+  web_fetch: 'Web Fetch',
+}
+
+function ToolCallBlock({ call, result }) {
+  const icon = TOOL_ICONS[call.name] || '🔧'
+  const label = TOOL_LABELS[call.name] || call.name
+  const isErr = result && result.is_error
+
+  let argsPreview = ''
+  try {
+    const args = typeof call.args === 'string' ? JSON.parse(call.args) : call.args
+    if (args.command) argsPreview = args.command
+    else if (args.task) argsPreview = args.task
+    else if (args.path) argsPreview = args.path
+    else if (args.pattern) argsPreview = args.pattern
+    else if (args.url) argsPreview = args.url
+    else if (args.action) argsPreview = args.action
+    else argsPreview = JSON.stringify(args).slice(0, 80)
+  } catch {
+    argsPreview = String(call.args).slice(0, 80)
+  }
+
+  const truncatedResult = result ? (result.content || '').slice(0, 2000) : null
+
+  return (
+    <div className={`studio-tool-block ${isErr ? 'error' : ''} ${result ? 'done' : 'running'}`}>
+      <div className="studio-tool-header">
+        <span className="studio-tool-icon">{icon}</span>
+        <span className="studio-tool-name">{label}</span>
+        {!result && <span className="studio-tool-spinner"><span/><span/><span/></span>}
+        {result && <span className={`studio-tool-status ${isErr ? 'error' : 'ok'}`}>{isErr ? '✗' : '✓'}</span>}
+      </div>
+      <div className="studio-tool-args" title={argsPreview}>{argsPreview}</div>
+      {truncatedResult && (
+        <div className="studio-tool-result">
+          <pre>{truncatedResult}</pre>
+        </div>
+      )}
     </div>
   )
 }
@@ -85,6 +175,18 @@ function FeedItem({ msg }) {
 
   const timeStr = msg.time ? new Date(msg.time).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) : ''
 
+  let parsedToolCalls = null
+  let parsedToolResults = null
+  let displayContent = msg.content
+  try {
+    const parsed = JSON.parse(msg.content)
+    if (parsed && Array.isArray(parsed.tool_calls)) {
+      parsedToolCalls = parsed.tool_calls
+      parsedToolResults = parsed.tool_results || null
+      displayContent = parsed.content || ''
+    }
+  } catch {}
+
   if (isSystem) {
     return (
       <div className="feed-item system">
@@ -95,7 +197,7 @@ function FeedItem({ msg }) {
     )
   }
 
-  const cleanContent = msg.content.replace(/<think[^>]*>[\s\S]*?<\/think>/gi, '')
+  let cleanContent = displayContent.replace(/<think[^>]*>[\s\S]*?<\/think>/gi, '')
 
   return (
     <div className={`feed-item ${msg.role}`}>
@@ -110,27 +212,49 @@ function FeedItem({ msg }) {
           <span className="feed-role">{rank.label}</span>
           {timeStr && <span className="feed-time">{timeStr}</span>}
         </div>
-        {msg.thinking && <ThinkingBlock content={msg.thinking} done />}
-        <div className="feed-content">
-          {renderContent(cleanContent).map((part, i) =>
-            part.type === 'code' ? (
-              <div key={i} className="studio-code-block">
-                {part.lang && <div className="studio-code-lang">{part.lang}</div>}
-                <pre><code>{part.content}</code></pre>
-              </div>
-            ) : (
-              <span key={i} dangerouslySetInnerHTML={{ __html: formatText(part.content) }} />
-            )
-          )}
-        </div>
+        {msg.thinking && <ThinkingBlock content={formatText(msg.thinking)} done raw />}
+        {parsedToolCalls && parsedToolCalls.map((tc, i) => {
+          const resultData = parsedToolResults
+            ? parsedToolResults.find(r => r.tool_call_id === tc.tool_call_id)
+            : null
+          const result = resultData
+            ? { content: resultData.result, is_error: resultData.is_error }
+            : null
+          return <ToolCallBlock key={tc.tool_call_id || i} call={tc} result={result} />
+        })}
+        {cleanContent && (
+          <div className="feed-content">
+            {renderContent(cleanContent).map((part, i) =>
+              part.type === 'code' ? (
+                <div key={i} className="studio-code-block">
+                  {part.lang && <div className="studio-code-lang">{part.lang}</div>}
+                  <pre><code>{part.content}</code></pre>
+                </div>
+              ) : (
+                <span key={i} dangerouslySetInnerHTML={{ __html: formatText(part.content) }} />
+              )
+            )}
+          </div>
+        )}
       </div>
     </div>
   )
 }
 
-function StreamingItem({ content, thinking }) {
+function StreamingItem({ content, thinking, toolCalls }) {
   const rank = RANKS.general
   const cleanContent = content.replace(/<think[^>]*>[\s\S]*?<\/think>/gi, '')
+  const hasToolCalls = toolCalls && toolCalls.length > 0
+
+  const renderedContent = useMemo(() => {
+    if (!cleanContent) return []
+    return renderContent(cleanContent)
+  }, [cleanContent])
+
+  const formattedThinking = useMemo(() => {
+    if (!thinking) return ''
+    return formatText(thinking)
+  }, [thinking])
 
   return (
     <div className="feed-item assistant">
@@ -144,15 +268,18 @@ function StreamingItem({ content, thinking }) {
           </span>
           <span className="feed-role">{rank.label}</span>
         </div>
-        {thinking && <ThinkingBlock content={thinking} done={false} />}
-        {!thinking && !cleanContent && (
+        {thinking && <ThinkingBlock content={formattedThinking} raw done={false} />}
+        {hasToolCalls && toolCalls.map((tc, i) => (
+          <ToolCallBlock key={tc.call?.tool_call_id || i} call={tc.call} result={tc.result} />
+        ))}
+        {!thinking && !cleanContent && !hasToolCalls && (
           <div className="feed-content">
             <div className="studio-thinking"><span /><span /><span /></div>
           </div>
         )}
         {cleanContent && (
           <div className="feed-content">
-            {renderContent(cleanContent).map((part, i) =>
+            {renderedContent.map((part, i) =>
               part.type === 'code' ? (
                 <div key={i} className="studio-code-block">
                   {part.lang && <div className="studio-code-lang">{part.lang}</div>}
@@ -177,9 +304,15 @@ export default function Studio({ api }) {
   const [loading, setLoading] = useState(false)
   const [streaming, setStreaming] = useState('')
   const [streamThinking, setStreamThinking] = useState('')
+  const [streamToolCalls, setStreamToolCalls] = useState([])
   const [loaded, setLoaded] = useState(false)
+  const [tokenInfo, setTokenInfo] = useState({ used: 0, max: 100000, summarizeAt: 80000 })
+  const [contextCollapsed, setContextCollapsed] = useState(false)
+  const [messagesCollapsed, setMessagesCollapsed] = useState(false)
   const messagesEnd = useRef(null)
+  const feedRef = useRef(null)
   const textareaRef = useRef(null)
+  const abortRef = useRef(null)
 
   useEffect(() => {
     api.getChatHistory().then(data => {
@@ -190,6 +323,11 @@ export default function Studio({ api }) {
           { id: 'welcome', role: 'system', content: t('studio.welcomeNew'), time: new Date().toISOString() },
         ])
       }
+      setTokenInfo({
+        used: data.tokens || 0,
+        max: data.max_tokens || 100000,
+        summarizeAt: data.summarize_at || 80000,
+      })
       setLoaded(true)
     }).catch(() => {
       setMessages([
@@ -201,7 +339,21 @@ export default function Studio({ api }) {
 
   useEffect(() => {
     messagesEnd.current?.scrollIntoView({ behavior: 'smooth' })
-  }, [messages, streaming, streamThinking])
+  }, [messages, streaming, streamThinking, streamToolCalls])
+
+  useEffect(() => {
+    const onTab = (e) => {
+      if (e.key !== 'Tab') return
+      if (document.activeElement?.tagName === 'INPUT' || document.activeElement?.tagName === 'TEXTAREA') return
+      const feed = document.querySelector('.studio-feed-layout')
+      if (!feed?.closest('.tab-hidden')) {
+        e.preventDefault()
+        textareaRef.current?.focus()
+      }
+    }
+    window.addEventListener('keydown', onTab)
+    return () => window.removeEventListener('keydown', onTab)
+  }, [])
 
   useEffect(() => {
     if (textareaRef.current) {
@@ -210,6 +362,34 @@ export default function Studio({ api }) {
     }
   }, [input])
 
+  const refreshTokens = useCallback(async () => {
+    try {
+      const data = await api.getChatHistory()
+      setTokenInfo({
+        used: data.tokens || 0,
+        max: data.max_tokens || 100000,
+        summarizeAt: data.summarize_at || 80000,
+      })
+    } catch {}
+  }, [api])
+
+  const handleSummarize = useCallback(async () => {
+    setMessages(prev => [...prev, { id: Date.now().toString(), role: 'system', content: 'Résumé de la conversation en cours...', time: new Date().toISOString() }])
+    setContextCollapsed('animating')
+    try {
+      const data = await api.summarizeChat()
+      setTokenInfo(prev => ({ ...prev, used: data.tokens || 0 }))
+      setTimeout(() => {
+        setMessages(prev => [...prev, { id: (Date.now() + 1).toString(), role: 'system', content: '✓ Conversation résumée automatiquement. Le contexte a été compressé.', time: new Date().toISOString(), compressed: true }])
+        setContextCollapsed(true)
+        setMessagesCollapsed(true)
+      }, 600)
+    } catch (err) {
+      setMessages(prev => [...prev, { id: (Date.now() + 1).toString(), role: 'system', content: `Erreur de résumé: ${err.message}`, time: new Date().toISOString() }])
+      setContextCollapsed(false)
+    }
+  }, [api])
+
   const handleClear = useCallback(async () => {
     try {
       await api.clearChat()
@@ -224,20 +404,122 @@ export default function Studio({ api }) {
     const text = input.trim()
     setInput('')
 
+    const isSlashCommand = (t) => /^\/(clear|help|summarize|export|model(?:\s+\S+)?|plan\s+.+)$/.test(t)
+
+    if (text.startsWith('/') && !isSlashCommand(text)) {
+      setMessages(prev => [...prev, { id: Date.now().toString(), role: 'user', content: text, time: new Date().toISOString() }])
+      setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Commande inconnue. Tapez `/help` pour la liste des commandes.', time: new Date().toISOString() }])
+      return
+    }
+
     if (text === '/clear') {
       handleClear()
       return
     }
 
+    if (text === '/help') {
+      const helpMsg = [
+        '## Commandes Studio',
+        '',
+        '- `/clear` - Effacer la conversation',
+        '- `/summarize` - Résumer la conversation précédente',
+        '- `/help` - Afficher cette aide',
+        '- `/plan <objectif>` - Demander un plan structuré',
+        '- `/export` - Exporter la conversation en Markdown',
+        '- `/model` - Afficher le provider et modèle actifs',
+        '- `/model change` - Basculer entre MiniMax et ZAI',
+        '',
+        '## Tools disponibles',
+        '- Terminal - Exécuter des commandes',
+        '- read_file - Lire des fichiers',
+        '- list_files - Lister des fichiers',
+        '- search_files - Rechercher des fichiers',
+        '- grep_content - Rechercher dans le contenu',
+        '- get_config - Lire la configuration',
+        '- web_fetch - Récupérer une page web',
+      ].join('\n')
+      setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: helpMsg, time: new Date().toISOString() }])
+      return
+    }
+
+    if (text === '/summarize') {
+      handleSummarize()
+      return
+    }
+
+    if (text === '/model' || text === '/model change') {
+      if (text === '/model change') {
+        api.getProviders().then(data => {
+          const providers = data.providers || []
+          const minimax = providers.find(p => p.name.toUpperCase() === 'MINIMAX')
+          const zai = providers.find(p => p.name.toUpperCase() === 'ZAI')
+          if (!minimax || !zai) {
+            setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'MiniMax et ZAI doivent être configurés pour utiliser `/model change`.', time: new Date().toISOString() }])
+            return
+          }
+          const active = providers.find(p => p.active)
+          const activeName = active ? active.name.toUpperCase() : ''
+          const switchTo = activeName === 'MINIMAX' ? 'ZAI' : 'MINIMAX'
+          const target = switchTo === 'MINIMAX' ? minimax : zai
+          api.saveProvider({ name: target.name, active: true }).then(() => {
+            setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: `✓ Provider changé: **${target.name}** (${target.model})`, time: new Date().toISOString() }])
+          }).catch(() => {
+            setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Erreur lors du changement de provider.', time: new Date().toISOString() }])
+          })
+        }).catch(() => {
+          setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Erreur: impossible de récupérer les providers', time: new Date().toISOString() }])
+        })
+      } else {
+        api.getProviders().then(data => {
+          const active = data.providers?.find(p => p.active)
+          const modelMsg = active ? `**${active.name}** — ${active.model}` : 'Aucun provider actif configuré'
+          setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: modelMsg, time: new Date().toISOString() }])
+        }).catch(() => {
+          setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Erreur: impossible de récupérer les providers', time: new Date().toISOString() }])
+        })
+      }
+      return
+    }
+
+    if (text.startsWith('/plan ')) {
+      const objective = text.slice(6).trim()
+      if (!objective) {
+        setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Usage: `/plan <objectif>`\nEx: `/plan créer un fichier de test`', time: new Date().toISOString() }])
+        return
+      }
+      setInput(`Crée un plan structuré en étapes numérotées pour: ${objective}. Chaque étape devrait avoir une estimation de complexité et de temps.`)
+      handleSend()
+      return
+    }
+
+    if (text === '/export') {
+      api.getChatHistory().then(data => {
+        let markdown = '# Conversation Export\n\n'
+        data.messages?.forEach((msg, i) => {
+          const roleLabel = msg.role === 'user' ? '👤' : (msg.role === 'assistant' ? '🤖' : '⚙️')
+          markdown += `## [${i + 1}] ${roleLabel} ${msg.role}\n${msg.content}\n\n---\n\n`
+        })
+        setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Conversation exportée:\n```markdown\n' + markdown + '```', time: new Date().toISOString() }])
+      }).catch(() => {
+        setMessages(prev => [...prev, { id: Date.now().toString(), role: 'assistant', content: 'Erreur: impossible d\'exporter la conversation', time: new Date().toISOString() }])
+      })
+      return
+    }
+
     const userMsg = { id: Date.now().toString(), role: 'user', content: text, time: new Date().toISOString() }
     setMessages(prev => [...prev, userMsg])
     setLoading(true)
     setStreaming('')
     setStreamThinking('')
+    setStreamToolCalls([])
+
+    const controller = new AbortController()
+    abortRef.current = controller
 
     try {
       let accumulated = ''
       let thinking = ''
+      let toolCalls = []
 
       await api.sendChat(text, true, (partial, event) => {
         if (event && (event.thinking_start || event.thinking_end || event.thinking !== undefined)) {
@@ -247,9 +529,24 @@ export default function Studio({ api }) {
           }
           return
         }
+        if (event && event.tool_call) {
+          toolCalls = [...toolCalls, { call: event.tool_call, result: null }]
+          setStreamToolCalls([...toolCalls])
+          accumulated = ''
+          setStreaming('')
+          return
+        }
+        if (event && event.tool_result) {
+          const idx = toolCalls.findIndex(tc => tc.call && tc.call.tool_call_id === event.tool_result.tool_call_id)
+          if (idx >= 0) {
+            toolCalls[idx] = { ...toolCalls[idx], result: event.tool_result }
+            setStreamToolCalls([...toolCalls])
+          }
+          return
+        }
         accumulated = partial
         setStreaming(partial)
-      })
+      }, controller.signal)
 
       const finalContent = accumulated || t('studio.noResponse')
       const aiMsg = {
@@ -259,26 +556,113 @@ export default function Studio({ api }) {
         time: new Date().toISOString(),
       }
       if (thinking) aiMsg.thinking = thinking
+      if (toolCalls.length > 0) {
+        aiMsg.content = JSON.stringify({
+          content: finalContent,
+          tool_calls: toolCalls.map(tc => tc.call),
+          tool_results: toolCalls.map(tc => ({
+            tool_call_id: tc.call?.tool_call_id,
+            result: tc.result?.content || '',
+            is_error: tc.result?.is_error || false,
+          })),
+        })
+      }
       setMessages(prev => [...prev, aiMsg])
     } catch (err) {
-      setMessages(prev => [...prev, {
-        id: (Date.now() + 1).toString(),
-        role: 'system',
-        content: `${t('studio.error')}: ${err.message}`,
-        time: new Date().toISOString(),
-      }])
+      if (err.name === 'AbortError') {
+        if (streaming) {
+          setMessages(prev => [...prev, {
+            id: (Date.now() + 1).toString(),
+            role: 'system',
+            content: t('studio.cancelled'),
+            time: new Date().toISOString(),
+          }])
+        }
+      } else {
+        setMessages(prev => [...prev, {
+          id: (Date.now() + 1).toString(),
+          role: 'system',
+          content: `${t('studio.error')}: ${err.message}`,
+          time: new Date().toISOString(),
+        }])
+      }
     } finally {
       setLoading(false)
       setStreaming('')
       setStreamThinking('')
+      setStreamToolCalls([])
+      abortRef.current = null
+      refreshTokens()
     }
-  }, [input, loading, api, t, handleClear])
+  }, [input, loading, api, t, handleClear, streaming, refreshTokens, handleSummarize])
+
+  const handleStop = useCallback(() => {
+    if (abortRef.current) {
+      abortRef.current.abort()
+    }
+  }, [])
+
+  const COMMANDS = ['/clear', '/summarize', '/help', '/plan', '/export', '/model', '/model change']
 
   const handleKeyDown = (e) => {
     if (e.key === 'Enter' && !e.shiftKey) {
       e.preventDefault()
       handleSend()
+      return
     }
+    if (e.key === 'Tab') {
+      e.preventDefault()
+      const ta = textareaRef.current
+      if (!ta) return
+      if (document.activeElement !== ta) {
+        ta.focus()
+        return
+      }
+      const val = ta.value
+      const pos = ta.selectionStart
+      const before = val.slice(0, pos)
+      const afterSlash = before.match(/\/[\w ]*$/)
+      if (afterSlash) {
+        const partial = afterSlash[0]
+        const matches = COMMANDS.filter(c => c.startsWith(partial) && c !== partial)
+        if (matches.length === 1) {
+          const completed = matches[0] + ' '
+          const newText = val.slice(0, pos - afterSlash[0].length) + completed + val.slice(pos)
+          setInput(newText)
+          requestAnimationFrame(() => {
+            ta.selectionStart = ta.selectionEnd = pos - afterSlash[0].length + completed.length
+          })
+        }
+      }
+    }
+  }
+
+  const handleToggleCollapsed = useCallback(() => {
+    setMessagesCollapsed(prev => !prev)
+  }, [])
+
+  const renderMessages = () => {
+    if (messagesCollapsed && messages.length > 4) {
+      const visibleCount = 4
+      const hiddenCount = messages.length - visibleCount
+      return (
+        <>
+          {messages.slice(0, visibleCount).map(msg => (
+            <FeedItem key={msg.id} msg={msg} />
+          ))}
+          <div className="feed-collapsed-messages" onClick={handleToggleCollapsed}>
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
+              <path d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"/>
+            </svg>
+            <span className="feed-collapsed-text">{hiddenCount} messages antérieurs compressés</span>
+            <span className="feed-collapsed-count">clic pour développer</span>
+          </div>
+        </>
+      )
+    }
+    return messages.map(msg => (
+      <FeedItem key={msg.id} msg={msg} />
+    ))
   }
 
   if (!loaded) {
@@ -295,17 +679,43 @@ export default function Studio({ api }) {
 
   return (
     <div className="studio-feed-layout">
-      <div className="studio-feed">
-        {messages.map(msg => (
-          <FeedItem key={msg.id} msg={msg} />
-        ))}
-        {(streaming || streamThinking || loading) && (
-          <StreamingItem content={streaming} thinking={streamThinking} />
-        )}
-        <div ref={messagesEnd} />
+      <div className="studio-feed-scroll-wrap">
+        <div className="studio-feed" ref={feedRef}>
+          {renderMessages()}
+          {(streaming || streamThinking || loading || streamToolCalls.length > 0) && (
+            <StreamingItem content={streaming} thinking={streamThinking} toolCalls={streamToolCalls} />
+          )}
+          <div ref={messagesEnd} style={{ height: '24px' }} />
+        </div>
+        <div className="studio-scroll-btns">
+          <button className="studio-scroll-btn" onClick={() => feedRef.current?.scrollTo({ top: 0, behavior: 'smooth' })} title="Remonter">
+            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M18 15l-6-6-6 6"/></svg>
+          </button>
+          <button className="studio-scroll-btn" onClick={() => messagesEnd.current?.scrollIntoView({ behavior: 'smooth' })} title="Descendre">
+            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M6 9l6 6 6-6"/></svg>
+          </button>
+        </div>
       </div>
 
       <div className="studio-input-area">
+        <div className={`studio-token-bar ${contextCollapsed === true ? 'compressed' : ''}`}>
+          <div className={`studio-token-track ${contextCollapsed === true ? 'compressed' : ''}`}>
+            <div
+              className={`studio-token-fill ${tokenInfo.used >= tokenInfo.summarizeAt ? 'warn' : ''} ${contextCollapsed === true ? 'compressed' : ''} ${contextCollapsed === 'animating' ? 'animating' : ''}`}
+              style={{ width: `${Math.min(100, (tokenInfo.used / tokenInfo.max) * 100)}%` }}
+            />
+          </div>
+          <span className={`studio-token-text ${contextCollapsed === true ? 'compressed' : ''}`}>
+            {(tokenInfo.used / 1000).toFixed(1)}k / {(tokenInfo.max / 1000).toFixed(0)}k tokens
+            {contextCollapsed === true && ' · compressé'}
+            {tokenInfo.used >= tokenInfo.summarizeAt && contextCollapsed !== true && ' · résumé auto.'}
+          </span>
+          {contextCollapsed === true && (
+            <button className="ghost sm" onClick={handleToggleCollapsed} style={{ marginLeft: '8px', fontSize: '10px' }}>
+              voir plus
+            </button>
+          )}
+        </div>
         <div className="studio-input-row">
           <textarea
             ref={textareaRef}
@@ -325,9 +735,16 @@ export default function Studio({ api }) {
               <line x1="22" y1="2" x2="11" y2="13"/><polygon points="22 2 15 22 11 13 2 9 22 2"/>
             </svg>
           </button>
+          {loading && (
+            <button className="studio-stop-btn" onClick={handleStop} title={t('studio.stop')}>
+              <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                <rect x="4" y="4" width="16" height="16" rx="2"/>
+              </svg>
+            </button>
+          )}
         </div>
         <div className="studio-input-hint">
-          {t('studio.inputHint')} &middot; /clear
+          {t('studio.inputHint')} · /clear /summarize /help /plan /export /model /model change
         </div>
       </div>
     </div>

web/src/i18n/en.js

@@ -22,7 +22,9 @@ const en = {
 
   dashboard: {
     systemOverview: 'System Overview',
-    tools: 'tools',
+    tools: 'Tools',
+    activity: 'Activity',
+    toolsCount: '{count} tools installed',
     installed: 'Installed',
     missing: 'Missing',
     quickActions: 'Quick Actions',
@@ -39,9 +41,20 @@ const en = {
     installStarted: 'Install started. Rescanning...',
     done: 'Done.',
     scanComplete: 'Scan complete.',
+    scanFailed: 'Scan failed',
     updatesCount: '{count} updates available.',
     allUpToDate: 'All tools up to date.',
     mcpConfigured: 'MCP configured.',
+    mcpConfigFailed: 'MCP configuration failed',
+    status: 'Status',
+    clearLog: 'Clear',
+    noActivity: 'No recent activity.',
+    rescanning: 'Scanning...',
+    install: 'Install',
+    installFailed: 'Install failed',
+    checkUpdatesFailed: 'Check failed',
+    configuringMCP: 'Configuring MCP...',
+    mcpConfigFailed: 'MCP configuration failed',
   },
 
   studio: {
@@ -77,6 +90,8 @@ const en = {
     you: 'You',
     mentioned: 'mentioned',
     cleared: 'Conversation cleared.',
+    cancelled: 'Request cancelled.',
+    stop: 'Stop',
   },
 
   shell: {
@@ -111,6 +126,7 @@ const en = {
     aiWelcome: 'Hello! I can help you with terminal commands. Ask me anything!',
     askAi: 'Ask AI assistant...',
     toolLaunched: 'Tool launched',
+    toolResult: 'Result',
   },
 
   config: {
@@ -166,6 +182,8 @@ const en = {
     installed: 'Installed',
     missing: 'Missing',
     editProfile: 'Edit',
+    profileInfo: 'Personal Info',
+    profilePrefs: 'Preferences',
     cancel: 'Cancel',
     editProvider: 'Configure',
     validateKey: 'Validate',

web/src/i18n/fr.js

@@ -22,7 +22,9 @@ const fr = {
 
   dashboard: {
     systemOverview: 'Vue d\u2019ensemble du syst\u00e8me',
-    tools: 'outils',
+    tools: 'Outils',
+    activity: 'Activit\u00e9',
+    toolsCount: '{count} outils install\u00e9s',
     installed: 'Install\u00e9',
     missing: 'Manquant',
     quickActions: 'Actions rapides',
@@ -39,9 +41,20 @@ const fr = {
     installStarted: 'Installation lanc\u00e9e. Rescan en cours...',
     done: 'Termin\u00e9.',
     scanComplete: 'Scan termin\u00e9.',
+    scanFailed: '\u00c9chec du scan',
     updatesCount: '{count} mises \u00e0 jour disponibles.',
     allUpToDate: 'Tous les outils sont \u00e0 jour.',
     mcpConfigured: 'MCP configur\u00e9.',
+    status: 'Statut',
+    noTools: 'Aucun outil d\u00e9tect\u00e9. Ex\u00e9cutez un scan.',
+    clearLog: 'Effacer',
+    noActivity: 'Aucune activit\u00e9 r\u00e9cente.',
+    rescanning: 'Scan en cours...',
+    install: 'Installer',
+    installFailed: '\u00c9chec de l\u2019installation',
+    checkUpdatesFailed: '\u00c9chec de la v\u00e9rification',
+    configuringMCP: 'Configuration MCP en cours...',
+    mcpConfigFailed: '\u00c9chec de la configuration MCP',
   },
 
   studio: {
@@ -77,6 +90,8 @@ const fr = {
     you: 'Vous',
     mentioned: 'mentionn\u00e9',
     cleared: 'Conversation effac\u00e9e.',
+    cancelled: 'Requ\u00eate annul\u00e9e.',
+    stop: 'Stop',
   },
 
   shell: {
@@ -111,6 +126,7 @@ const fr = {
     aiWelcome: 'Bonjour ! Je peux vous aider avec les commandes du terminal. Demandez-moi n\'importe quoi !',
     askAi: 'Interroger l\'assistant IA...',
     toolLaunched: 'Outil lanc\u00e9',
+    toolResult: 'R\u00e9sultat',
   },
 
   config: {
@@ -120,7 +136,7 @@ const fr = {
       terminal: 'Terminal',
       updates: 'Mises \u00e0 jour',
       locale: 'Langue & Clavier',
-      skills: 'Comp\u00e9ENCES',
+      skills: 'Compétences',
       system: 'Syst\u00e8me',
     },
     profile: 'Profil',
@@ -144,7 +160,7 @@ const fr = {
     save: 'Enregistrer',
     saved: 'Enregistr\u00e9 !',
     error: 'Erreur',
-    skills: 'Comp\u00e9ENCES',
+    skills: 'Compétences',
     noSkills: 'Aucune comp\u00e9tence install\u00e9e.',
     runSkillsInit: 'Ex\u00e9cutez muyue skills init',
     language: 'Langue',
@@ -166,6 +182,8 @@ const fr = {
     installed: 'Install\u00e9',
     missing: 'Manquant',
     editProfile: 'Modifier',
+    profileInfo: 'Informations personnelles',
+    profilePrefs: 'Préférences',
     editProvider: 'Configurer',
     validateKey: 'Valider',
     validating: 'V\u00e9rification...',

web/src/styles/global.css

@@ -154,7 +154,9 @@ input::placeholder { color: var(--text-disabled); }
 
 .header-clock { font-family: var(--font-mono); font-size: 12px; color: var(--accent); font-weight: 600; }
 
-.content { flex: 1; overflow: hidden; }
+.content { flex: 1; overflow: hidden; position: relative; }
+.content > div { height: 100%; }
+.tab-hidden { display: none; }
 
 .statusbar {
   height: 28px;
@@ -169,6 +171,12 @@ input::placeholder { color: var(--text-disabled); }
   color: var(--text-disabled);
 }
 .statusbar-left, .statusbar-right { display: flex; align-items: center; gap: 12px; }
+.statusbar-sudo {
+  font-size: 10px; font-weight: 700; font-family: var(--font-mono);
+  padding: 1px 6px; border-radius: 3px;
+  background: rgba(239, 68, 68, 0.15); color: #ef4444; border: 1px solid rgba(239, 68, 68, 0.3);
+  text-transform: uppercase; letter-spacing: 0.5px;
+}
 .statusbar-shortcut { display: inline-flex; align-items: center; gap: 4px; }
 .statusbar-shortcut kbd {
   display: inline-block; padding: 1px 5px; border-radius: 3px;
@@ -268,8 +276,8 @@ input::placeholder { color: var(--text-disabled); }
 .sidebar-tab:hover { background: var(--bg-card); color: var(--text-primary); }
 .sidebar-tab.active { background: var(--accent); color: #fff; font-weight: 600; }
 
-.shell-layout { display: flex; height: 100%; }
-.shell-terminal-col { flex: 1; display: flex; flex-direction: column; min-width: 0; min-height: 0; overflow: hidden; }
+.shell-layout { display: flex; height: 100%; overflow: hidden; }
+.shell-terminal-col { flex: 1; display: flex; flex-direction: column; min-width: 0; overflow: hidden; }
 
 .shell-tabs-bar {
   display: flex; align-items: center; background: var(--bg-surface);
@@ -374,23 +382,47 @@ input::placeholder { color: var(--text-disabled); }
 }
 .shell-menu-divider { height: 1px; background: var(--border); margin: 4px 6px; }
 
-.shell-xterm-wrapper { flex: 1; background: var(--bg); overflow: hidden; position: relative; }
+.shell-xterm-wrapper { flex: 1; min-height: 0; background: var(--bg); overflow: hidden; position: relative; }
 .shell-xterm-instance {
-  position: absolute; inset: 0; padding: 4px;
-  display: block !important;
+  position: absolute;
+  inset: 0;
+  visibility: hidden;
+  pointer-events: none;
 }
-.shell-xterm-instance .xterm { height: 100%; padding: 4px; }
+.shell-xterm-instance.active {
+  visibility: visible;
+  pointer-events: auto;
+}
+.shell-xterm-instance .xterm { height: 100%; }
 
 .connection-dot { width: 8px; height: 8px; border-radius: 50%; display: inline-block; flex-shrink: 0; }
 .connection-dot.on { background: var(--success); box-shadow: 0 0 6px var(--success); }
 .connection-dot.off { background: var(--error); }
 
-.shell-ai-col { width: 320px; border-left: 1px solid var(--border); background: var(--bg-surface); display: flex; flex-direction: column; flex-shrink: 0; }
-.ai-panel-header { padding: 12px 16px; border-bottom: 1px solid var(--border); font-weight: 700; font-size: 13px; color: var(--accent); }
+.shell-tab.ai-tab .shell-tab-name { color: var(--accent); }
+.shell-tab.ai-tab { border-bottom-color: var(--accent); }
+
+.shell-ai-col { width: 320px; max-width: 320px; border-left: 1px solid var(--border); background: var(--bg-surface); display: flex; flex-direction: column; flex-shrink: 0; overflow: hidden; }
+.ai-panel-header { padding: 12px 16px; border-bottom: 1px solid var(--border); font-weight: 700; font-size: 13px; color: var(--accent); display: flex; align-items: center; justify-content: space-between; }
+.shell-analyze-btn {
+  display: flex; align-items: center; gap: 4px;
+  padding: 4px 10px; border-radius: var(--radius);
+  background: transparent; border: 1px solid var(--accent-dim);
+  color: var(--accent); font-size: 11px; font-weight: 600;
+  cursor: pointer; transition: all 0.15s;
+}
+.shell-analyze-btn:hover:not(:disabled) { background: var(--accent-bg); }
+.shell-analyze-btn:disabled { opacity: 0.4; cursor: not-allowed; }
+.shell-ai-token-bar { display: flex; align-items: center; gap: 8px; padding: 6px 12px; border-bottom: 1px solid var(--border); }
+.shell-ai-token-track { flex: 1; height: 3px; background: var(--bg-input); border-radius: 2px; overflow: hidden; }
+.shell-ai-token-fill { height: 100%; background: var(--accent); border-radius: 2px; transition: width 0.4s, background 0.3s; }
+.shell-ai-token-fill.warn { background: var(--warning); }
+.shell-ai-token-text { font-size: 10px; font-family: var(--font-mono); color: var(--text-tertiary); white-space: nowrap; }
 .ai-panel-messages { flex: 1; overflow-y: auto; padding: 12px; display: flex; flex-direction: column; gap: 8px; }
 .ai-message { padding: 8px 12px; border-radius: var(--radius); font-size: 13px; line-height: 1.5; word-break: break-word; }
-.ai-message.ai { background: var(--bg-card); border-left: 3px solid var(--accent); }
-.ai-message.user { background: var(--accent-bg); border-left: 3px solid var(--accent-muted); }
+.ai-message.assistant { background: var(--bg-card); border-left: 3px solid var(--accent); }
+.ai-message.system { background: var(--bg-elevated); border-left: 3px solid var(--info); font-style: italic; color: var(--text-tertiary); font-size: 12px; }
+.ai-message.assistant { background: var(--bg-card); border-left: 3px solid var(--accent); }
 .ai-message.thinking { background: var(--bg-elevated); border-left: 3px solid var(--info); font-style: italic; color: var(--text-tertiary); }
 .ai-message.tool { background: var(--bg-elevated); border-left: 3px solid var(--warning); }
 .ai-message.tool .tool-name { font-weight: 700; color: var(--warning); }
@@ -398,6 +430,46 @@ input::placeholder { color: var(--text-disabled); }
 .ai-panel-input { display: flex; gap: 6px; padding: 10px 12px; border-top: 1px solid var(--border); }
 .ai-panel-input input { flex: 1; font-size: 13px; padding: 6px 10px; }
 
+.shell-code-block {
+  background: var(--bg); border: 1px solid var(--border); border-radius: var(--radius);
+  margin: 8px 0 4px; overflow: hidden;
+}
+.shell-code-block pre {
+  padding: 10px 12px; font-family: var(--font-mono); font-size: 12px; line-height: 1.5;
+  overflow-x: auto; color: var(--text-primary); margin: 0;
+}
+.shell-code-lang {
+  padding: 3px 10px; font-size: 10px; font-weight: 600; color: var(--text-tertiary);
+  background: var(--bg-surface); border-bottom: 1px solid var(--border);
+  text-transform: uppercase; letter-spacing: 0.5px;
+}
+.shell-code-actions {
+  display: flex; border-top: 1px solid var(--border); background: var(--bg-surface);
+}
+.shell-code-actions button {
+  flex: 1; display: flex; align-items: center; justify-content: center; gap: 4px;
+  padding: 5px 0; background: transparent; border: none; border-right: 1px solid var(--border);
+  color: var(--text-tertiary); font-size: 11px; cursor: pointer; transition: all 0.1s;
+  font-family: var(--font-sans);
+}
+.shell-code-actions button:last-child { border-right: none; }
+.shell-code-actions button:hover { background: var(--accent-bg); color: var(--accent); }
+
+.shell-analysis-modal {
+  background: var(--bg-elevated); border: 1px solid var(--border);
+  border-radius: var(--radius-lg); width: 720px; max-width: 90vw; max-height: 80vh;
+  display: flex; flex-direction: column; overflow: hidden;
+}
+.shell-analysis-modal-header {
+  display: flex; align-items: center; justify-content: space-between;
+  padding: 14px 20px; border-bottom: 1px solid var(--border);
+  font-weight: 700; font-size: 15px; color: var(--accent);
+}
+.shell-analysis-modal-body {
+  flex: 1; overflow-y: auto; padding: 20px; font-size: 14px; line-height: 1.5;
+  color: var(--text-primary); word-break: break-word;
+}
+
 .shell-modal-overlay {
   position: fixed; inset: 0; background: rgba(0,0,0,0.6);
   display: flex; align-items: center; justify-content: center; z-index: 1000;
@@ -423,12 +495,16 @@ input::placeholder { color: var(--text-disabled); }
 .config-window { display: flex; flex-direction: column; height: 100%; overflow: hidden; }
 
 .config-tabs-bar {
-  display: flex; gap: 4px; padding: 12px 20px 0; background: var(--bg-surface);
+  display: flex; gap: 4px; padding: 12px 20px; background: var(--bg-surface);
   border-bottom: 1px solid var(--border); flex-shrink: 0;
 }
 
 .config-panel-area { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
 .config-panel-body { flex: 1; overflow-y: auto; padding: 16px 28px 28px; }
+.config-profile-center {
+  max-width: 540px; margin: 0 auto; width: 100%;
+  display: flex; flex-direction: column; gap: 12px;
+}
 
 .config-card {
   background: var(--bg-card); border: 1px solid var(--border);
@@ -470,6 +546,9 @@ input::placeholder { color: var(--text-disabled); }
 .provider-card-name { font-weight: 600; color: var(--text-primary); font-size: 14px; }
 .provider-card-actions { display: flex; gap: 8px; flex-shrink: 0; }
 .provider-card-meta { display: flex; gap: 16px; font-size: 12px; color: var(--text-tertiary); font-family: var(--font-mono); margin-top: 8px; }
+.provider-card-model { display: flex; align-items: center; justify-content: center; gap: 8px; margin-top: 12px; padding-top: 10px; border-top: 1px solid var(--border); }
+.provider-card-model-label { font-size: 11px; color: var(--text-tertiary); text-transform: uppercase; letter-spacing: 0.5px; }
+.provider-card-model-value { font-size: 14px; font-weight: 600; font-family: var(--font-mono); color: var(--accent); }
 .provider-card-form { margin-top: 12px; padding-top: 12px; border-top: 1px solid var(--border); }
 
 .provider-setup-hint {
@@ -494,10 +573,24 @@ input::placeholder { color: var(--text-disabled); }
 .config-update-name { color: var(--text-primary); font-weight: 600; font-size: 13px; min-width: 100px; }
 .config-update-versions { color: var(--text-tertiary); font-size: 12px; font-family: var(--font-mono); }
 
-.config-skill-row { display: flex; align-items: center; gap: 10px; padding: 8px 0; border-bottom: 1px solid var(--border); font-size: 13px; }
-.config-skill-row:last-child { border-bottom: none; }
-.config-skill-name { color: var(--text-primary); font-weight: 600; min-width: 120px; }
-.config-skill-desc { color: var(--text-tertiary); flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.skill-tiles { display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 12px; }
+.skill-tile { background: var(--bg-card); border: 1px solid var(--border); border-radius: var(--radius); padding: 14px; cursor: pointer; transition: border-color 0.15s; }
+.skill-tile:hover { border-color: var(--accent-dim); }
+.skill-tile-name { font-weight: 600; color: var(--text-primary); font-size: 14px; margin-bottom: 6px; }
+.skill-tile-desc { font-size: 12px; color: var(--text-tertiary); overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
+.skill-tile-tags { display: flex; gap: 6px; flex-wrap: wrap; margin-top: 10px; }
+.skill-detail-overlay { position: fixed; inset: 0; background: rgba(0,0,0,0.7); z-index: 50; display: flex; align-items: center; justify-content: center; }
+.skill-detail-panel { background: var(--bg-elevated); border: 1px solid var(--border); border-radius: var(--radius-lg); width: 90%; max-width: 600px; max-height: 80vh; display: flex; flex-direction: column; overflow: hidden; }
+.skill-detail-header { display: flex; align-items: center; justify-content: space-between; padding: 16px 20px; border-bottom: 1px solid var(--border); }
+.skill-detail-name { font-weight: 600; font-size: 16px; color: var(--text-primary); }
+.skill-detail-body { flex: 1; overflow-y: auto; padding: 20px; }
+.skill-detail-section { margin-bottom: 16px; }
+.skill-detail-label { font-size: 11px; font-weight: 700; color: var(--accent); text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 6px; }
+.skill-detail-meta { display: flex; gap: 8px; flex-wrap: wrap; }
+.skill-detail-content { font-family: var(--font-mono); font-size: 12px; color: var(--text-secondary); white-space: pre-wrap; background: var(--bg-card); border: 1px solid var(--border); border-radius: var(--radius); padding: 12px; line-height: 1.6; max-height: 300px; overflow-y: auto; }
+.skill-detail-deps { display: flex; flex-direction: column; gap: 6px; }
+.skill-detail-dep { font-size: 12px; color: var(--text-tertiary); display: flex; align-items: center; gap: 8px; }
+.skill-detail-dep .badge { font-size: 10px; }
 .chip-row { display: flex; gap: 8px; flex-wrap: wrap; }
 
 .config-toast {
@@ -525,10 +618,151 @@ input::placeholder { color: var(--text-disabled); }
 
 .empty-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 40px 20px; color: var(--text-disabled); font-size: 13px; text-align: center; gap: 8px; }
 
+/* ── Dashboard Grid ── */
+.dash-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-template-rows: repeat(2, 1fr);
+  gap: 12px;
+  padding: 16px;
+  height: 100%;
+  overflow: hidden;
+}
+.dash-card {
+  position: relative;
+  background: var(--bg-card); border: 1px solid var(--border);
+  border-radius: var(--radius-lg); padding: 14px 16px;
+  display: flex; flex-direction: column; justify-content: center; gap: 8px;
+  overflow: hidden;
+}
+
+.dash-span-2 { grid-column: span 2; }
+.dash-card-head {
+  display: flex; align-items: center; justify-content: space-between;
+  margin-bottom: 4px;
+}
+.dash-label {
+  font-size: 11px; font-weight: 700; color: var(--accent);
+  text-transform: uppercase; letter-spacing: 0.5px;
+}
+.dash-count {
+  font-size: 10px; font-family: var(--font-mono);
+  background: var(--bg-input); padding: 1px 6px; border-radius: 10px;
+}
+.dash-count.warn { background: var(--accent-bg); color: var(--accent); }
+
+/* Tools row */
+.dash-tools-row {
+  display: flex; flex-wrap: wrap; gap: 6px;
+}
+.dash-tool-tag {
+  font-size: 11px; font-family: var(--font-mono);
+  padding: 3px 8px; border-radius: var(--radius);
+  background: var(--bg-surface);
+}
+.dash-tool-tag.ok { color: var(--success); }
+.dash-tool-tag.missing { color: var(--error); }
+
+/* Quota */
+.dash-quota-list { display: flex; flex-direction: column; gap: 6px; max-height: 270px; overflow-y: auto; }
+.dash-quota-row { display: flex; align-items: center; gap: 8px; }
+.dash-quota-name {
+  font-size: 11px; font-weight: 600; color: var(--text-primary);
+  min-width: 80px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+}
+.dash-bar {
+  flex: 1; height: 4px; background: var(--bg-input); border-radius: 2px; overflow: hidden;
+}
+.dash-bar-fill {
+  height: 100%; background: var(--accent); border-radius: 2px;
+  transition: width 0.3s;
+}
+.dash-quota-val {
+  font-size: 10px; font-family: var(--font-mono); color: var(--text-tertiary);
+  white-space: nowrap;
+}
+
+/* Processes */
+.dash-proc-list { display: flex; flex-direction: column; gap: 4px; max-height: 270px; overflow-y: auto; }
+.dash-proc-row {
+  display: flex; justify-content: space-between; align-items: center;
+  padding: 4px 0;
+}
+.dash-proc-name {
+  font-size: 11px; font-weight: 600; color: var(--text-primary);
+  font-family: var(--font-mono); flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+}
+.dash-proc-res {
+  font-size: 10px; font-family: var(--font-mono); color: var(--text-tertiary); flex-shrink: 0;
+}
+
+/* Commands */
+.dash-cmd-card .dash-cmd-list { max-height: 220px; }
+.dash-cmd-list { display: flex; flex-direction: column; gap: 2px; overflow-y: auto; }
+.dash-cmd-row {
+  display: flex; align-items: center; justify-content: space-between; gap: 8px;
+  padding: 5px 8px; border-radius: var(--radius-sm);
+  background: var(--bg-surface); cursor: pointer;
+  transition: background 0.12s;
+}
+.dash-cmd-row:hover { background: var(--accent-bg); }
+.dash-cmd-left { display: flex; flex-direction: column; gap: 2px; flex: 1; min-width: 0; }
+.dash-cmd-text {
+  font-size: 11px; font-family: var(--font-mono); color: var(--text-primary);
+  white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+}
+.dash-cmd-time { font-size: 9px; color: var(--text-disabled); }
+.dash-cmd-copy { font-size: 13px; color: var(--text-disabled); flex-shrink: 0; }
+.dash-cmd-row:hover .dash-cmd-copy { color: var(--accent); }
+
+.dash-cmd-freq { display: flex; flex-direction: column; gap: 6px; margin-bottom: 10px; padding-bottom: 10px; border-bottom: 1px solid var(--border); }
+.dash-cmd-freq-title { font-size: 10px; font-weight: 700; text-transform: uppercase; color: var(--text-disabled); letter-spacing: 0.05em; margin-bottom: 2px; }
+.dash-cmd-freq-row {
+  display: flex; align-items: center; gap: 8px; cursor: pointer;
+  padding: 3px 4px; border-radius: var(--radius-sm);
+  transition: background 0.12s;
+}
+.dash-cmd-freq-row:hover { background: var(--accent-bg); }
+.dash-cmd-freq-name { font-size: 12px; font-weight: 600; font-family: var(--font-mono); color: var(--text-primary); width: 100px; flex-shrink: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.dash-cmd-freq-bar-wrap { flex: 1; height: 6px; background: var(--bg-input); border-radius: 3px; overflow: hidden; }
+.dash-cmd-freq-bar { height: 100%; background: var(--accent); border-radius: 3px; transition: width 0.3s ease; }
+.dash-cmd-freq-count { font-size: 10px; font-family: var(--font-mono); color: var(--accent); width: 28px; text-align: right; flex-shrink: 0; }
+
+.dash-cmd-top { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 8px; }
+
+/* Services */
+.dash-services { display: flex; flex-direction: column; gap: 6px; }
+.dash-svc-row {
+  display: flex; justify-content: space-between; align-items: center;
+  padding: 4px 0;
+}
+.dash-svc-name { font-size: 12px; font-weight: 600; color: var(--text-primary); }
+.dash-svc-val { font-size: 11px; font-family: var(--font-mono); color: var(--text-tertiary); }
+.dash-svc-issues { margin-top: 4px; }
+.dash-svc-issue { font-size: 10px; color: var(--warning); padding: 2px 0; }
+
+/* Updates */
+.dash-updates-list { display: flex; flex-direction: column; gap: 4px; }
+.dash-update-row {
+  display: flex; justify-content: space-between; align-items: center;
+}
+.dash-update-name { font-size: 12px; font-weight: 600; color: var(--text-primary); }
+.dash-update-ver { font-size: 11px; font-family: var(--font-mono); color: var(--text-tertiary); }
+
+.dash-empty { font-size: 11px; color: var(--text-disabled); }
+
+/* Graph */
+.dash-graph-wrap { display: flex; flex-direction: column; gap: 2px; }
+.dash-graph-header { display: flex; justify-content: space-between; align-items: center; }
+.dash-graph-label { font-size: 9px; color: var(--text-disabled); text-transform: uppercase; }
+.dash-graph-value { font-size: 10px; font-family: var(--font-mono); font-weight: 600; }
+.dash-graph-svg { width: 100%; height: 32px; }
+.dash-graph-empty { font-size: 10px; color: var(--text-disabled); text-align: center; padding: 8px 0; }
+
+/* Legacy dashboard kept for reference */
 .dashboard-layout { display: flex; flex-direction: column; height: 100%; }
 .dashboard-content { flex: 1; overflow-y: auto; }
 .dashboard-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 20px; padding: 24px; }
-
 .dashboard-section {
   background: var(--bg-card); border: 1px solid var(--border);
   border-radius: var(--radius-lg); padding: 20px; transition: border-color 0.2s;
@@ -540,11 +774,8 @@ input::placeholder { color: var(--text-disabled); }
   font-size: 12px; font-weight: 700; color: var(--accent); text-transform: uppercase;
   letter-spacing: 0.5px;
 }
-
 .dashboard-workflows-inline { display: grid; grid-template-columns: 1fr 1fr; gap: 20px; }
-
 .dashboard-notifications-inline { display: flex; flex-direction: column; gap: 2px; }
-
 .dashboard-notifications { padding: 0; }
 .notif-row {
   display: flex; align-items: flex-start; gap: 12px;
@@ -557,7 +788,6 @@ input::placeholder { color: var(--text-disabled); }
 .notif-ok .notif-text { color: var(--success); }
 .notif-warn .notif-text { color: var(--warning); }
 .notif-error .notif-text { color: var(--error); }
-
 .dashboard-workflows { padding: 0; display: flex; flex-direction: column; gap: 24px; }
 .workflow-section { }
 .section-label {
@@ -579,7 +809,17 @@ input::placeholder { color: var(--text-disabled); }
 
 /* ── Studio Feed ── */
 .studio-feed-layout { display: flex; flex-direction: column; height: 100%; overflow: hidden; }
-.studio-feed { flex: 1; overflow-y: auto; padding: 20px 24px; display: flex; flex-direction: column; gap: 4px; }
+.studio-feed-scroll-wrap { flex: 1; position: relative; overflow: hidden; }
+.studio-feed { height: 100%; overflow-y: auto; padding: 20px 24px; display: flex; flex-direction: column; gap: 4px; }
+.studio-scroll-btns { position: absolute; right: 16px; bottom: 16px; display: flex; flex-direction: column; gap: 4px; z-index: 10; }
+.studio-scroll-btn {
+  width: 32px; height: 32px; border-radius: 50%; padding: 0;
+  display: flex; align-items: center; justify-content: center;
+  background: var(--bg-card); border: 1px solid var(--border);
+  color: var(--text-tertiary); cursor: pointer; transition: all 0.15s;
+  opacity: 0.7;
+}
+.studio-scroll-btn:hover { background: var(--accent-bg); color: var(--accent); border-color: var(--accent-dim); opacity: 1; }
 .feed-loading { display: flex; align-items: center; justify-content: center; padding: 60px 0; }
 .feed-item { display: flex; gap: 10px; padding: 8px 12px; border-radius: var(--radius); animation: fadeIn 0.15s ease-out; }
 .feed-item:hover { background: var(--bg-card); }
@@ -601,14 +841,28 @@ input::placeholder { color: var(--text-disabled); }
 }
 .feed-role { font-size: 11px; font-weight: 700; color: var(--accent); text-transform: uppercase; letter-spacing: 0.5px; }
 .feed-time { font-size: 10px; color: var(--text-disabled); font-family: var(--font-mono); }
-.feed-content { font-size: 14px; line-height: 1.7; color: var(--text-primary); word-break: break-word; }
+.feed-content { font-size: 14px; line-height: 1.5; color: var(--text-primary); word-break: break-word; }
 .feed-system-badge { width: 6px; height: 6px; border-radius: 50%; background: var(--accent-dim); flex-shrink: 0; }
 .feed-system-text { font-size: 12px; color: var(--text-tertiary); font-style: italic; flex: 1; }
+.feed-system-text.compressed { color: var(--accent); font-style: normal; }
+.feed-compressed-indicator {
+  display: flex; align-items: center; gap: 8px;
+  padding: 10px 12px; margin: 4px 0;
+  background: var(--bg-card); border: 1px solid var(--border);
+  border-radius: var(--radius); cursor: pointer;
+  transition: all 0.2s ease;
+}
+.feed-compressed-indicator:hover { background: var(--bg-hover); border-color: var(--accent-dim); }
+.feed-compressed-indicator svg { color: var(--accent); flex-shrink: 0; }
+.feed-compressed-text { font-size: 12px; color: var(--text-tertiary); flex: 1; }
+.feed-compressed-count { font-size: 11px; color: var(--text-disabled); font-family: var(--font-mono); }
 
 .feed-thinking-block {
   background: var(--bg-surface); border: 1px solid var(--border); border-left: 2px solid var(--accent-dim);
   border-radius: var(--radius); margin: 6px 0 8px; overflow: hidden;
   transition: all 0.3s ease;
+  max-height: 200px;
+  overflow-y: auto;
 }
 .feed-thinking-block.active {
   border-left-color: var(--warning);
@@ -647,11 +901,11 @@ input::placeholder { color: var(--text-disabled); }
   background: var(--bg-surface); border-bottom: 1px solid var(--border); text-transform: uppercase; letter-spacing: 0.5px;
 }
 .inline-code { background: var(--bg-input); padding: 2px 6px; border-radius: 4px; font-family: var(--font-mono); font-size: 13px; color: var(--accent-muted); }
-.msg-h3 { font-size: 16px; font-weight: 700; color: var(--text-primary); margin: 16px 0 8px; display: block; }
-.msg-h4 { font-size: 14px; font-weight: 700; color: var(--text-secondary); margin: 12px 0 6px; display: block; }
-.msg-bullet { display: block; padding-left: 16px; position: relative; margin: 2px 0; }
+.msg-h3 { font-size: 16px; font-weight: 700; color: var(--text-primary); margin: 10px 0 4px; display: block; }
+.msg-h4 { font-size: 14px; font-weight: 700; color: var(--text-secondary); margin: 8px 0 3px; display: block; }
+.msg-bullet { display: block; padding-left: 16px; position: relative; margin: 1px 0; }
 .msg-bullet::before { content: '\2022'; position: absolute; left: 4px; color: var(--accent); }
-.msg-step { display: flex; gap: 8px; align-items: baseline; margin: 3px 0; }
+.msg-step { display: flex; gap: 8px; align-items: baseline; margin: 1px 0; }
 .msg-step-num { color: var(--accent); font-weight: 700; font-family: var(--font-mono); font-size: 13px; flex-shrink: 0; min-width: 20px; }
 .studio-cursor { display: inline-block; width: 8px; height: 16px; background: var(--accent); margin-left: 2px; vertical-align: text-bottom; animation: blink 0.8s step-end infinite; }
 @keyframes blink { 50% { opacity: 0; } }
@@ -661,6 +915,22 @@ input::placeholder { color: var(--text-disabled); }
 .studio-thinking span:nth-child(3) { animation-delay: 0.3s; }
 @keyframes bounce { 0%, 80%, 100% { transform: translateY(0); opacity: 0.4; } 40% { transform: translateY(-6px); opacity: 1; } }
 .studio-input-area { padding: 12px 20px 8px; border-top: 1px solid var(--border); background: var(--bg-surface); }
+.studio-token-bar { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
+.studio-token-track { flex: 1; height: 3px; background: var(--bg-input); border-radius: 2px; overflow: hidden; }
+.studio-token-fill { height: 100%; background: var(--accent); border-radius: 2px; transition: width 0.4s, background 0.3s; }
+.studio-token-fill.warn { background: var(--warning); }
+.studio-token-fill.compressed { height: 2px; }
+.studio-token-fill.animating { animation: compress-pulse 0.6s ease-in-out; }
+@keyframes compress-pulse {
+  0% { height: 3px; opacity: 1; }
+  50% { height: 5px; opacity: 0.8; background: var(--accent-light); }
+  100% { height: 2px; opacity: 1; }
+}
+.studio-token-text { font-size: 10px; font-family: var(--font-mono); color: var(--text-tertiary); white-space: nowrap; }
+.studio-token-text.compressed { font-size: 9px; }
+.studio-token-track.compressed { height: 2px; }
+.studio-token-bar.compressed { margin-bottom: 4px; }
+
 .studio-input-row { display: flex; gap: 8px; align-items: flex-end; }
 .studio-input-row textarea {
   flex: 1; resize: none; min-height: 42px; max-height: 200px; padding: 10px 14px;
@@ -677,4 +947,114 @@ input::placeholder { color: var(--text-disabled); }
 }
 .studio-send-btn:hover:not(:disabled) { background: var(--accent-bright); border-color: var(--accent-bright); }
 .studio-send-btn:disabled { opacity: 0.3; cursor: not-allowed; }
+.studio-stop-btn {
+  width: 42px; height: 42px; padding: 0; display: flex; align-items: center; justify-content: center;
+  border-radius: var(--radius); background: var(--error); color: #fff; border: 1px solid var(--error);
+  cursor: pointer; transition: all 0.15s; flex-shrink: 0;
+}
+.studio-stop-btn:hover { opacity: 0.8; }
 .studio-input-hint { font-size: 11px; color: var(--text-disabled); text-align: center; margin-top: 6px; }
+
+/* ── Collapsed Messages ── */
+.feed-collapsed-messages {
+  display: flex; align-items: center; gap: 10px;
+  padding: 8px 16px; margin: 4px 0;
+  background: linear-gradient(135deg, var(--bg-surface), var(--bg-elevated));
+  border: 1px dashed var(--border-accent);
+  border-radius: var(--radius); cursor: pointer;
+  transition: all 0.2s ease;
+}
+.feed-collapsed-messages:hover { background: var(--bg-hover); border-color: var(--accent); }
+.feed-collapsed-messages svg { color: var(--accent); flex-shrink: 0; }
+.feed-collapsed-text { font-size: 11px; color: var(--text-tertiary); flex: 1; }
+.feed-collapsed-count { font-size: 10px; color: var(--text-disabled); font-family: var(--font-mono); }
+.feed-expanded-messages { animation: fadeIn 0.2s ease-out; }
+
+/* ── Studio Tool Blocks ── */
+.studio-tool-block {
+  background: var(--bg-surface);
+  border: 1px solid var(--border);
+  border-left: 3px solid var(--accent-dim);
+  border-radius: var(--radius);
+  margin: 6px 0;
+  overflow: hidden;
+  transition: all 0.3s ease;
+}
+.studio-tool-block.running {
+  border-left-color: var(--warning);
+}
+.studio-tool-block.error {
+  border-left-color: var(--error);
+  background: rgba(255, 23, 68, 0.05);
+}
+.studio-tool-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 10px;
+  background: var(--bg-card);
+  border-bottom: 1px solid var(--border);
+  font-size: 12px;
+}
+.studio-tool-icon {
+  font-size: 14px;
+  flex-shrink: 0;
+}
+.studio-tool-name {
+  color: var(--text-tertiary);
+  font-weight: 600;
+  font-family: var(--font-mono);
+  font-size: 12px;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.studio-tool-spinner {
+  display: inline-flex;
+  gap: 2px;
+  margin-left: 4px;
+}
+.studio-tool-spinner span {
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background: var(--warning);
+  animation: bounce 1.2s ease-in-out infinite;
+}
+.studio-tool-spinner span:nth-child(2) { animation-delay: 0.15s; }
+.studio-tool-spinner span:nth-child(3) { animation-delay: 0.3s; }
+.studio-tool-status {
+  font-weight: 700;
+  font-size: 14px;
+  flex-shrink: 0;
+}
+.studio-tool-status.ok { color: var(--success); }
+.studio-tool-status.error { color: var(--error); }
+.studio-tool-args {
+  padding: 6px 10px;
+  font-size: 12px;
+  font-family: var(--font-mono);
+  color: var(--text-tertiary);
+  white-space: pre-wrap;
+  word-break: break-all;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-bottom: 1px solid var(--border);
+  background: var(--bg-elevated);
+}
+.studio-tool-result {
+  max-height: 200px;
+  overflow-y: auto;
+}
+.studio-tool-result pre {
+  padding: 8px 10px;
+  font-family: var(--font-mono);
+  font-size: 12px;
+  line-height: 1.5;
+  color: var(--text-secondary);
+  margin: 0;
+  white-space: pre-wrap;
+  word-break: break-word;
+  background: var(--bg);
+}