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-l-openclaw

Claudea1b5a0df6f2d
diff --cc cli/beacon/internal/handoff/resume_test.go
index e9b435ea,39c4d7f7..742b513d
--- 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", "openclaw")
+ 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", "openclaw")
// resumableSession is a session whose directory and session file both exist.
func resumableSession(t *testing.T, harness, id string) Session {
@@@ -80,8 -82,7 +82,9 @@@ func TestPlanResumeStartsANewSessionInE
{HarnessCline, "cline", []string{"--tui", "--auto-approve", "false"}},
{HarnessPi, "pi", []string{"--"}},
{HarnessPrime, "prime-agent", []string{"--"}},
+ {HarnessFactory, "droid", nil},
+ // {key} stands for the fresh Gateway session key the prompt derives.
+ {HarnessOpenClaw, "openclaw", []string{"tui", "--session", "{key}", "--message"}},
{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 0b737d8a,8a699d9f..fefce972
--- 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/openclawsession"
"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"
@@@ -54,7 -54,7 +55,8 @@@ const
HarnessCline = clinesession.Harness
HarnessPi = pisession.Harness
HarnessPrime = primesession.Harness
+ HarnessFactory = factorysession.Harness
+ HarnessOpenClaw = openclawsession.Harness
// Runtimes Beacon starts but whose sessions it reads only from the runtime log.
HarnessOhMyPi = "omp"
@@@ -162,27 -162,21 +164,42 @@@ 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: HarnessOpenClaw,
+ Label: "OpenClaw Gateway",
+ Aliases: []string{"openclaw", "openclaw-gateway"},
+ NewSource: func(dir string) Source { return &openClawSource{dir: dir} },
+ // The TUI is a client of the Gateway: it needs the Gateway running, and a conversation lives
+ // on the Gateway under its session key, not its transcript id. --deliver stays off, so
+ // replies are not sent out through the Gateway's chat channels.
+ Command: &runtimeCommand{
+ Executable: "openclaw",
+ Resume: func(s Session) ([]string, bool) {
+ if s.Key == "" {
+ return nil, false
+ }
+ return []string{"tui", "--session", s.Key}, true
+ },
+ NewSession: func(prompt string) []string {
+ return []string{"tui", "--session", openClawNewSessionKey(prompt), "--message", prompt}
+ },
+ },
+ },
// 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 ef886ece,10295583..cdb02708
--- 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` |
+| OpenClaw Gateway | `~/.openclaw/agents/<agent>/sessions` for every agent (or under `OPENCLAW_STATE_DIR`) | `openclaw` |
-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. OpenClaw transcript ids are unique only within one agent. When two agents hold the same id, both are listed, and `export` and `resume` report the id as ambiguous rather than pick one.
-`--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.
+OpenClaw Gateway sessions are read from the JSONL transcripts and the `sessions.json` index in each agent's `sessions` directory, as `beacon endpoint openclaw sessions sync` reads them. Recent OpenClaw releases keep live sessions in a per-agent SQLite database and treat that directory as legacy, so sessions that exist only in the database are not listed.
+
- `--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 OpenClaw Gateway its state directory, as `beacon endpoint openclaw sessions sync --openclaw-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 OpenClaw Gateway it is its state directory, as `beacon endpoint openclaw sessions sync --openclaw-dir` does.
### 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`, `cline`, `pi`, `prime` or `openclaw`. |
-| `--harness` | Only this runtime: `claude`, `codex`, `opencode`, or `cline`. |
++| `--harness` | Only this runtime: `claude`, `codex`, `opencode`, `cline`, `pi`, `prime`, `droid` or `openclaw`. |
| `--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>` |
+ | OpenClaw Gateway | `openclaw tui --session <session key>` |
- **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:
@@@ -143,7 -141,7 +145,8 @@@
| Cline | `cline --tui --auto-approve false "<prompt>"` |
| Pi | `pi -- "<prompt>"` |
| Prime Agent | `prime-agent -- "<prompt>"` |
+ | Factory Droid | `droid "<prompt>"` |
+ | OpenClaw Gateway | `openclaw tui --session beacon-handoff-<hash> --message "<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>"` |
@@@ -199,7 -195,7 +202,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 `openclaw sessions 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 `openclaw sessions 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.