mirror of
https://github.com/browseros-ai/BrowserOS.git
synced 2026-05-21 12:55:09 +00:00
* feat: auto-discover server port via ~/.browseros/server.json Server writes its port to ~/.browseros/server.json on startup so the CLI can auto-discover the server URL without requiring `browseros-cli init`. Discovery chain: BROWSEROS_URL env > config.yaml > server.json > error Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address review feedback for PR #504 - Use synchronous unlinkSync in stop() since process.exit() fires immediately after, abandoning any pending async operations - Wrap writeServerConfig in try/catch so a write failure doesn't crash a healthy server for a convenience feature Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: type server discovery config and add version metadata Add ServerDiscoveryConfig interface to @browseros/shared and enrich server.json with server_version, browseros_version, and chromium_version. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: normalize URL from server.json for consistency All other URL sources (env var, config.yaml) pass through normalizeServerURL; apply the same to the server.json path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
231 lines
5.5 KiB
Go
231 lines
5.5 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 {
|
|
if env := normalizeServerURL(os.Getenv("BROWSEROS_URL")); env != "" {
|
|
return env
|
|
}
|
|
|
|
cfg, err := config.Load()
|
|
if err == nil {
|
|
if url := normalizeServerURL(cfg.ServerURL); url != "" {
|
|
return url
|
|
}
|
|
}
|
|
|
|
if url := loadBrowserosServerURL(); 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 Open BrowserOS -> Settings -> BrowserOS MCP and copy the Server URL.\n Then run: browseros-cli init",
|
|
)
|
|
}
|