diff --git a/client/src/components/lanes/AddLaneModal.tsx b/client/src/components/lanes/AddLaneModal.tsx
index 1e76587d..2f42055d 100644
--- a/client/src/components/lanes/AddLaneModal.tsx
+++ b/client/src/components/lanes/AddLaneModal.tsx
@@ -24,7 +24,7 @@ import { CwdAutocomplete } from "../run/RunSetup";
 import { FolderBrowseModal } from "./FolderBrowseModal";
 import { api } from "../../lib/api";
 import type { CwdSuggestion } from "../../lib/api";
-import type { Lane } from "../../lib/types";
+import type { Lane, LaneTool } from "../../lib/types";
 
 /** Polls the lane until the background `git worktree add` finishes (status
  *  leaves "provisioning"), or gives up after `timeoutMs`. Returns the final
@@ -95,6 +95,7 @@ export function AddLaneModal({
   const [pipeline, setPipeline] = useState("default");
   const [pipelines, setPipelines] = useState<{ id: string; name: string; nodes: unknown[] }[]>([]);
   const [branchesError, setBranchesError] = useState<string | null>(null);
+  const [tool, setTool] = useState<LaneTool>("claude");
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [browseOpen, setBrowseOpen] = useState(false);
@@ -112,6 +113,7 @@ export function AddLaneModal({
     setBranches(null);
     setBase("");
     setPipeline("default");
+    setTool("claude");
     setBranchesError(null);
     setError(null);
     setBusy(false);
@@ -187,6 +189,7 @@ export function AddLaneModal({
           cwd: repo,
           title: name || undefined,
           pipeline,
+          tool,
         });
         onAdded(result.lane);
         reset();
@@ -206,6 +209,7 @@ export function AddLaneModal({
         base: base || undefined,
         branch: branch.trim(),
         pipeline,
+        tool,
       });
       onAdded(result.lane);
 
@@ -307,6 +311,22 @@ export function AddLaneModal({
           />
         </div>
 
+        <div>
+          <label className="mb-1 block text-xs text-fg-secondary">{t("addLaneToolHint")}</label>
+          <div className="flex items-center rounded-md border border-border bg-surface-2 p-0.5">
+            <Seg
+              active={tool === "claude"}
+              label={t("addLaneToolClaude")}
+              onClick={() => setTool("claude")}
+            />
+            <Seg
+              active={tool === "codex"}
+              label={t("addLaneToolCodex")}
+              onClick={() => setTool("codex")}
+            />
+          </div>
+        </div>
+
         <div>
           <label className="mb-1 block text-xs text-fg-secondary" htmlFor="add-lane-repo">
             {mode === "repo" ? t("addLaneRepoLabelAdopt") : t("addLaneRepoLabel")}
diff --git a/client/src/components/lanes/__tests__/AddLaneModal.test.tsx b/client/src/components/lanes/__tests__/AddLaneModal.test.tsx
index 1ffb1fe4..3326d70f 100644
--- a/client/src/components/lanes/__tests__/AddLaneModal.test.tsx
+++ b/client/src/components/lanes/__tests__/AddLaneModal.test.tsx
@@ -192,6 +192,7 @@ describe("AddLaneModal — worktree mode (default)", () => {
         base: "main",
         branch: "feat/new-feature",
         pipeline: "default",
+        tool: "claude",
       });
     });
     expect(onAdded).toHaveBeenCalledWith(
@@ -346,6 +347,7 @@ describe("AddLaneModal — repo mode (adopt)", () => {
         cwd: "/Users/tester/projects/repo",
         title: "main repo",
         pipeline: "default",
+        tool: "claude",
       })
     );
     expect(api.lanes.worktree).not.toHaveBeenCalled();
@@ -439,3 +441,48 @@ describe("AddLaneModal — pipeline template", () => {
     expect(screen.getByRole("option", { name: "default" })).toBeInTheDocument();
   });
 });
+
+describe("AddLaneModal — tool selection", () => {
+  it("sends the picked tool when adopting a repo", async () => {
+    vi.mocked(api.lanes.ensure).mockResolvedValue({
+      lane: laneFixture({ id: 23, kind: "adopted", status: "idle" }),
+      created: true,
+    });
+    const onAdded = vi.fn();
+    const onClose = vi.fn();
+    renderModal({ onAdded, onClose });
+    const user = userEvent.setup();
+
+    await user.click(screen.getByRole("button", { name: "Repo" }));
+    const dirField = screen.getByLabelText("Directory");
+    await focusField(user, dirField);
+    await user.type(dirField, "/tmp/demo");
+    await user.click(screen.getByRole("button", { name: /codex/i }));
+    await user.click(screen.getByRole("button", { name: /add lane|create/i }));
+
+    await waitFor(() =>
+      expect(api.lanes.ensure).toHaveBeenCalledWith(expect.objectContaining({ tool: "codex" }))
+    );
+  });
+
+  it("defaults to claude code", async () => {
+    vi.mocked(api.lanes.ensure).mockResolvedValue({
+      lane: laneFixture({ id: 24, kind: "adopted", status: "idle" }),
+      created: true,
+    });
+    const onAdded = vi.fn();
+    const onClose = vi.fn();
+    renderModal({ onAdded, onClose });
+    const user = userEvent.setup();
+
+    await user.click(screen.getByRole("button", { name: "Repo" }));
+    const dirField = screen.getByLabelText("Directory");
+    await focusField(user, dirField);
+    await user.type(dirField, "/tmp/demo");
+    await user.click(screen.getByRole("button", { name: /add lane|create/i }));
+
+    await waitFor(() =>
+      expect(api.lanes.ensure).toHaveBeenCalledWith(expect.objectContaining({ tool: "claude" }))
+    );
+  });
+});
diff --git a/client/src/i18n/locales/en/lanes.json b/client/src/i18n/locales/en/lanes.json
index e394c691..b50c6377 100644
--- a/client/src/i18n/locales/en/lanes.json
+++ b/client/src/i18n/locales/en/lanes.json
@@ -37,6 +37,9 @@
   "addLaneSetupProfile": "Profile",
   "addLaneSetupTitle": "Setup",
   "addLaneTitleLabel": "Title",
+  "addLaneToolClaude": "Claude Code",
+  "addLaneToolCodex": "Codex",
+  "addLaneToolHint": "Which CLI drives this lane. Cannot be changed later.",
   "mode.repo": "Repo",
   "mode.repoHint": "Adopt this directory as a lane, as-is — no worktree, no new branch.",
   "mode.worktree": "Worktree",
diff --git a/client/src/i18n/locales/vi/lanes.json b/client/src/i18n/locales/vi/lanes.json
index c11e9169..4ebf8d44 100644
--- a/client/src/i18n/locales/vi/lanes.json
+++ b/client/src/i18n/locales/vi/lanes.json
@@ -37,6 +37,9 @@
   "addLaneSetupProfile": "Profile",
   "addLaneSetupTitle": "Thiết lập",
   "addLaneTitleLabel": "Tiêu đề",
+  "addLaneToolClaude": "Claude Code",
+  "addLaneToolCodex": "Codex",
+  "addLaneToolHint": "CLI nào điều khiển lane này. Không thể thay đổi sau này.",
   "mode.repo": "Repo",
   "mode.repoHint": "Gắn thẳng thư mục này làm lane, nguyên trạng — không worktree, không nhánh mới.",
   "mode.worktree": "Worktree",