Merge remote-tracking branch 'origin/main' into fix/pr248

# Conflicts:
#	README.md

Author: httpsphl

CLAUDE.md

@@ -1,6 +1,6 @@
 # Botloft
 
-Workspace desktop Windows-first, com código público sob a FSL (vira Apache 2.0 após dois anos), para rodar bots de agentes de código sempre ligados que colaboram entre si: Claude Code, Antigravity (experimental) e, em seguida, Codex. A seção 30 da spec e o ADR 0003 dizem como cada agente entra. Daemon Rust (`botloftd`) + app Tauri v2 + React.
+Workspace desktop Windows-first, com código público sob a FSL (vira Apache 2.0 após dois anos), para rodar bots de agentes de código sempre ligados que colaboram entre si: Claude Code, Antigravity e Codex (os dois últimos experimentais). A seção 30 da spec e o ADR 0003 dizem como cada agente entra. Daemon Rust (`botloftd`) + app Tauri v2 + React.
 
 ## Fonte de verdade
 

README.md

@@ -32,13 +32,15 @@
   <img src="docs/assets/hero-light.png" alt="Botloft with the Research crew open: seven bots, each with its own color, state and job">
 </picture>
 
-Botloft keeps a crew of [Claude Code](https://code.claude.com) bots running on your computer. Each
-bot has its own folder, memory and conversation. They pass work to each other, keep going after you
+Botloft keeps a crew of bots running on your computer, each on the AI coding agent you choose:
+[Claude Code](https://code.claude.com), or, as experimental options,
+[Antigravity](https://antigravity.google) and [Codex](https://developers.openai.com/codex). Each bot
+has its own folder, memory and conversation. They pass work to each other, keep going after you
 close the window and pick up where they left off after a restart. You talk to each one like in a
 chat app, and you decide what they may do.
 
-[Antigravity](https://antigravity.google) works as an experimental second agent on `main`, but no
-release has it yet. Codex is next (see [Agents](#agents)).
+The latest release, 0.14.0, runs bots on Claude Code. Antigravity and Codex are on `main` and in no
+release yet (see [Agents](#agents)).
 
 ## What you can do
 
@@ -103,8 +105,8 @@ itself.
 
 ## Agents
 
-Antigravity is only on `main` for now: no release has it yet. In a build of `main`, the two agents
-compare like this:
+Antigravity and Codex are only on `main` for now: no release has them yet. In a build of `main`,
+Claude Code and Antigravity compare like this:
 
 | | Claude Code | Antigravity (experimental) |
 |---|---|---|
@@ -115,15 +117,18 @@ compare like this:
 | Usage meter and "Compact" | yes | an estimate of the conversation size; no compaction |
 | Isolation between crews | yes | folders are fenced for its file tools, not for commands you allow |
 
-Claude Code is the full experience. Antigravity is off until you add `experimental_agents = ["agy"]`
-to Botloft's `config.toml`; then a new bot can be made on it, and Settings has "Agent for new
-bots". Codex is the next agent. See [spec section 30](docs/spec.md) for what was checked.
+Claude Code is the full experience. Antigravity and Codex are off until you list them in Botloft's
+`config.toml` (`experimental_agents = ["agy"]`, `["codex"]` or both); then a new bot can be made on
+them, and Settings has "Agent for new bots". A Codex bot asks you before it changes a file or runs a
+command, like Claude Code, and shows the exact size of its conversation; it can still read any file,
+and it has no model picker or images yet. See [spec section 30](docs/spec.md) for what was
+checked.
 
 ## Get started
 
 You need [Claude Code](https://code.claude.com/docs/en/setup), installed and signed in once with
-your own account. Bots run on your own plan. (Antigravity, the experimental second agent, is only on
-`main` for now; see [Agents](#agents).)
+your own account. Bots run on your own plan. (Antigravity and Codex, the experimental agents, are
+only on `main` for now; see [Agents](#agents).)
 
 1. Download Botloft for your computer from the
    [latest release](https://github.com/httpsphl/botloft/releases/latest):
@@ -163,9 +168,9 @@ flowchart LR
 - **The daemon is the source of truth.** Closing the app never stops a bot. `botloftd` runs as a
   scheduled task of your Windows user, a systemd user service on Linux or a launch agent on macOS:
   it starts when you sign in and comes back soon if it dies.
-- **Your agent is the runtime.** Each bot is a real session of its agent (`claude -p` for Claude
-  Code; `agy -p` for Antigravity, on `main` only) with its own workspace, memory and conversation.
-  There is no custom agent SDK and no API key to manage.
+- **Your agent is the runtime.** Each bot is a real session of the agent you chose (`claude -p` for
+  Claude Code; `agy -p` for Antigravity and `codex app-server` for Codex, on `main` only) with its
+  own workspace, memory and conversation. There is no custom agent SDK and no API key to manage.
 - **One conversation per bot.** Your messages, messages from other bots and notices from the daemon
   reach the bot in order. What it does comes back as a chat: replies, tool use and requests you
   allow or deny.
@@ -262,8 +267,8 @@ Windows came first and has had the most use; if something does not work elsewher
 <details>
 <summary><b>Is Botloft made by Anthropic?</b></summary>
 
-No. Botloft is an independent project. It uses Claude Code (and, on `main`, Antigravity) as
-installed on your computer and is not affiliated with or endorsed by Anthropic or Google.
+No. Botloft is an independent project. It uses Claude Code (and, on `main`, Antigravity and Codex)
+as installed on your computer and is not affiliated with or endorsed by Anthropic, Google or OpenAI.
 </details>
 
 ## Status
@@ -273,16 +278,16 @@ that keep running in the background, the chat, crews with a Chief, ready-made bo
 agency, messages and tasks between bots, routines, the live browser, screens, "always allow" for
 requests, questions from bots, chat search, desktop use on Windows, connected tools, backups with an
 optional cloud copy, the phone page, the installer and updates. Still open: a code-signed installer.
-`main` is ahead of the latest release; among other things, it has Antigravity as an experimental
-agent.
+`main` is ahead of the latest release; among other things, it has Antigravity and Codex as
+experimental agents.
 
 <details>
 <summary><b>Development</b></summary>
 
 Requirements: Rust stable (the MSVC toolchain on Windows), Node.js 24 and pnpm. On Linux, the app
 also needs the desktop libraries Tauri uses (on Ubuntu: `libwebkit2gtk-4.1-dev`,
 `libayatana-appindicator3-dev`, `librsvg2-dev`, `libxdo-dev`). Running real bots also needs an agent
-installed and signed in: Claude Code (the native `claude` executable) or Antigravity (`agy`).
+installed and signed in: Claude Code (the native `claude` executable), Antigravity (`agy`) or Codex.
 
 ```powershell
 # Daemon and libraries

app/src/features/bots/BotDialog.tsx

@@ -148,12 +148,14 @@ export function BotDialog(props: Props) {
             />
             {agent !== "claude" && (
               <p role="note" className="rounded-lg bg-sunken p-2.5 text-ink-soft text-xs">
-                {t.bots.dialog.agent.experimental}
+                {agent === "codex"
+                  ? t.bots.dialog.agent.experimentalCodex
+                  : t.bots.dialog.agent.experimental}
               </p>
             )}
           </div>
         )}
-        {editing && editing.agent !== "claude" && (
+        {editing && editing.agent === "agy" && (
           <>
             <Toggle
               label={t.bots.dialog.fullAccess.title}

app/src/features/bots/agentPicker.test.tsx

@@ -30,3 +30,21 @@ describe("choosing the agent of a new bot", () => {
     expect(dialog.queryByLabelText("Model")).toBeNull();
   });
 });
+
+describe("Codex in the new-bot dialog", () => {
+  test("says what it cannot do yet", async () => {
+    const fake = new FakeBotloft();
+    fake.system = { ...fake.system, enabledAgents: ["claude", "codex"] };
+    fake.addCrew("Ops");
+    renderApp(fake);
+    await crewOpened("Ops");
+    const [button] = await screen.findAllByRole("button", { name: "New bot" });
+    fireEvent.click(button as HTMLElement);
+    const dialog = within(await screen.findByRole("dialog", { name: "New bot" }));
+    fireEvent.change(dialog.getByLabelText("Agent"), { target: { value: "codex" } });
+    expect(dialog.getByRole("note").textContent).toMatch(
+      /asks you before it changes a file or runs a command/,
+    );
+    expect(dialog.queryByLabelText("Model")).toBeNull();
+  });
+});

app/src/features/chat/ChatComposer.tsx

@@ -254,7 +254,7 @@ export const ChatComposer = memo(function ChatComposer({
                 <ModelPicker bot={bot} onLater={setLater} />
               </>
             ) : (
-              <AgentModelPicker bot={bot} onLater={setLater} />
+              bot.agent === "agy" && <AgentModelPicker bot={bot} onLater={setLater} />
             )}
             <button
               type="submit"

app/src/i18n/en/bots.ts

@@ -116,6 +116,8 @@ export const bots = {
       },
       experimental:
         "Experimental. This bot cannot ask you before it acts. It can work with files in its own folders and use the crew's tools, but it cannot run commands, and it has no usage meter or model choice.",
+      experimentalCodex:
+        "Experimental. This bot asks you before it changes a file or runs a command, like Claude Code. It can still read any file, and it has no model or image choice yet.",
     },
     color: "Color",
     swatch: (color: string) => `Color ${color}`,

app/src/i18n/es/bots.ts

@@ -114,6 +114,8 @@ export const bots: Messages["bots"] = {
       },
       experimental:
         "Experimental. Este bot no puede preguntarte antes de actuar. Trabaja con archivos de sus propias carpetas y usa las herramientas del equipo, pero no ejecuta comandos, y no tiene medidor de uso ni elección de modelo.",
+      experimentalCodex:
+        "Experimental. Este bot te pregunta antes de cambiar un archivo o ejecutar un comando, como Claude Code. Todavía puede leer cualquier archivo, y no tiene elección de modelo ni de imagen aún.",
     },
     color: "Color",
     swatch: (color: string) => `Color ${color}`,

app/src/i18n/pt-BR/bots.ts

@@ -113,6 +113,8 @@ export const bots: Messages["bots"] = {
       },
       experimental:
         "Experimental. Este bot não consegue perguntar a você antes de agir. Ele trabalha com arquivos das próprias pastas e usa as ferramentas da equipe, mas não roda comandos, e não tem medidor de uso nem escolha de modelo.",
+      experimentalCodex:
+        "Experimental. Este bot pergunta a você antes de mudar um arquivo ou rodar um comando, como o Claude Code. Ele ainda pode ler qualquer arquivo, e não tem escolha de modelo nem de imagem ainda.",
     },
     color: "Cor",
     swatch: (color: string) => `Cor ${color}`,

crates/botloftd/src/agent/agy.rs

@@ -11,6 +11,7 @@
 use std::ffi::OsString;
 use std::io;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use botloft_core::ids::BotId;
 use botloft_core::protocol::{AgentKind, TokenUsage};
@@ -115,17 +116,7 @@ impl Agent for AgyAgent {
             cli.join("settings.json"),
             pretty(&settings(files.fenced, files.allowed_commands)),
         )?;
-        // The rules `prepare_bot` wrote for Claude Code are the bot's rules;
-        // `agy` reads `AGENTS.md` from its folder.
-        let rules = files
-            .workspace
-            .join(".claude")
-            .join("rules")
-            .join("botloft.md");
-        if let Ok(text) = std::fs::read_to_string(rules) {
-            std::fs::write(files.workspace.join("AGENTS.md"), text)?;
-        }
-        Ok(())
+        super::copy_rules_to_agents_md(files.workspace)
     }
 
     fn speaks_control(&self) -> bool {
@@ -209,7 +200,7 @@ impl OutputDecoder for AgyDecoder {
         Some(text)
     }
 
-    fn handle(&mut self, daemon: &Daemon, bot: &BotId, generation: u64, event: &Value) {
+    fn handle(&mut self, daemon: &Arc<Daemon>, bot: &BotId, generation: u64, event: &Value) {
         if !daemon.supervisor.is_current(bot, generation) {
             return;
         }

crates/botloftd/src/agent/claude.rs

@@ -4,6 +4,7 @@
 use std::ffi::OsString;
 use std::io;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use botloft_core::ids::BotId;
 use botloft_core::protocol::AgentKind;
@@ -143,7 +144,7 @@ impl OutputDecoder for ClaudeDecoder {
         claude::live_text(event)
     }
 
-    fn handle(&mut self, daemon: &Daemon, bot: &BotId, generation: u64, event: &Value) {
+    fn handle(&mut self, daemon: &Arc<Daemon>, bot: &BotId, generation: u64, event: &Value) {
         claude::apply(daemon, bot, generation, event);
     }
 }