Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
plugin: the host is told the gateway's address (MAGPIE_ADDR), so a page's own service reaches it on any port
yetone602ad84adc54
diff --git a/docs/subsystems/provider-plugins.md b/docs/subsystems/provider-plugins.mdindex 93b755372..81753e45a 100644--- a/docs/subsystems/provider-plugins.md+++ b/docs/subsystems/provider-plugins.md@@ -200,6 +200,8 @@ Bun takes only http:// and https:// proxies. A SOCKS5 one, such as a Mac's systeThe host reads its proxy once, when it starts. When the proxy magpie would give a new host differs from the one the running host got (the system proxy set after magpie started, as at login before Clash is up, or Settings changed), the next call to the host replaces it (`proxyMoved` in [`host.go`](../../internal/plugin/host.go), looked at no more than every 15s, or every 2s while the host has no proxy: `proxyLookNone`, #1518). A call made for a read nobody asked for, while allowances are read only when asked (`netproxy.Held`), never reaches the host. Before this, a host started without a proxy kept none, so the Grok plugin's `grok models` couldn't renew its token and the account read as signed out after each restart (#1363).+The host is told where magpie's gateway is as `MAGPIE_ADDR` (`hostAddr` in [`host.go`](../../internal/plugin/host.go)): magpie's own `MAGPIE_ADDR` when it runs under one, on loopback when that listens on every interface, else Settings' port on loopback. A plugin with a service of its own reaches the gateway there; Magiczerowxy/magpie-chat's chat server asks `MAGPIE_ADDR`, then 3425, so with the port set in Settings its model list was empty (Magiczerowxy/magpie-chat#1). A port changed in Settings is a new host's at the next call, as a moved proxy is (`proxyMoved`), and opening a page whose plugin has a host part is such a call (`plugin.Warm`). Test: `TestHostToldTheGatewayAddress`.+What a plugin writes with `console.log`, `console.warn` and the rest goes to the host's stderr, which magpie logs a line at a time (`drainStderr` in [`host.go`](../../internal/plugin/host.go)). A line over 4 MiB ends the logging: magpie logs that it did, and reads and drops the rest, so the host never blocks on a full pipe. Before, nothing read the pipe after such a line: on Windows the host hung on its next write, and on Linux Bun kept everything written after it in memory.A plugin's account whose sign-in its vendor refused (`lapsed`, or an allowance read saying so) keeps Sign in again and Remove on its row, whether it is in use or the agent's own (`signedOut` in `renderAccounts`, `app.js`).diff --git a/internal/plugin/host.go b/internal/plugin/host.goindex bfd9c5b9f..b9f95ead4 100644--- a/internal/plugin/host.go+++ b/internal/plugin/host.go@@ -13,6 +13,7 @@ import ("fmt""io""log"+ "net""net/http""os""os/exec"@@ -464,6 +465,8 @@ type host struct {// with magpie's now (proxyMoved), zero for a host not started here.proxy stringproxyAt time.Time+ // addr is the gateway's address the host was told (hostAddr)+ addr string}// lineLimit is the longest line this host reads from the child.@@ -753,9 +756,11 @@ func Running() bool {// host, which is otherwise started only by a call: at launch, while the// providers are first read, and after every Restart (a plugin installed,// updated or set, a Bun update) only once something asks a plugin again.-// Opening such a page is that ask.+// Opening such a page is that ask. A host that is up goes through get+// too, so one started before the gateway moved (hostAddr) is started+// again with the address the page's service needs.func Warm(ctx context.Context) error {- if Running() || !HasBun() {+ if !Running() && !HasBun() {return nil}_, err := get(ctx)@@ -950,6 +955,7 @@ func startOn(ctx context.Context, bun string) (*host, bool, error) {// the host outlives the request that started itproxy := hostProxy(env()) // what bunCommand gives itcmd := bunCommand(context.Background(), bun, settings.Dir(), "run", js)+ addr := hostAddr(cmd.Env)cmd.Env = hostEnv(cmd.Env)in, err := cmd.StdinPipe()if err != nil {@@ -980,6 +986,7 @@ func startOn(ctx context.Context, bun string) (*host, bool, error) {cancel: hcancel,proxy: proxy,proxyAt: time.Now(),+ addr: addr,}go drainStderr(stderr)@@ -1701,8 +1708,9 @@ func proxied(hp string) bool {// sign-in, renewed by its CLI through the host, then lapsed after every// restart of the computer, and only a new host (moving the account back// to the built-in and on to the plugin again) brought it back. A proxy-// changed in Settings never reached a running host either. Called under-// hostMu.+// changed in Settings never reached a running host either. Nor did the+// gateway's address (hostAddr): a port changed in Settings is the next+// host's. Called under hostMu.func (h *host) proxyMoved() bool {every := proxyLookEveryif !proxied(h.proxy) {@@ -1712,15 +1720,43 @@ func (h *host) proxyMoved() bool {return false}h.proxyAt = time.Now()- return hostProxy(env()) != h.proxy+ e := env()+ return hostProxy(e) != h.proxy || h.addr != "" && hostAddr(e) != h.addr+}++// hostAddr is the gateway's address a host is told, as MAGPIE_ADDR: the+// variable's own value when magpie runs under one, else Settings' port on+// loopback. A plugin with a service of its own reaches magpie's gateway+// there: Magiczerowxy/magpie-chat's chat server asks MAGPIE_ADDR, then+// 3425, so with the port set in Settings (or a portable magpie's) its+// model list was empty and every message failed, "Unable to connect"+// (yuesh1_ on X, Magiczerowxy/magpie-chat#1). A gateway listening on+// every interface (MAGPIE_ADDR=0.0.0.0:…) is reached on loopback, as+// gateway.URL does.+func hostAddr(env []string) string {+ a := ""+ for _, e := range env {+ if k, v, ok := strings.Cut(e, "="); ok && strings.EqualFold(k, "MAGPIE_ADDR") && v != "" {+ a = v+ }+ }+ if a == "" {+ return settings.SavedAddr()+ }+ if h, p, err := net.SplitHostPort(a); err == nil && (h == "" || net.ParseIP(h) != nil && net.ParseIP(h).IsUnspecified()) {+ a = net.JoinHostPort("127.0.0.1", p)+ }+ return a}-// hostEnv is env for the host, its *_PROXY named MAGPIE_*_PROXY: Bun+// hostEnv is env for the host, MAGPIE_ADDR the gateway's (hostAddr), its+// *_PROXY named MAGPIE_*_PROXY: Bun// reads *_PROXY once and puts every fetch through them, so a provider set// to "direct" couldn't go around them. host.js gives each fetch the proxy// they name instead. A SOCKS5 one, which Bun can't use, is bridged.func hostEnv(env []string) []string {- out := make([]string, 0, len(env))+ out := make([]string, 0, len(env)+1)+ addr := hostAddr(env)for _, e := range env {k, v, _ := strings.Cut(e, "=")switch strings.ToUpper(k) {@@ -1728,11 +1764,13 @@ func hostEnv(env []string) []string {out = append(out, "MAGPIE_"+k+"="+netproxy.ForBun(v))case "NO_PROXY":out = append(out, "MAGPIE_"+k+"="+v)+ case "MAGPIE_ADDR":+ // an empty one is Settings' (hostAddr)default:out = append(out, e)}}- return out+ return append(out, "MAGPIE_ADDR="+addr)}// Fetch sends r through the provider's plugin — its loader's fetch, ordiff --git a/internal/plugin/host_addr_test.go b/internal/plugin/host_addr_test.gonew file mode 100644index 000000000..0199924d2--- /dev/null+++ b/internal/plugin/host_addr_test.go@@ -0,0 +1,86 @@+package plugin++import (+ "context"+ "os"+ "path/filepath"+ "testing"+ "time"++ "github.com/yetone/magpie/internal/settings"+)++// A plugin with a service of its own is told where magpie's gateway is:+// Magiczerowxy/magpie-chat's chat server asks MAGPIE_ADDR, then 3425, so+// with the port set in Settings its model list was empty and every+// message failed (yuesh1_ on X, Magiczerowxy/magpie-chat#1). The host is+// told Settings' port, started again when it moves, and a MAGPIE_ADDR+// magpie runs under, on loopback when it listens on every interface.+func TestHostToldTheGatewayAddress(t *testing.T) {+ sandbox(t)+ t.Setenv("MAGPIE_ADDR", "")+ os.Unsetenv("MAGPIE_ADDR")+ was := proxyLookNone+ proxyLookNone = 0+ t.Cleanup(func() { proxyLookNone = was })+ ctx, cancel := context.WithTimeout(context.Background(), time.Minute)+ defer cancel()++ out := filepath.Join(t.TempDir(), "addr")+ t.Setenv("ADDR_PROBE_OUT", out)+ dir := filepath.Join(t.TempDir(), "addr-probe")+ if err := os.MkdirAll(dir, 0o755); err != nil {+ t.Fatal(err)+ }+ files := map[string]string{+ "package.json": `{"name": "addr-probe", "version": "0.0.1", "type": "module", "main": "./index.mjs"}`,+ // as magpie-chat's index.mjs, which starts its server on import+ "index.mjs": `import { writeFileSync } from "node:fs"+writeFileSync(process.env.ADDR_PROBE_OUT, process.env.MAGPIE_ADDR ?? "unset")+export default { id: "addr-probe", server: async () => ({}) }+`,+ }+ for name, body := range files {+ if err := os.WriteFile(filepath.Join(dir, name), []byte(body), 0o644); err != nil {+ t.Fatal(err)+ }+ }+ setPort := func(p int) {+ t.Helper()+ s := settings.Load()+ s.Port = p+ if err := settings.Save(s); err != nil {+ t.Fatal(err)+ }+ }+ told := func() string {+ t.Helper()+ if err := Warm(ctx); err != nil {+ t.Fatal(err)+ }+ b, err := os.ReadFile(out)+ if err != nil {+ t.Fatalf("the plugin didn't load: %v", err)+ }+ return string(b)+ }++ setPort(3591)+ if _, err := Add(ctx, dir); err != nil {+ t.Fatal(err)+ }+ if got := told(); got != "127.0.0.1:3591" {+ t.Fatalf("with Settings' port 3591 the plugin was told MAGPIE_ADDR=%s", got)+ }+ // the port moves in Settings: the page opened next has a host told so+ setPort(3592)+ if got := told(); got != "127.0.0.1:3592" {+ t.Errorf("after the port moved to 3592 the plugin was told MAGPIE_ADDR=%s", got)+ }+ // magpie's own MAGPIE_ADDR comes first, reached on loopback+ t.Setenv("MAGPIE_ADDR", "0.0.0.0:4999")+ Restart()+ if got := told(); got != "127.0.0.1:4999" {+ t.Errorf("under MAGPIE_ADDR=0.0.0.0:4999 the plugin was told MAGPIE_ADDR=%s", got)+ }+}