mirror of
https://github.com/browseros-ai/BrowserOS.git
synced 2026-05-13 15:46:22 +00:00
* feat(cli): production-ready CLI with auto-launch, install, and cross-platform builds - init: accept URL argument and --auto flag for non-interactive setup - install: new command to download BrowserOS app for current platform - launch: auto-detect and launch BrowserOS when server is not running - discovery: prefer server.json (live) over config.yaml (may be stale) - errors: actionable messages guiding users to init/install - goreleaser: cross-platform builds for 6 targets (darwin/linux/windows × amd64/arm64) - ci: GitHub Actions workflow to release CLI binaries on cli/v* tag push * fix(cli): check health status code and add progress dots during launch - Health check in newClient() now verifies HTTP 200, not just no error - waitForServer prints dots during the 30s poll so users know it's working * refactor(cli): make launch an explicit command, remove auto-launch from newClient - launch: new explicit command to find and open BrowserOS app - launch: probes server.json, config, and common ports before launching - launch: if already running, reports URL instead of launching again - init --auto: uses port probing to find running servers - install --deb: errors on non-Linux instead of silently downloading DMG - error messages: guide users to launch/install/init explicitly - removed: auto-launch from newClient() — CLI never does something surprising * fix(cli): platform-native detection, launch, and install for all OSes Detection (isBrowserOSInstalled): - macOS: uses `open -Ra` to query Launch Services (no hardcoded paths) - Linux: checks /usr/bin/browseros (.deb), browseros.desktop, AppImage search - Windows: checks %LOCALAPPDATA%\BrowserOS\Application\BrowserOS.exe and HKCU/HKLM uninstall registry keys Launch (startBrowserOS): - macOS: `open -b com.browseros.BrowserOS` (bundle ID, not path) - Linux: `browseros` binary, AppImage, or `gtk-launch browseros` (fixed: was using xdg-open which opens by MIME type, not desktop files) - Windows: runs BrowserOS.exe from known Chromium per-user install path (fixed: was using `cmd /c start BrowserOS` which doesn't resolve) Install (runPostInstall): - macOS: hdiutil attach → cp -R to /Applications → hdiutil detach - Linux: chmod +x for AppImage, dpkg -i instruction for .deb - Windows: launches installer exe - --deb flag now errors on non-Linux platforms Removed auto-launch from newClient() — CLI never does surprising things. Sources verified from: - packages/browseros/build/common/context.py (binary names per platform) - packages/browseros/build/modules/package/linux.py (.deb structure, .desktop file) - packages/browseros/chromium_patches/chrome/install_static/chromium_install_modes.h (Windows base_app_name="BrowserOS", registry GUID, install paths) - /Applications/BrowserOS.app/Contents/Info.plist (bundle ID)
237 lines
5.7 KiB
Go
237 lines
5.7 KiB
Go
package cmd
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"browseros-cli/config"
|
|
"browseros-cli/mcp"
|
|
"browseros-cli/output"
|
|
|
|
"github.com/fatih/color"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var (
|
|
serverURL string
|
|
pageFlag int
|
|
pageSet bool
|
|
jsonOut bool
|
|
debug bool
|
|
timeout time.Duration
|
|
version = "dev"
|
|
)
|
|
|
|
func SetVersion(v string) {
|
|
version = v
|
|
}
|
|
|
|
var (
|
|
helpHeaderColor = color.New(color.Bold, color.FgCyan)
|
|
helpCmdColor = color.New(color.FgHiGreen)
|
|
helpAliasColor = color.New(color.FgYellow)
|
|
helpHintColor = color.New(color.Faint)
|
|
)
|
|
|
|
func helpHeader(s string) string { return helpHeaderColor.Sprint(s) }
|
|
func helpCmdCol(s string) string { return helpCmdColor.Sprint(s) }
|
|
func helpHint(s string) string { return helpHintColor.Sprint(s) }
|
|
func helpAliases(aliases []string) string {
|
|
return helpAliasColor.Sprintf("(aliases: %s)", strings.Join(aliases, ", "))
|
|
}
|
|
|
|
var groupOrder = []string{
|
|
"Navigate:",
|
|
"Observe:",
|
|
"Input:",
|
|
"Resources:",
|
|
"Setup:",
|
|
}
|
|
|
|
func groupedHelp(cmd *cobra.Command) string {
|
|
groups := map[string][]*cobra.Command{}
|
|
for _, c := range cmd.Commands() {
|
|
if !c.IsAvailableCommand() && c.Name() != "help" {
|
|
continue
|
|
}
|
|
g := c.Annotations["group"]
|
|
if g == "" {
|
|
g = "Setup:"
|
|
}
|
|
groups[g] = append(groups[g], c)
|
|
}
|
|
|
|
var b strings.Builder
|
|
for _, name := range groupOrder {
|
|
cmds, ok := groups[name]
|
|
if !ok {
|
|
continue
|
|
}
|
|
b.WriteString("\n" + helpHeader(name) + "\n")
|
|
for _, c := range cmds {
|
|
line := " " + helpCmdCol(fmt.Sprintf("%-14s", c.Name())) + " " + c.Short
|
|
if len(c.Aliases) > 0 {
|
|
line += " " + helpAliases(c.Aliases)
|
|
}
|
|
b.WriteString(line + "\n")
|
|
}
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
const usageTemplate = `{{helpHeader "Usage:"}}{{if .Runnable}}
|
|
{{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
|
|
{{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
|
|
|
|
{{helpHeader "Aliases:"}}
|
|
{{.NameAndAliases}}{{end}}{{if .HasExample}}
|
|
|
|
{{helpHeader "Examples:"}}
|
|
{{.Example}}{{end}}{{if .HasAvailableSubCommands}}
|
|
{{groupedHelp .}}{{end}}{{if .HasAvailableLocalFlags}}
|
|
|
|
{{helpHeader "Flags:"}}
|
|
{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
|
|
|
|
{{helpHeader "Global Flags:"}}
|
|
{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableSubCommands}}
|
|
|
|
{{helpHint (printf "Use \"%s [command] --help\" for more information." .CommandPath)}}{{end}}
|
|
`
|
|
|
|
var rootCmd = &cobra.Command{
|
|
Use: "browseros-cli",
|
|
Short: "Browser control CLI for BrowserOS",
|
|
Long: "browseros-cli — command-line interface for controlling BrowserOS via MCP",
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
}
|
|
|
|
func Execute() {
|
|
if err := rootCmd.Execute(); err != nil {
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
func init() {
|
|
cobra.AddTemplateFunc("helpHeader", helpHeader)
|
|
cobra.AddTemplateFunc("helpCmdCol", helpCmdCol)
|
|
cobra.AddTemplateFunc("helpAliases", helpAliases)
|
|
cobra.AddTemplateFunc("helpHint", helpHint)
|
|
cobra.AddTemplateFunc("groupedHelp", groupedHelp)
|
|
|
|
rootCmd.SetUsageTemplate(usageTemplate)
|
|
|
|
rootCmd.PersistentFlags().StringVarP(&serverURL, "server", "s", defaultServerURL(), "BrowserOS server URL")
|
|
rootCmd.PersistentFlags().IntVarP(&pageFlag, "page", "p", 0, "Target page ID (default: active page)")
|
|
rootCmd.PersistentFlags().BoolVar(&jsonOut, "json", envBool("BOS_JSON"), "JSON output")
|
|
rootCmd.PersistentFlags().BoolVar(&debug, "debug", envBool("BOS_DEBUG"), "Debug output")
|
|
rootCmd.PersistentFlags().DurationVarP(&timeout, "timeout", "t", 120*time.Second, "Request timeout")
|
|
|
|
rootCmd.Version = version
|
|
}
|
|
|
|
func newClient() *mcp.Client {
|
|
baseURL, err := validateServerURL(serverURL)
|
|
if err != nil {
|
|
output.Error(err.Error(), 1)
|
|
}
|
|
|
|
c := mcp.NewClient(baseURL, version, timeout)
|
|
c.Debug = debug
|
|
return c
|
|
}
|
|
|
|
func resolvePageID(c *mcp.Client) (int, error) {
|
|
if rootCmd.PersistentFlags().Changed("page") {
|
|
return pageFlag, nil
|
|
}
|
|
|
|
if env := os.Getenv("BROWSEROS_PAGE"); env != "" {
|
|
if v, err := strconv.Atoi(env); err == nil {
|
|
return v, nil
|
|
}
|
|
}
|
|
|
|
return c.ResolvePageID(nil)
|
|
}
|
|
|
|
func envBool(key string) bool {
|
|
v := os.Getenv(key)
|
|
return v == "1" || v == "true"
|
|
}
|
|
|
|
func defaultServerURL() string {
|
|
// 1. Explicit env var always wins
|
|
if env := normalizeServerURL(os.Getenv("BROWSEROS_URL")); env != "" {
|
|
return env
|
|
}
|
|
|
|
// 2. Live discovery file from running BrowserOS (most current)
|
|
if url := loadBrowserosServerURL(); url != "" {
|
|
return url
|
|
}
|
|
|
|
// 3. Saved config (may be stale if port changed)
|
|
cfg, err := config.Load()
|
|
if err == nil {
|
|
if url := normalizeServerURL(cfg.ServerURL); url != "" {
|
|
return url
|
|
}
|
|
}
|
|
|
|
return ""
|
|
}
|
|
|
|
type serverDiscoveryConfig struct {
|
|
ServerPort int `json:"server_port"`
|
|
URL string `json:"url"`
|
|
ServerVersion string `json:"server_version"`
|
|
BrowserOSVersion string `json:"browseros_version,omitempty"`
|
|
ChromiumVersion string `json:"chromium_version,omitempty"`
|
|
}
|
|
|
|
func loadBrowserosServerURL() string {
|
|
home, err := os.UserHomeDir()
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
data, err := os.ReadFile(filepath.Join(home, ".browseros", "server.json"))
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
var sc serverDiscoveryConfig
|
|
if err := json.Unmarshal(data, &sc); err != nil {
|
|
return ""
|
|
}
|
|
|
|
return normalizeServerURL(sc.URL)
|
|
}
|
|
|
|
func normalizeServerURL(raw string) string {
|
|
normalized := strings.TrimSpace(raw)
|
|
normalized = strings.TrimSuffix(normalized, "/mcp")
|
|
return strings.TrimSuffix(normalized, "/")
|
|
}
|
|
|
|
func validateServerURL(raw string) (string, error) {
|
|
baseURL := normalizeServerURL(raw)
|
|
if baseURL != "" {
|
|
return baseURL, nil
|
|
}
|
|
|
|
return "", fmt.Errorf(
|
|
"BrowserOS server URL is not configured.\n\n" +
|
|
" If BrowserOS is running: browseros-cli init --auto\n" +
|
|
" If BrowserOS is closed: browseros-cli launch\n" +
|
|
" If not installed: browseros-cli install",
|
|
)
|
|
}
|