* fix(proc): end what a CLI probe started, on its timeout and when magpie exits The probes that ask an agent's CLI something (claude auth status, cursor-agent about/models/status, the --version checks) ran through proc.CommandContext, which on its timeout kills only the command itself. A CLI that is a script (a version manager's wrapper, a shim) left what it had started running, adopted by init; and a probe still asking when magpie exited (a one-shot command, an update, a restart) was left whole, with nothing to end it. With Omarchy's mise wrappers stuck in their exec loop (omacom/omarchy#7234) that was five processes holding about half a core each for up to six hours. proc.ProbeContext gives such a probe a session of its own on Unix, as StartTree does, and its context ending kills the whole group. Probes still running are listed, and proc.EndProbes kills them when magpie exits (after run in main) or puts a new version in its place (update.Reexec). On Windows a probe is killed alone, as before, a job being joined only once the command has started. TestProbeTimeoutEndsWhatItStarted and TestEndProbes fail without the change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(proc): end probes on a terminal's signals and on a Mac's quit Review of the first change: a probe leading its own session no longer gets the Ctrl+C, hang-up or SIGTERM sent to magpie's terminal or service, and magpie ending on the signal never reached EndProbes, so the probe was left to init where before it died with magpie. main now catches SIGINT, SIGTERM and SIGHUP, ends the probes and exits as the signal would have (128+n). A signal magpie was started ignoring (nohup, a background job) stays ignored. The account sign-in and plugin commands, which end themselves on Ctrl+C, go through interruptContext and are left to do so. On a Mac the desktop app's quit ([NSApp terminate:], also the restart to update) exits without returning to main, so OnShutdown ends the probes. TestProbeTimeoutEndsWhatItStarted ended its probe on a 500ms timeout, which on a Mac could come before the script had written its child's pid (6 of 10 runs failed in review). It now ends the context once that pid is read, the same Cancel path. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: let the app and the TUI quit on a signal their own way Review of the signal handling: endProbesOnSignal exited ahead of Wails and bubbletea, which quit on SIGINT and SIGTERM themselves. `magpie tray` exited 143 without OnShutdown (no downloaded update installed, and sessions.Saved skipped in main), and `magpie tui` left the terminal on its alternate screen with the cursor hidden. The app's and the TUI's entry points now hand the signals back (ownSignals): the app's OnShutdown ends the probes, and the TUI comes back to main, which ends them too. A one-shot command keeps the handler. TestOwnSignalsHandsThemBack fails without the change (magpie exited 143 before the command could quit its own way); TestSignalExits keeps the one-shot behavior. childPid waited 3s for a script just written to start its child, which a busy Mac can exceed (2 of 3 full runs failed in review). It waits 30s now and, should the probe end first, says the probe's error rather than "the script started nothing". Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: keep SIGHUP for the app and the TUI, and die of the signal ownSignals handed SIGHUP back along with SIGINT and SIGTERM, but neither Wails nor bubbletea handles it: the terminal closing under the TUI or an app started from a shell ended magpie on the spot, and its probes, in a session of their own, out of the hang-up's reach, kept running (before this PR they were in the terminal's group and ended with it). SIGHUP now stays with endProbesOnSignal. A tray under a pty whose terminal closes left 2 processes before, none now. The handler asked whether a command was ending itself on Ctrl+C only after EndProbes, which can take up to a second; a sign-in done in the meantime got magpie ended in the middle of its own cleanup. It is asked first. It exited 128+n, which a shell takes for a child that handled the signal: a loop running magpie went on to the next run on Ctrl+C. It now dies of the signal (handling reset, the signal sent again); Windows, which can't send one, still exits with the code. agentProbe and agentCommand share withProxy; the Windows probeGroup comment no longer says EndProbes ends what a shim started. TestOwnSignalsKeepsHangUp and TestInterruptWhileEndingProbes fail without the change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: hand signals to the TUI and the app only once they listen Review: runTUI handed SIGINT and SIGTERM back before tui.Run, whose newModel asks agents' CLIs (claude auth status, up to 5s) before bubbletea listens for signals. Ctrl+C, SIGTERM or SIGINT while it loaded ended magpie by Go's default and left the probe and its child running. tui.Run now takes ready, called once the model is made, and runTUI passes ownSignals. The app had the same window: runGUI handed them back before gui.Run, which starts the backend (probes included) before Wails' Run starts listening. ownSignals is now gui.Started, called on ApplicationStarted, which Wails emits after its signal handler is set up. A tray sent SIGTERM 0.05s after starting, a probe under way, left 2 processes before and none now; one sent it once started still quits through OnShutdown (exit 0). TestTUIKeepsSignalsWhileLoading fails without the change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
368 lines
12 KiB
Go
368 lines
12 KiB
Go
package provider
|
|
|
|
// A Cursor subscription is served through the API cursor-agent talks to
|
|
// (gateway/cursor.go), with the account it is signed in to; here is who that
|
|
// account is, the models it offers, the sign-in, which is cursor-agent's own
|
|
// `login`, and the token that sign-in keeps.
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/url"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"regexp"
|
|
"runtime"
|
|
"slices"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/yetone/magpie/internal/catalog"
|
|
"github.com/yetone/magpie/internal/proc"
|
|
)
|
|
|
|
// CursorExecutable finds the cursor-agent CLI; a var so tests can fake it.
|
|
var CursorExecutable = func() string {
|
|
for _, name := range []string{"cursor-agent", "agent"} {
|
|
if p, err := exec.LookPath(name); err == nil && (name == "cursor-agent" || isCursorAgent(p)) {
|
|
return p
|
|
}
|
|
}
|
|
home, _ := os.UserHomeDir()
|
|
for _, p := range []string{filepath.Join(home, ".local", "bin", "cursor-agent"), "/usr/local/bin/cursor-agent", "/opt/homebrew/bin/cursor-agent"} {
|
|
if st, err := os.Stat(p); err == nil && !st.IsDir() {
|
|
return p
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// isCursorAgent tells Cursor's `agent` from any other program by that name.
|
|
func isCursorAgent(path string) bool {
|
|
real, err := filepath.EvalSymlinks(path)
|
|
return err == nil && strings.Contains(real, "cursor-agent")
|
|
}
|
|
|
|
var cursorStatus = &cliIdentity{name: "cursor", exe: func() string { return CursorExecutable() }, ask: askCursorStatus}
|
|
|
|
// cursorIdentity is who Cursor's CLI says is signed in; see cliIdentity.
|
|
func cursorIdentity() (user, plan string, ok bool) { return cursorStatus.get() }
|
|
|
|
func forgetCursorStatus() { cursorStatus.forget() }
|
|
|
|
func askCursorIdentity() (user, plan string, ok bool) {
|
|
user, plan, ok, _ = askCursorStatus()
|
|
return user, plan, ok
|
|
}
|
|
|
|
// askCursorStatus asks `cursor-agent about` who is signed in. It is sure of
|
|
// nobody only when the CLI says so or keeps no token: an about that fails,
|
|
// runs out of time (it asks Cursor's servers) or prints something other
|
|
// than its JSON couldn't tell, and the account stays as it was (#154).
|
|
func askCursorStatus() (user, plan string, ok bool, err error) {
|
|
path := CursorExecutable()
|
|
if path == "" {
|
|
return "", "", false, nil
|
|
}
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
out, err := agentProbe(ctx, path, "about", "--format", "json").Output()
|
|
user, plan, said := parseCursorAbout(out)
|
|
switch {
|
|
case user != "":
|
|
return user, plan, true, nil
|
|
case said && err == nil, cursorSignedOut():
|
|
return "", "", false, nil
|
|
case err == nil:
|
|
err = errors.New("cursor-agent about printed no account")
|
|
}
|
|
return "", "", false, err
|
|
}
|
|
|
|
// parseCursorAbout reads `cursor-agent about --format json`: the email and
|
|
// plan, and whether it printed that JSON at all — after a line of its own
|
|
// (an update notice), too.
|
|
func parseCursorAbout(out []byte) (user, plan string, said bool) {
|
|
s := strings.TrimSpace(ansi.ReplaceAllString(string(out), ""))
|
|
if i := strings.Index(s, "{"); i > 0 {
|
|
s = s[i:]
|
|
}
|
|
var about struct {
|
|
SubscriptionTier string `json:"subscriptionTier"`
|
|
UserEmail string `json:"userEmail"`
|
|
}
|
|
if json.Unmarshal([]byte(s), &about) != nil {
|
|
return "", "", false
|
|
}
|
|
return strings.TrimSpace(about.UserEmail), strings.TrimSpace(about.SubscriptionTier), true
|
|
}
|
|
|
|
// cursorSignedOut is cursor-agent keeping no token, which is signed out
|
|
// whatever about said; a var so tests can fake it.
|
|
var cursorSignedOut = func() bool { return readCursorToken() == "" }
|
|
|
|
func cursorAccount() (Provider, bool) {
|
|
user, plan, ok := cursorIdentity()
|
|
if !ok {
|
|
return Provider{}, false
|
|
}
|
|
acct := &Account{Agent: "cursor", User: user, Plan: plan}
|
|
acct.models = func() []catalog.Model { return []catalog.Model{{ID: "auto", Name: "Auto"}} }
|
|
acct.fetch = func(ctx context.Context) ([]catalog.Model, error) {
|
|
ms, err := cursorModels(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ms, catalog.SaveLive("cursor", "", ms)
|
|
}
|
|
return Provider{ID: "cursor", Name: "Cursor", Icon: "cursor", Website: "https://cursor.com", Account: acct}, true
|
|
}
|
|
|
|
var (
|
|
ansi = regexp.MustCompile(`\x1b\[[0-9;?]*[A-Za-z]`)
|
|
cursorModelL = regexp.MustCompile(`^([A-Za-z0-9][\w.:-]*) - (.+)$`)
|
|
)
|
|
|
|
// cursorModels lists what the account can use, as `cursor-agent models`
|
|
// prints it: "id - Name", one a line.
|
|
func cursorModels(ctx context.Context) ([]catalog.Model, error) {
|
|
path := CursorExecutable()
|
|
if path == "" {
|
|
return nil, errorf("cursor-agent is not installed")
|
|
}
|
|
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
|
defer cancel()
|
|
out, err := agentProbe(ctx, path, "models").Output()
|
|
if err != nil {
|
|
return nil, errorf("cursor-agent models: %v", err)
|
|
}
|
|
return parseCursorModels(string(out)), nil
|
|
}
|
|
|
|
func parseCursorModels(out string) []catalog.Model {
|
|
var ms []catalog.Model
|
|
s := bufio.NewScanner(strings.NewReader(ansi.ReplaceAllString(out, "")))
|
|
for s.Scan() {
|
|
m := cursorModelL.FindStringSubmatch(strings.TrimSpace(s.Text()))
|
|
if m == nil {
|
|
continue
|
|
}
|
|
// some names come with zero-width spaces and doubled ones
|
|
name := strings.Join(strings.Fields(strings.ReplaceAll(m[2], "\u200b", "")), " ")
|
|
name = strings.TrimSpace(strings.TrimSuffix(name, "(default)"))
|
|
name = strings.TrimSpace(strings.TrimSuffix(name, "(current)"))
|
|
ms = append(ms, catalog.Model{ID: m[1], Name: name, Context: cursorContext(m[1], name)})
|
|
}
|
|
return ms
|
|
}
|
|
|
|
// cursorDefaultContext is the context Cursor gives a model it doesn't name
|
|
// as a 1M one.
|
|
const cursorDefaultContext = 200_000
|
|
|
|
var (
|
|
cursorMillion = regexp.MustCompile(`\b(\d+)M\b`)
|
|
cursorVariant = regexp.MustCompile(`-(fast|none|low|medium|high|xhigh|extra-high|max|thinking)$`)
|
|
)
|
|
|
|
// cursorContext is how much of a conversation Cursor lets a model hold. Its
|
|
// ids ("claude-opus-5-5-high-fast") are its own, so no catalog knows them,
|
|
// and an agent given none took every Cursor model for its own default: a
|
|
// 1M one compacted at a fifth of it, and a 200K one — Cursor's own, where
|
|
// the name doesn't say 1M — was sent more than Cursor keeps. The name says
|
|
// which is which ("Claude Opus 5.5 1M"); under it, a model known to hold
|
|
// less keeps its own.
|
|
func cursorContext(id, name string) int {
|
|
if m := cursorMillion.FindStringSubmatch(name); m != nil {
|
|
n, _ := strconv.Atoi(m[1])
|
|
return n * 1_000_000
|
|
}
|
|
base := strings.TrimPrefix(id, "cursor-")
|
|
for {
|
|
b := cursorVariant.ReplaceAllString(base, "")
|
|
if b == base {
|
|
break
|
|
}
|
|
base = b
|
|
}
|
|
if base == "auto" { // Cursor's pick, not a model of that name
|
|
return cursorDefaultContext
|
|
}
|
|
if n := catalog.ContextOf(base); n > 0 && n < cursorDefaultContext {
|
|
return n
|
|
}
|
|
return cursorDefaultContext
|
|
}
|
|
|
|
// withCursorContexts fills in a saved list's contexts, fetched before
|
|
// magpie kept them.
|
|
func withCursorContexts(ms []catalog.Model) []catalog.Model {
|
|
out := slices.Clone(ms)
|
|
for i, m := range out {
|
|
if m.Context == 0 {
|
|
out[i].Context = cursorContext(m.ID, m.Name)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
var cursorLoginURL = regexp.MustCompile(`https://\S+`)
|
|
|
|
// startCursorSignIn runs `cursor-agent login` without its browser, hands its
|
|
// link to the window, and finishes when the CLI says the account is in.
|
|
func startCursorSignIn(s *signInFlow) error {
|
|
path := CursorExecutable()
|
|
if path == "" {
|
|
return errorf("install Cursor's CLI first: curl https://cursor.com/install -fsS | bash")
|
|
}
|
|
return runCLISignIn(s, "cursor-agent login", append(os.Environ(), "NO_OPEN_BROWSER=1"), true, nil, func() (string, string, bool) {
|
|
forgetCursorStatus()
|
|
return askCursorIdentity()
|
|
}, cursorLinkWhole, path, "login")
|
|
}
|
|
|
|
// cursorLinkWhole says a link from `cursor-agent login` carries what
|
|
// cursor.com/loginDeepControl signs in with: a link cut short where the
|
|
// CLI broke its line (#261: "https://cursor.com/loginDeepControl?") gets
|
|
// "This sign-in link is incomplete or has expired" from the page.
|
|
func cursorLinkWhole(link string) bool {
|
|
u, err := url.Parse(link)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
q := u.Query()
|
|
return q.Get("challenge") != "" && q.Get("uuid") != ""
|
|
}
|
|
|
|
// cursorVersionFallback is the CLI version said when no install names one.
|
|
const cursorVersionFallback = "2026.09.23-86fc751"
|
|
|
|
var cursorVersionRe = regexp.MustCompile(`^\d{4}\.\d{2}\.\d{2}-[0-9a-f]+$`)
|
|
|
|
// CursorClientVersion is the cursor-agent the API is told it is talking
|
|
// to, "cli-<version>": the installed one, as the API turns away a version
|
|
// it no longer supports.
|
|
func CursorClientVersion() string {
|
|
v := ""
|
|
if p := CursorExecutable(); p != "" {
|
|
if real, err := filepath.EvalSymlinks(p); err == nil {
|
|
if d := filepath.Base(filepath.Dir(real)); cursorVersionRe.MatchString(d) {
|
|
v = d
|
|
}
|
|
}
|
|
}
|
|
if v == "" {
|
|
home, _ := os.UserHomeDir()
|
|
dirs := []string{filepath.Join(home, ".local", "share", "cursor-agent", "versions")}
|
|
if runtime.GOOS == "windows" {
|
|
dirs = append(dirs, filepath.Join(os.Getenv("LOCALAPPDATA"), "cursor-agent", "versions"))
|
|
}
|
|
for _, dir := range dirs {
|
|
es, _ := os.ReadDir(dir)
|
|
for _, e := range es {
|
|
if n := e.Name(); e.IsDir() && cursorVersionRe.MatchString(n) && n > v {
|
|
v = n
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if v == "" {
|
|
v = cursorVersionFallback
|
|
}
|
|
return "cli-" + v
|
|
}
|
|
|
|
// cursorAuthFile is where cursor-agent keeps its sign-in off a Mac's keychain.
|
|
func cursorAuthFile() string {
|
|
home, _ := os.UserHomeDir()
|
|
switch runtime.GOOS {
|
|
case "windows":
|
|
dir := os.Getenv("APPDATA")
|
|
if dir == "" {
|
|
dir = filepath.Join(home, "AppData", "Roaming")
|
|
}
|
|
return filepath.Join(dir, "Cursor", "auth.json")
|
|
case "darwin":
|
|
return filepath.Join(home, ".cursor", "auth.json")
|
|
}
|
|
dir := os.Getenv("XDG_CONFIG_HOME")
|
|
if dir == "" {
|
|
dir = filepath.Join(home, ".config")
|
|
}
|
|
return filepath.Join(dir, "cursor", "auth.json")
|
|
}
|
|
|
|
// readCursorToken is the access token cursor-agent signed in with.
|
|
func readCursorToken() string {
|
|
if runtime.GOOS == "darwin" {
|
|
out, err := proc.Command("security", "find-generic-password", "-s", "cursor-access-token", "-a", "cursor-user", "-w").Output()
|
|
if t := strings.TrimSpace(string(out)); err == nil && t != "" {
|
|
return t
|
|
}
|
|
}
|
|
b, err := os.ReadFile(cursorAuthFile())
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
var a struct {
|
|
AccessToken string `json:"accessToken"`
|
|
}
|
|
json.Unmarshal(b, &a)
|
|
return a.AccessToken
|
|
}
|
|
|
|
// tokenExpiry is when a JWT runs out, zero when it doesn't say.
|
|
func tokenExpiry(tok string) time.Time {
|
|
parts := strings.Split(tok, ".")
|
|
if len(parts) != 3 {
|
|
return time.Time{}
|
|
}
|
|
b, err := base64.RawURLEncoding.DecodeString(strings.TrimRight(parts[1], "="))
|
|
if err != nil {
|
|
return time.Time{}
|
|
}
|
|
var c struct {
|
|
Exp int64 `json:"exp"`
|
|
}
|
|
if json.Unmarshal(b, &c) != nil || c.Exp == 0 {
|
|
return time.Time{}
|
|
}
|
|
return time.Unix(c.Exp, 0)
|
|
}
|
|
|
|
var cursorRefresh sync.Mutex
|
|
|
|
// CursorToken is the token to call Cursor's API with. One about to run
|
|
// out is renewed by cursor-agent, which does that whenever it runs.
|
|
func CursorToken() (string, error) {
|
|
tok := readCursorToken()
|
|
if exp := tokenExpiry(tok); tok != "" && (exp.IsZero() || time.Until(exp) > 5*time.Minute) {
|
|
return tok, nil
|
|
}
|
|
if path := CursorExecutable(); path != "" {
|
|
cursorRefresh.Lock()
|
|
if t := readCursorToken(); t != tok && t != "" {
|
|
tok = t // renewed while this waited
|
|
} else {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
_ = agentProbe(ctx, path, "status").Run()
|
|
cancel()
|
|
tok = readCursorToken()
|
|
}
|
|
cursorRefresh.Unlock()
|
|
}
|
|
if tok == "" {
|
|
return "", errors.New("Cursor isn't signed in; sign in from magpie's Providers page or run `cursor-agent login`")
|
|
}
|
|
if exp := tokenExpiry(tok); !exp.IsZero() && time.Until(exp) <= 0 {
|
|
return "", errors.New("Cursor's sign-in has run out; sign in again from magpie's Providers page or run `cursor-agent login`")
|
|
}
|
|
return tok, nil
|
|
}
|