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-j-fx

Claudea60145561685
diff --cc cli/beacon/internal/handoff/resume_test.go
index 128838cf,39c4d7f7..299d50d1
--- a/cli/beacon/internal/handoff/resume_test.go
+++ b/cli/beacon/internal/handoff/resume_test.go
@@@ -24,7 -24,8 +24,8 @@@ func installed(names ...string) func(st
}
}
- var allRuntimes = installed("claude", "codex", "opencode", "cline", "pi", "prime-agent", "omp", "gemini", "qwen", "kiro-cli", "agy", "devin", "muse", "openhands", "goose", "fx")
+ var allRuntimes = installed("claude", "codex", "opencode", "cline", "pi", "prime-agent", "droid",
- "omp", "gemini", "qwen", "kiro-cli", "agy", "devin", "muse", "openhands", "goose")
++ "omp", "gemini", "qwen", "kiro-cli", "agy", "devin", "muse", "openhands", "goose", "fx")
// resumableSession is a session whose directory and session file both exist.
func resumableSession(t *testing.T, harness, id string) Session {
diff --cc cli/beacon/internal/handoff/runtimes.go
index fd2d2b16,8a699d9f..6f03e067
--- 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/factorysession"
+ "github.com/asymptote-labs/agent-beacon/cli/beacon/internal/fxsession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/opencodesession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/pisession"
"github.com/asymptote-labs/agent-beacon/cli/beacon/internal/primesession"
@@@ -57,7 -54,7 +58,8 @@@ const
HarnessCline = clinesession.Harness
HarnessPi = pisession.Harness
HarnessPrime = primesession.Harness
+ HarnessFactory = factorysession.Harness
+ HarnessFx = fxsession.Harness
// Runtimes Beacon starts but whose sessions it reads only from the runtime log.
HarnessOhMyPi = "omp"
@@@ -165,22 -162,21 +167,37 @@@ var runtimes = []Runtime
NewSession: func(prompt string) []string { return []string{"--", prompt} },
},
},
+ {
+ Harness: HarnessFactory,
+ Label: "Factory Droid",
+ Aliases: []string{"droid", "factory-droid"},
+ NewSource: func(dir string) Source { return &factorySource{dir: dir} },
+ // Droid's interactive mode asks before it acts. Beacon never passes --auto, so a session it
+ // starts keeps asking.
+ Command: &runtimeCommand{
+ Executable: "droid",
+ Resume: func(s Session) ([]string, bool) { return []string{"--resume", s.ID}, true },
+ // The prompt is droid's positional argument. It starts with a word that is neither an
+ // option nor one of droid's subcommands, so it is read as the prompt.
+ NewSession: func(prompt string) []string { return []string{prompt} },
+ },
+ },
+ {
+ Harness: HarnessFx,
+ Label: "fx",
+ Aliases: []string{"fx"},
+ NewSource: func(dir string) Source { return &fxSource{dir: dir} },
+ Command: &runtimeCommand{
+ Executable: "fx",
+ // fx looks a session id up within the workspace it runs in; the plan starts it in the
+ // session's workspace root.
+ Resume: func(s Session) ([]string, bool) { return []string{"--resume", s.ID}, true },
+ // fx resumes only sessions of the workspace it is started in.
+ ResumesInSessionDir: true,
+ // No NewSession: fx has no interactive session that starts from a prompt (`fx ask` is
+ // one-shot), so it reopens its own sessions but cannot pick one up from a brief.
+ },
+ },
// 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 c9c4b404,10295583..27f64d87
--- a/docs/cli/handoff.mdx
+++ b/docs/cli/handoff.mdx
@@@ -25,13 -25,11 +25,14 @@@ Sessions come from each runtime's own l
| Cline | `~/.cline/data` | `cline` |
| 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` |
+| fx | `~/.fx/sessions` | `fx` |
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.
- `--store-dir <runtime>=<path>` takes the location in the table: for Pi its sessions directory, as `beacon endpoint pi sync --sessions-dir` does, for Prime Agent the agent directory holding both of its roots, and for fx its sessions directory, as `beacon endpoint fx sync --sessions-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.
++`--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 fx it is its sessions directory, as `beacon endpoint fx sync --sessions-dir` does.
+
+fx records no session title, so an fx session is listed under its first prompt, and its directory is the workspace fx last bound it to.
### Runtimes Beacon starts but does not read
@@@ -64,7 -62,7 +65,7 @@@ beacon handoff list --jso
| Flag | Description |
|------|-------------|
--| `--harness` | Only this runtime: `claude`, `codex`, `opencode`, or `cline`. |
++| `--harness` | Only this runtime: `claude`, `codex`, `opencode`, `cline`, `pi`, `prime`, `droid` or `fx`. |
| `--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 -129,7 +132,8 @@@ There are two ways to resume
| Cline | `cline --tui --auto-approve false --id <id>` |
| Pi | `pi --session <session file>` |
| Prime Agent | `prime-agent --resume <session file>` |
+ | Factory Droid | `droid --resume <id>` |
+ | fx | `fx --resume <id>`, in the session's workspace |
- **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:
@@@ -198,7 -195,7 +201,7 @@@ 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` and `fx 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` and `factory 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 `fx 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.