Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

Merge remote-tracking branch 'origin/main' into claude/gallant-curie-cqv4rr-m-cursor

Claude37926c80528e
diff --cc cli/beacon/internal/handoff/resume_test.go
index aa2d3673,d6b66db6..364433e9
--- a/cli/beacon/internal/handoff/resume_test.go
+++ b/cli/beacon/internal/handoff/resume_test.go
@@@ -25,7 -25,7 +25,8 @@@ func installed(names ...string) func(st
}
var allRuntimes = installed("claude", "codex", "opencode", "cline", "pi", "prime-agent", "droid",
- "omp", "gemini", "qwen", "kiro-cli", "agy", "devin", "muse", "openhands", "goose", "cursor-agent")
- "omp", "gemini", "qwen", "kiro-cli", "agy", "devin", "muse", "openhands", "goose", "copilot")
++ "omp", "gemini", "qwen", "kiro-cli", "agy", "devin", "muse", "openhands", "goose", "copilot",
++ "cursor-agent")
// resumableSession is a session whose directory and session file both exist.
func resumableSession(t *testing.T, harness, id string) Session {
@@@ -83,7 -83,7 +84,8 @@@ func TestPlanResumeStartsANewSessionInE
{HarnessPi, "pi", []string{"--"}},
{HarnessPrime, "prime-agent", []string{"--"}},
{HarnessFactory, "droid", nil},
+ {HarnessCopilot, "copilot", []string{"-i"}},
+ {HarnessCursor, "cursor-agent", nil},
{HarnessOhMyPi, "omp", []string{"--approval-mode=always-ask"}},
{HarnessGemini, "gemini", []string{"--approval-mode", "default", "--prompt-interactive"}},
{HarnessQwen, "qwen", []string{"--approval-mode", "default", "--prompt-interactive"}},
diff --cc cli/beacon/internal/handoff/runtimes.go
index 8651a904,c2118681..1ba4b7df
--- a/cli/beacon/internal/handoff/runtimes.go
+++ b/cli/beacon/internal/handoff/runtimes.go
@@@ -7,7 -7,7 +7,8 @@@ import
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/claudesession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/clinesession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/codexsession"
+ "github.com/asymptote-labs/agent-beacon/cli/beacon/internal/copilotsession"
+ "github.com/asymptote-labs/agent-beacon/cli/beacon/internal/cursorsession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/factorysession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/opencodesession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/pisession"
@@@ -59,7 -56,7 +60,8 @@@ const
HarnessPi = pisession.Harness
HarnessPrime = primesession.Harness
HarnessFactory = factorysession.Harness
+ HarnessCopilot = copilotsession.Harness
+ HarnessCursor = cursorsession.Harness
// Runtimes Beacon starts but whose sessions it reads only from the runtime log.
HarnessOhMyPi = "omp"
@@@ -182,26 -179,24 +184,44 @@@ var runtimes = []Runtime
NewSession: func(prompt string) []string { return []string{prompt} },
},
},
+ {
+ Harness: HarnessCopilot,
+ Label: "GitHub Copilot CLI",
+ Aliases: []string{"copilot", "copilot-cli"},
+ NewSource: func(dir string) Source { return &copilotSource{dir: dir} },
+ Command: &runtimeCommand{
+ Executable: "copilot",
+ // --resume takes an optional value, so the id is bound to it with = rather than left to
+ // be read as the next argument.
+ Resume: func(s Session) ([]string, bool) { return []string{"--resume=" + s.ID}, true },
+ // -i starts the interactive TUI and sends the prompt as its first message.
+ NewSession: func(prompt string) []string { return []string{"-i", prompt} },
+ // Copilot asks before each tool call unless COPILOT_ALLOW_ALL=true, which also trusts the
+ // directory, or COPILOT_PLAN_THEN_AUTOPILOT, which starts in plan mode and carries the plan
+ // out without waiting. A session Beacon starts never inherits either.
+ Env: map[string]string{"COPILOT_ALLOW_ALL": "", "COPILOT_PLAN_THEN_AUTOPILOT": ""},
+ },
+ },
+ {
+ Harness: HarnessCursor,
+ Label: "Cursor",
+ NewSource: func(dir string) Source { return &cursorSource{dir: dir} },
+ // cursor-agent asks before running commands unless given --force; Beacon never passes it.
+ Command: &runtimeCommand{
+ Executable: "cursor-agent",
+ Resume: func(s Session) ([]string, bool) {
+ // --resume takes a CLI chat id. IDE conversations and subagent transcripts are not
+ // chats the CLI can load.
+ if !cursorCLIChat(s) {
+ return nil, false
+ }
+ return []string{"--resume", s.ID}, true
+ },
+ NewSession: func(prompt string) []string { return []string{prompt} },
+ // cursor-agent looks a chat id up under a hash of the directory it is started in.
+ ResumesInSessionDir: true,
+ },
+ },
// The runtimes below keep no session store Beacon reads. Their sessions come from Beacon's
// runtime log, so they always continue from a brief; each can also be the runtime another
diff --cc docs/cli/handoff.mdx
index ad100277,38bbe6d2..b33358f2
--- a/docs/cli/handoff.mdx
+++ b/docs/cli/handoff.mdx
@@@ -26,11 -26,11 +26,12 @@@ Sessions come from each runtime's own l
| Pi | `~/.pi/agent/sessions` (or under `PI_CODING_AGENT_DIR`) | `pi` |
| Prime Agent | `~/.prime/agent`, both `sessions` and `session-artifacts` (or `PRIME_AGENT_CODING_AGENT_DIR`) | `prime` |
| Factory Droid | `~/.factory/sessions` | `droid` |
+ | GitHub Copilot CLI | `~/.copilot/session-state` | `copilot` |
+| Cursor | `~/.cursor/projects` (agent transcripts) and Cursor's global storage `state.vscdb` (Composer conversations) | `cursor` |
-When a Codex thread has more than one rollout file, `beacon handoff` lists it once, under its newest file. Cline can hold the same task both as a CLI session and in its older task history; the CLI session is the copy that is listed. Cline kanban cards are not sessions and are not listed. Prime Agent subagent transcripts, under `session-artifacts`, are listed as subagents of the session that started them.
+When a Codex thread has more than one rollout file, `beacon handoff` lists it once, under its newest file. Cline can hold the same task both as a CLI session and in its older task history; the CLI session is the copy that is listed. Cline kanban cards are not sessions and are not listed. Prime Agent subagent transcripts, under `session-artifacts`, are listed as subagents of the session that started them. A Cursor conversation can be stored both as a transcript and as a Composer record under one id; it is listed once, as the transcript when `cursor-agent` can reopen it and as the Composer record otherwise. Cursor subagent transcripts are listed as subagents of the conversation that started them.
- `--store-dir <runtime>=<path>` takes the location in the table: for Pi its sessions directory, as `beacon endpoint pi sync --sessions-dir` does, and for Prime Agent the agent directory holding both of its roots. For Factory Droid it is the sessions directory, as `beacon endpoint factory sync --sessions-dir` does. For Cursor it is the projects directory, as `beacon endpoint cursor sync --projects-dir` does. Cursor's global storage database is always read from its default location.
-`--store-dir <runtime>=<path>` takes the location in the table: for Pi its sessions directory, as `beacon endpoint pi sync --sessions-dir` does, and for Prime Agent the agent directory holding both of its roots. For Factory Droid it is the sessions directory, as `beacon endpoint factory sync --sessions-dir` does. For GitHub Copilot CLI it is the `~/.copilot` directory that holds `session-state`, as `beacon endpoint copilot sync --copilot-dir` does.
++`--store-dir <runtime>=<path>` takes the location in the table: for Pi its sessions directory, as `beacon endpoint pi sync --sessions-dir` does, and for Prime Agent the agent directory holding both of its roots. For Factory Droid it is the sessions directory, as `beacon endpoint factory sync --sessions-dir` does. For GitHub Copilot CLI it is the `~/.copilot` directory that holds `session-state`, as `beacon endpoint copilot sync --copilot-dir` does. For Cursor it is the projects directory, as `beacon endpoint cursor sync --projects-dir` does. Cursor's global storage database is always read from its default location.
### Runtimes Beacon starts but does not read
@@@ -63,7 -63,7 +64,7 @@@ beacon handoff list --jso
| Flag | Description |
|------|-------------|
- | `--harness` | Only this runtime: `claude`, `codex`, `opencode`, `cline`, `pi`, `prime`, `droid` or `cursor`. |
-| `--harness` | Only this runtime: `claude`, `codex`, `opencode`, `cline`, `pi`, `prime`, `droid` or `copilot`. |
++| `--harness` | Only this runtime: `claude`, `codex`, `opencode`, `cline`, `pi`, `prime`, `droid`, `copilot` or `cursor`. |
| `--here` | Only sessions that ran in the current directory or below it. |
| `--dir` | Only sessions that ran in this directory or below it. |
| `--subagents` | Include subagent sessions. They are hidden by default, because resuming one resumes a fragment of its parent's task. |
@@@ -131,7 -131,7 +132,8 @@@ There are two ways to resume
| Pi | `pi --session <session file>` |
| Prime Agent | `prime-agent --resume <session file>` |
| Factory Droid | `droid --resume <id>` |
+ | GitHub Copilot CLI | `copilot --resume=<id>` |
+ | Cursor | `cursor-agent --resume <chat id>` (chats `cursor-agent` started only) |
- **Start a new session from a brief.** Otherwise, or with `--agent` naming another runtime or with `--new`, Beacon writes a brief (see `export`) and starts a new session. The first message of that session points at the brief:
@@@ -144,7 -144,7 +146,8 @@@
| Pi | `pi -- "<prompt>"` |
| Prime Agent | `prime-agent -- "<prompt>"` |
| Factory Droid | `droid "<prompt>"` |
+ | GitHub Copilot CLI | `copilot -i "<prompt>"` |
+ | Cursor | `cursor-agent "<prompt>"` |
| Oh My Pi | `omp --approval-mode=always-ask "<prompt>"` |
| Gemini CLI | `gemini --approval-mode default --prompt-interactive "<prompt>"` |
| Qwen Code | `qwen --approval-mode default --prompt-interactive "<prompt>"` |
@@@ -200,8 -200,8 +205,8 @@@ The link event keeps the new session's
Two paths record the link:
- **Live hooks and plugins.** Every runtime whose prompts Beacon captures as they are sent records it: the shared prompt hook (Claude Code, Cursor, Factory Droid, Qwen Code, Kiro, Kimi Code, Devin, Muse Code, OpenHands, Grok Build, DeepSeek Harness, Hermes Agent, VS Code), Antigravity (including the prompt it recovers from its transcript when the prompt hook does not fire), the Cline, OpenCode and OpenClaw plugins, and the Pi, Oh My Pi, Prime Agent and Senpi extensions (`harness.collection_method` `hook` or `plugin`).
- - **Session-store sync.** `beacon endpoint claude sync`, `codex sync`, `opencode sync`, `cline sync`, `pi sync`, `prime sync`, `factory sync` and `cursor sync` record it when they read the prompt back from the runtime's store (`harness.collection_method: poll`).
-- **Session-store sync.** `beacon endpoint claude sync`, `codex sync`, `opencode sync`, `cline sync`, `pi sync`, `prime sync`, `factory sync` and `copilot sync` record it when they read the prompt back from the runtime's store (`harness.collection_method: poll`).
++- **Session-store sync.** `beacon endpoint claude sync`, `codex sync`, `opencode sync`, `cline sync`, `pi sync`, `prime sync`, `factory sync`, `copilot sync` and `cursor sync` record it when they read the prompt back from the runtime's store (`harness.collection_method: poll`).
- Codex CLI prompts reach Beacon over OTLP and through `beacon endpoint codex sync`, not a prompt hook, so a session continued in Codex is linked by the sync. For a runtime that also has a prompt hook or plugin, a sync can record the same link the hook already did; the two carry different `collection_method` values, as every other event those runtimes report through both paths does. A sync's link has a deterministic `event.id`, so syncing again never duplicates it.
+ Codex CLI prompts reach Beacon over OTLP and through `beacon endpoint codex sync`, not a prompt hook, so a session continued in Codex is linked by the sync. The same holds for GitHub Copilot CLI, whose live path is OTLP: `beacon endpoint copilot sync` records the link. For a runtime that also has a prompt hook or plugin, a sync can record the same link the hook already did; the two carry different `collection_method` values, as every other event those runtimes report through both paths does. A sync's link has a deterministic `event.id`, so syncing again never duplicates it.
The marker is a claim made in prompt text, not a verified identity: anyone can type it. `fidelity: observed` records that the marker was seen, not that `beacon handoff resume` wrote it. A native resume keeps the session's own id, so it needs no link.