diff --git a/.gitea/workflows/ci-develop.yml b/.gitea/workflows/ci-develop.yml index 7f461e2..9b86164 100644 --- a/.gitea/workflows/ci-develop.yml +++ b/.gitea/workflows/ci-develop.yml @@ -68,6 +68,13 @@ jobs: echo "beta_num=${BETA_NUM}" >> $GITHUB_OUTPUT echo "Building beta release: ${VERSION}" + - name: Generate Windows resource (icon) + run: | + go install github.com/akavel/rsrc@latest + RSRC="$(go env GOPATH)/bin/rsrc" + $RSRC -ico assets/muyue.ico -arch amd64 -o cmd/muyue/rsrc_windows_amd64.syso + $RSRC -ico assets/muyue.ico -arch arm64 -o cmd/muyue/rsrc_windows_arm64.syso + - name: Build (all platforms) run: | mkdir -p dist diff --git a/.gitea/workflows/ci-main.yml b/.gitea/workflows/ci-main.yml index 04e24bb..5fd9821 100644 --- a/.gitea/workflows/ci-main.yml +++ b/.gitea/workflows/ci-main.yml @@ -64,6 +64,13 @@ jobs: echo "base=${BASE_VERSION}" >> $GITHUB_OUTPUT echo "Building stable release: ${VERSION}" + - name: Generate Windows resource (icon) + run: | + go install github.com/akavel/rsrc@latest + RSRC="$(go env GOPATH)/bin/rsrc" + $RSRC -ico assets/muyue.ico -arch amd64 -o cmd/muyue/rsrc_windows_amd64.syso + $RSRC -ico assets/muyue.ico -arch arm64 -o cmd/muyue/rsrc_windows_arm64.syso + - name: Build (all platforms) run: | mkdir -p dist @@ -138,11 +145,12 @@ jobs: echo "sudo mv muyue-darwin-arm64 /usr/local/bin/muyue" echo "\`\`\`" echo "" - echo "**Windows (x86_64)**" + echo "**Windows (x86_64)** — sans privilèges admin, crée les raccourcis Bureau + Menu Démarrer :" echo "\`\`\`powershell" - echo "Invoke-WebRequest -Uri \"${DL_URL}/muyue-windows-amd64.zip\" -OutFile \"muyue.zip\"" - echo "Expand-Archive -Path \"muyue.zip\" -DestinationPath \".\"" - echo "Move-Item muyue-windows-amd64.exe C:\\Windows\\muyue.exe" + echo "\$dest = \"\$env:LOCALAPPDATA\\Muyue\"; New-Item -ItemType Directory -Force -Path \$dest | Out-Null" + echo "Invoke-WebRequest -Uri \"${DL_URL}/muyue-windows-amd64.zip\" -OutFile \"\$env:TEMP\\muyue.zip\"" + echo "Expand-Archive -Path \"\$env:TEMP\\muyue.zip\" -DestinationPath \$dest -Force" + echo "& \"\$dest\\muyue-windows-amd64.exe\" install-shortcuts" echo "\`\`\`" } > /tmp/stable_changelog.md echo "path=/tmp/stable_changelog.md" >> $GITHUB_OUTPUT diff --git a/.gitignore b/.gitignore index 5b64cac..35213a3 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ Thumbs.db *.exe *.test *.out +*.syso vendor/ # Config with secrets diff --git a/CHANGELOG.md b/CHANGELOG.md index cf4b9ae..eda75e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,43 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## v0.7.4 + +### Logo Muyue intégré + +- `LogoMuyue.png` ajouté à la racine + déclinaisons générées dans `assets/` (16/32/64/128/256/512 px) et `assets/muyue.ico` (multi-résolution 16-256 px). +- **Binaire Windows** : icône embarquée comme ressource Windows via `github.com/akavel/rsrc` au build CI (génération de `cmd/muyue/rsrc_windows_{amd64,arm64}.syso`). Conséquences : + - Explorateur Windows affiche l'icône Muyue sur le `.exe` + - Les raccourcis créés par `install-shortcuts` héritent de l'icône (via `IconLocation = "$exe,0"`) + - Aucune dépendance Go à runtime ; les `.syso` sont gitignorés et regénérés à chaque build +- **UI web** : favicon réel (16/32 px), apple-touch-icon (256 px) et logo affiché dans le header à côté de "MUYUE". +- Snippet d'install Windows : 1ʳᵉ ligne idempotente (`New-Item -ItemType Directory -Force`) pour gérer le cas d'une ré-exécution après install partielle. +- Préservation du logo source en pleine résolution (912×950 RGBA) — pas de perte d'information. + +## v0.7.3 + +### Onboarding — focus MiniMax + MiMo + +- L'étape `apikey` du wizard de premier lancement propose désormais **les deux clés** (MiniMax + MiMo) côte à côte ; au moins une doit être validée pour continuer. +- Les autres fournisseurs (OpenAI, Anthropic, Z.AI, Ollama) ne sont plus proposés dans le wizard — l'utilisateur les configure ensuite via l'onglet **Configuration** s'il le souhaite. Justification : pour les nouveaux utilisateurs, deux choix simples > six choix qui ralentissent le démarrage. +- Si MiniMax est validé, il devient le provider actif. Sinon, c'est MiMo. Si les deux sont validés, MiniMax reste actif (peut être basculé via `/model change` plus tard). + +### Install Windows — pas d'admin + raccourcis automatiques + +- **Avant** : la 3ᵉ ligne du snippet d'install (`Move-Item ... C:\Windows\muyue.exe`) échouait avec `UnauthorizedAccessException` sur PowerShell sans élévation. +- **Maintenant** : 4 lignes, toutes exécutables sans admin : + ```powershell + $dest = "$env:LOCALAPPDATA\Muyue" + Invoke-WebRequest -Uri ".../muyue-windows-amd64.zip" -OutFile "$env:TEMP\muyue.zip" + Expand-Archive -Path "$env:TEMP\muyue.zip" -DestinationPath $dest -Force + & "$dest\muyue-windows-amd64.exe" install-shortcuts + ``` +- Nouvelle commande `muyue install-shortcuts` (Windows uniquement) : + - crée `Muyue.lnk` sur le Bureau et dans le Menu Démarrer (résolus via `[Environment]::GetFolderPath`, robuste OneDrive / profils non-standards) ; + - utilise WScript.Shell COM via PowerShell pour générer les `.lnk` (pas de dépendance Go ajoutée) ; + - ajoute le dossier d'install au `PATH` utilisateur (scope User, pas de modif système). +- Une icône custom pourra être branchée plus tard en remplaçant la ressource embed du `.exe` ; pour l'instant, l'icône Windows par défaut du binaire est utilisée. + ## v0.7.2 ### Changes since v0.7.0 diff --git a/LogoMuyue.png b/LogoMuyue.png new file mode 100644 index 0000000..1733123 Binary files /dev/null and b/LogoMuyue.png differ diff --git a/assets/muyue-128.png b/assets/muyue-128.png new file mode 100644 index 0000000..18d863c Binary files /dev/null and b/assets/muyue-128.png differ diff --git a/assets/muyue-16.png b/assets/muyue-16.png new file mode 100644 index 0000000..c0e28a0 Binary files /dev/null and b/assets/muyue-16.png differ diff --git a/assets/muyue-256.png b/assets/muyue-256.png new file mode 100644 index 0000000..53b48a1 Binary files /dev/null and b/assets/muyue-256.png differ diff --git a/assets/muyue-32.png b/assets/muyue-32.png new file mode 100644 index 0000000..899347e Binary files /dev/null and b/assets/muyue-32.png differ diff --git a/assets/muyue-512.png b/assets/muyue-512.png new file mode 100644 index 0000000..7a55f5f Binary files /dev/null and b/assets/muyue-512.png differ diff --git a/assets/muyue-64.png b/assets/muyue-64.png new file mode 100644 index 0000000..ac3076b Binary files /dev/null and b/assets/muyue-64.png differ diff --git a/assets/muyue.ico b/assets/muyue.ico new file mode 100644 index 0000000..d4dfca1 Binary files /dev/null and b/assets/muyue.ico differ diff --git a/cmd/muyue/commands/install_shortcuts.go b/cmd/muyue/commands/install_shortcuts.go new file mode 100644 index 0000000..0ba3aab --- /dev/null +++ b/cmd/muyue/commands/install_shortcuts.go @@ -0,0 +1,151 @@ +package commands + +import ( + "fmt" + "os" + "os/exec" + "path/filepath" + "runtime" + + "github.com/spf13/cobra" +) + +// installShortcutsCmd creates desktop + Start Menu shortcuts on Windows so +// non-technical users can launch Muyue without opening a terminal. It also +// adds the install directory to the user's PATH (per-user, no admin). +// +// Implementation note: shortcut (.lnk) creation on Windows is most reliable +// via WScript.Shell COM. We invoke it via PowerShell — keeps the Go binary +// dependency-free and works on any Windows 10+ host. +var installShortcutsCmd = &cobra.Command{ + Use: "install-shortcuts", + Short: "Create Desktop + Start Menu shortcuts (Windows only) and add Muyue to PATH", + RunE: func(cmd *cobra.Command, args []string) error { + if runtime.GOOS != "windows" { + fmt.Println("install-shortcuts is a Windows-only command (no-op on this platform)") + return nil + } + + exe, err := os.Executable() + if err != nil { + return fmt.Errorf("locate executable: %w", err) + } + exe, _ = filepath.Abs(exe) + installDir := filepath.Dir(exe) + + fmt.Println("Installing Muyue shortcuts...") + fmt.Printf(" Executable : %s\n", exe) + + desktop, err := userShellFolder("Desktop") + if err != nil { + return fmt.Errorf("locate Desktop folder: %w", err) + } + startMenu, err := userShellFolder("Programs") + if err != nil { + return fmt.Errorf("locate Start Menu Programs folder: %w", err) + } + + desktopLnk := filepath.Join(desktop, "Muyue.lnk") + startLnk := filepath.Join(startMenu, "Muyue.lnk") + + if err := createWindowsShortcut(desktopLnk, exe, installDir, "Muyue — AI-powered dev environment"); err != nil { + return fmt.Errorf("create desktop shortcut: %w", err) + } + fmt.Printf(" Desktop : %s\n", desktopLnk) + + if err := createWindowsShortcut(startLnk, exe, installDir, "Muyue — AI-powered dev environment"); err != nil { + return fmt.Errorf("create Start Menu shortcut: %w", err) + } + fmt.Printf(" Start Menu : %s\n", startLnk) + + if err := addUserPATH(installDir); err != nil { + fmt.Fprintf(os.Stderr, " PATH : warning — could not add %s to user PATH: %v\n", installDir, err) + } else { + fmt.Printf(" PATH : added %s (open a new terminal to pick it up)\n", installDir) + } + + fmt.Println("\nDone — double-click the Muyue icon on your Desktop to launch.") + return nil + }, +} + +func init() { + rootCmd.AddCommand(installShortcutsCmd) +} + +// userShellFolder asks Windows for a user shell folder via PowerShell — +// resilient to OneDrive redirection and non-default profile locations. +// `which` is one of: Desktop, Programs (Start Menu Programs), StartMenu. +func userShellFolder(which string) (string, error) { + ps := fmt.Sprintf(`[Environment]::GetFolderPath('%s')`, which) + out, err := exec.Command("powershell", "-NoLogo", "-NoProfile", "-Command", ps).Output() + if err != nil { + return "", err + } + path := stripTrailingWhitespace(string(out)) + if path == "" { + return "", fmt.Errorf("empty path for %s", which) + } + return path, nil +} + +func stripTrailingWhitespace(s string) string { + for len(s) > 0 && (s[len(s)-1] == '\n' || s[len(s)-1] == '\r' || s[len(s)-1] == ' ' || s[len(s)-1] == '\t') { + s = s[:len(s)-1] + } + return s +} + +// createWindowsShortcut generates a .lnk via WScript.Shell COM. The arguments +// are passed through PowerShell variables (not interpolated into the script +// body) to avoid quoting issues with paths containing spaces or special chars. +func createWindowsShortcut(lnkPath, target, workingDir, description string) error { + script := ` +$lnk = $env:MUYUE_LNK +$target = $env:MUYUE_TARGET +$workdir = $env:MUYUE_WORKDIR +$desc = $env:MUYUE_DESC +$wsh = New-Object -ComObject WScript.Shell +$sc = $wsh.CreateShortcut($lnk) +$sc.TargetPath = $target +$sc.WorkingDirectory = $workdir +$sc.Description = $desc +$sc.IconLocation = "$target,0" +$sc.Save() +` + cmd := exec.Command("powershell", "-NoLogo", "-NoProfile", "-Command", script) + cmd.Env = append(os.Environ(), + "MUYUE_LNK="+lnkPath, + "MUYUE_TARGET="+target, + "MUYUE_WORKDIR="+workingDir, + "MUYUE_DESC="+description, + ) + out, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("powershell: %v: %s", err, string(out)) + } + return nil +} + +// addUserPATH appends installDir to the user's PATH if not already present. +// Uses PowerShell to read/write the User-scope environment via .NET API, +// which broadcasts WM_SETTINGCHANGE so new processes pick it up. +func addUserPATH(installDir string) error { + script := ` +$dir = $env:MUYUE_INSTALL_DIR +$current = [Environment]::GetEnvironmentVariable('Path', 'User') +if ($current -eq $null) { $current = '' } +$parts = $current -split ';' | Where-Object { $_ -ne '' } +if ($parts -notcontains $dir) { + $new = if ($current -eq '') { $dir } else { "$current;$dir" } + [Environment]::SetEnvironmentVariable('Path', $new, 'User') +} +` + cmd := exec.Command("powershell", "-NoLogo", "-NoProfile", "-Command", script) + cmd.Env = append(os.Environ(), "MUYUE_INSTALL_DIR="+installDir) + out, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("powershell: %v: %s", err, string(out)) + } + return nil +} diff --git a/internal/version/version.go b/internal/version/version.go index 600f85d..e1936aa 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -7,7 +7,7 @@ import ( const ( Name = "muyue" - Version = "0.7.2" + Version = "0.7.4" Author = "La Légion de Muyue" ) diff --git a/web/index.html b/web/index.html index baf28bb..37bc5bd 100644 --- a/web/index.html +++ b/web/index.html @@ -4,8 +4,11 @@ - muyue - + Muyue + + + +
diff --git a/web/public/favicon-16.png b/web/public/favicon-16.png new file mode 100644 index 0000000..c0e28a0 Binary files /dev/null and b/web/public/favicon-16.png differ diff --git a/web/public/favicon-32.png b/web/public/favicon-32.png new file mode 100644 index 0000000..899347e Binary files /dev/null and b/web/public/favicon-32.png differ diff --git a/web/public/muyue-64.png b/web/public/muyue-64.png new file mode 100644 index 0000000..ac3076b Binary files /dev/null and b/web/public/muyue-64.png differ diff --git a/web/public/muyue.png b/web/public/muyue.png new file mode 100644 index 0000000..53b48a1 Binary files /dev/null and b/web/public/muyue.png differ diff --git a/web/src/components/App.jsx b/web/src/components/App.jsx index fbd5cc8..ebb906a 100644 --- a/web/src/components/App.jsx +++ b/web/src/components/App.jsx @@ -103,6 +103,7 @@ export default function App() {
+ Muyue MUYUE v{info.version || '...'}
diff --git a/web/src/components/OnboardingWizard.jsx b/web/src/components/OnboardingWizard.jsx index 7d7e9df..44f81a4 100644 --- a/web/src/components/OnboardingWizard.jsx +++ b/web/src/components/OnboardingWizard.jsx @@ -23,8 +23,12 @@ export default function OnboardingWizard({ api, onComplete }) { language: 'fr', keyboard: 'azerty', apikey: '', + apikey_mimo: '', editor: '', }) + const [keyValidMimo, setKeyValidMimo] = useState(false) + const [errorMimo, setErrorMimo] = useState(null) + const [validatingMimo, setValidatingMimo] = useState(false) const [editorList, setEditorList] = useState(BASE_EDITORS) const [saving, setSaving] = useState(false) const [error, setError] = useState(null) @@ -52,7 +56,7 @@ export default function OnboardingWizard({ api, onComplete }) { case 'name': return answers.name.trim().length > 0 case 'language': return !!answers.language case 'keyboard': return !!answers.keyboard - case 'apikey': return keyValid && !scanning + case 'apikey': return (keyValid || keyValidMimo) && !scanning case 'editor': return true case 'done': return true default: return true @@ -173,6 +177,33 @@ export default function OnboardingWizard({ api, onComplete }) { setValidating(false) } + const handleValidateKeyMimo = async () => { + if (!answers.apikey_mimo.trim()) return + setValidatingMimo(true) + setErrorMimo(null) + try { + await api.validateProvider({ + name: 'mimo', + api_key: answers.apikey_mimo, + model: 'mimo-v2.5-pro', + base_url: 'https://token-plan-ams.xiaomimimo.com/v1', + }) + setKeyValidMimo(true) + // Save MiMo. If MiniMax wasn't validated yet, MiMo becomes the active provider. + await api.saveProvider({ + name: 'mimo', + api_key: answers.apikey_mimo, + model: 'mimo-v2.5-pro', + base_url: 'https://token-plan-ams.xiaomimimo.com/v1', + active: !keyValid, + }) + } catch (err) { + setErrorMimo(err.message || 'Clé invalide') + setKeyValidMimo(false) + } + setValidatingMimo(false) + } + const handleSave = async () => { @@ -201,6 +232,15 @@ export default function OnboardingWizard({ api, onComplete }) { active: true, }) } + if (answers.apikey_mimo.trim()) { + await api.saveProvider({ + name: 'mimo', + api_key: answers.apikey_mimo, + model: 'mimo-v2.5-pro', + base_url: 'https://token-plan-ams.xiaomimimo.com/v1', + active: !answers.apikey.trim(), + }) + } onComplete() } catch (err) { setError(err.message || 'Erreur lors de la sauvegarde') @@ -283,38 +323,71 @@ export default function OnboardingWizard({ api, onComplete }) { {current.key === 'apikey' && (
-
Clé API MiniMax
+
Clés API
- Entrez votre clé API MiniMax pour activer l'assistant IA. La clé est obligatoire pour continuer. + Renseignez au moins l'une des deux clés pour activer l'assistant. Les autres fournisseurs (OpenAI, Anthropic, Ollama, Z.AI) se configurent plus tard depuis l'onglet Configuration.
- { setAnswers(a => ({ ...a, apikey: e.target.value })); setKeyValid(false); setError(null) }} - autoFocus - /> - {error && !keyValid &&
{error}
} - {keyValid && !scanning &&
Clé valide ✓ — Appuyez sur Entrée pour continuer
} + +
+ + { setAnswers(a => ({ ...a, apikey: e.target.value })); setKeyValid(false); setError(null) }} + autoFocus + /> +
+ + {keyValid && ✓ MiniMax OK} + {error && !keyValid && {error}} +
+
+ +
+ + { setAnswers(a => ({ ...a, apikey_mimo: e.target.value })); setKeyValidMimo(false); setErrorMimo(null) }} + /> +
+ + {keyValidMimo && ✓ MiMo OK} + {errorMimo && !keyValidMimo && {errorMimo}} +
+
+ {scanning && ( -
+
{scanMessage}
)} - {requiredError &&
Veuillez valider votre clé API pour continuer
} -
- -
- {!keyValid && !error && answers.apikey.trim() && ( -
Entrez votre clé puis cliquez "Valider la clé"
+ {requiredError && ( +
+ Veuillez valider au moins une clé (MiniMax ou MiMo) pour continuer. +
+ )} + {(keyValid || keyValidMimo) && !scanning && ( +
+ Au moins une clé est valide — appuyez sur Suivant pour continuer. +
)}
)}