diff --git a/client/src/components/lanes/AddLaneModal.tsx b/client/src/components/lanes/AddLaneModal.tsx
index a9e04aa..1e76587 100644
--- a/client/src/components/lanes/AddLaneModal.tsx
+++ b/client/src/components/lanes/AddLaneModal.tsx
@@ -92,6 +92,8 @@ export function AddLaneModal({
   const [branch, setBranch] = useState("");
   const [branches, setBranches] = useState<string[] | null>(null);
   const [base, setBase] = useState("");
+  const [pipeline, setPipeline] = useState("default");
+  const [pipelines, setPipelines] = useState<{ id: string; name: string; nodes: unknown[] }[]>([]);
   const [branchesError, setBranchesError] = useState<string | null>(null);
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -109,12 +111,35 @@ export function AddLaneModal({
     setBranch("");
     setBranches(null);
     setBase("");
+    setPipeline("default");
     setBranchesError(null);
     setError(null);
     setBusy(false);
     setSetupResult(null);
   };
 
+  // The template a lane is created with is the ONLY chance to get it right
+  // from here: nothing else in the UI can change it afterwards, so a lane
+  // silently born on `default` renders an 8-node map for a 16-node workflow.
+  // Fetched on open (templates are file-backed and can change between opens).
+  useEffect(() => {
+    if (!open) return;
+    let cancelled = false;
+    api.lanes
+      .pipelines()
+      .then((r) => {
+        if (!cancelled) setPipelines(r.pipelines);
+      })
+      .catch(() => {
+        // Quiet: the select just falls back to the single `default` option
+        // below, and the lane still gets created.
+        if (!cancelled) setPipelines([]);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [open]);
+
   // Look up the repo's branches once the path settles - debounced so every
   // keystroke while typing a path doesn't fire a request against a path that
   // isn't finished yet. Worktree mode only: "Repo" mode adopts as-is and
@@ -158,7 +183,11 @@ export function AddLaneModal({
 
     if (mode === "repo") {
       try {
-        const result = await api.lanes.ensure({ cwd: repo, title: name || undefined });
+        const result = await api.lanes.ensure({
+          cwd: repo,
+          title: name || undefined,
+          pipeline,
+        });
         onAdded(result.lane);
         reset();
         onClose();
@@ -176,6 +205,7 @@ export function AddLaneModal({
         title: name,
         base: base || undefined,
         branch: branch.trim(),
+        pipeline,
       });
       onAdded(result.lane);
 
@@ -318,6 +348,27 @@ export function AddLaneModal({
           />
         </div>
 
+        <div>
+          <label className="mb-1 block text-xs text-fg-secondary" htmlFor="add-lane-pipeline">
+            {t("addLanePipelineLabel")}
+          </label>
+          <select
+            id="add-lane-pipeline"
+            value={pipeline}
+            onChange={(e) => setPipeline(e.target.value)}
+            className="w-full rounded-md border border-border-light bg-surface-0 px-3 py-1.5 text-xs text-fg-primary focus:border-blue-500 focus:outline-none"
+          >
+            {(pipelines.length ? pipelines : [{ id: "default", name: "default", nodes: [] }]).map(
+              (p) => (
+                <option key={p.id} value={p.id}>
+                  {p.nodes.length ? `${p.name} (${p.nodes.length})` : p.name}
+                </option>
+              )
+            )}
+          </select>
+          <p className="mt-1 text-[10px] text-fg-muted">{t("addLanePipelineHint")}</p>
+        </div>
+
         {mode === "worktree" && branches && (
           <div>
             <label className="mb-1 block text-xs text-fg-secondary" htmlFor="add-lane-base">
diff --git a/client/src/components/lanes/__tests__/AddLaneModal.test.tsx b/client/src/components/lanes/__tests__/AddLaneModal.test.tsx
index 6597222..453be98 100644
--- a/client/src/components/lanes/__tests__/AddLaneModal.test.tsx
+++ b/client/src/components/lanes/__tests__/AddLaneModal.test.tsx
@@ -21,6 +21,7 @@ vi.mock("../../../lib/api", () => ({
   api: {
     lanes: {
       branches: vi.fn(),
+      pipelines: vi.fn(),
       worktree: vi.fn(),
       ensure: vi.fn(),
       browse: vi.fn(),
@@ -101,6 +102,18 @@ async function fillWorktreeForm(
 
 beforeEach(() => {
   vi.mocked(api.lanes.branches).mockReset();
+  vi.mocked(api.lanes.pipelines)
+    .mockReset()
+    .mockResolvedValue({
+      pipelines: [
+        { id: "default", name: "Default feature pipeline", nodes: new Array(8).fill({ id: "n" }) },
+        {
+          id: "ship-feature",
+          name: "Ship feature (lane pipeline)",
+          nodes: new Array(16).fill({ id: "n" }),
+        },
+      ],
+    });
   vi.mocked(api.lanes.worktree).mockReset();
   vi.mocked(api.lanes.ensure).mockReset();
   vi.mocked(api.lanes.browse).mockReset();
@@ -174,6 +187,7 @@ describe("AddLaneModal — worktree mode (default)", () => {
         title: "New feature",
         base: "main",
         branch: "feat/new-feature",
+        pipeline: "default",
       });
     });
     expect(onAdded).toHaveBeenCalledWith(
@@ -327,6 +341,7 @@ describe("AddLaneModal — repo mode (adopt)", () => {
       expect(api.lanes.ensure).toHaveBeenCalledWith({
         cwd: "/Users/tester/projects/repo",
         title: "main repo",
+        pipeline: "default",
       })
     );
     expect(api.lanes.worktree).not.toHaveBeenCalled();
@@ -376,3 +391,47 @@ describe("AddLaneModal — folder browse", () => {
     expect(onClose).not.toHaveBeenCalled();
   });
 });
+
+describe("AddLaneModal — pipeline template", () => {
+  it("offers every template the server reports and sends the chosen one when adopting a repo", async () => {
+    // Creation is the ONLY point the UI can set a template, so a lane born on
+    // `default` renders 8 nodes for a 16-node workflow with no way back from
+    // any screen.
+    vi.mocked(api.lanes.ensure).mockResolvedValue({
+      lane: laneFixture({ status: "idle" }),
+      created: true,
+    });
+    renderModal();
+    const user = userEvent.setup();
+
+    await user.click(screen.getByRole("button", { name: "Repo" }));
+    const select = await screen.findByLabelText("Pipeline template");
+    await waitFor(() =>
+      expect(screen.getByRole("option", { name: /Ship feature/ })).toBeInTheDocument()
+    );
+    expect(
+      screen.getByRole("option", { name: /Default feature pipeline \(8\)/ })
+    ).toBeInTheDocument();
+
+    const repoField = screen.getByLabelText("Directory");
+    await focusField(user, repoField);
+    await user.type(repoField, "/Users/tester/projects/repo");
+    await user.selectOptions(select, "ship-feature");
+    await user.click(screen.getByRole("button", { name: "Add lane" }));
+
+    await waitFor(() =>
+      expect(api.lanes.ensure).toHaveBeenCalledWith(
+        expect.objectContaining({ pipeline: "ship-feature" })
+      )
+    );
+  });
+
+  it("still renders a usable select, and still creates the lane, when the template list cannot be fetched", async () => {
+    vi.mocked(api.lanes.pipelines).mockRejectedValue(new Error("offline"));
+    renderModal();
+
+    const select = await screen.findByLabelText("Pipeline template");
+    await waitFor(() => expect(select).toHaveValue("default"));
+    expect(screen.getByRole("option", { name: "default" })).toBeInTheDocument();
+  });
+});
diff --git a/client/src/i18n/locales/en/lanes.json b/client/src/i18n/locales/en/lanes.json
index c7cb85f..a5cec59 100644
--- a/client/src/i18n/locales/en/lanes.json
+++ b/client/src/i18n/locales/en/lanes.json
@@ -24,6 +24,8 @@
   "addLaneBranchPlaceholder": "feat/my-feature",
   "addLaneNoBranches": "This repo has no commits yet — the worktree will start empty.",
   "addLaneNotARepo": "Not a git repository (or no read access) yet.",
+  "addLanePipelineHint": "Which stages this lane's map shows. Pick the one the skill driving it declares against — nothing else in this UI changes it later.",
+  "addLanePipelineLabel": "Pipeline template",
   "addLaneProvisionFailed": "Worktree provisioning failed or timed out — the lane exists but auto-setup was skipped. Check the lane's git facts, then run agents/mcp setup manually.",
   "addLaneRepoHint": "An existing git repo. The dashboard creates a new worktree for the lane, not a folder you pick.",
   "addLaneRepoHintAdopt": "An existing directory. The dashboard tracks it as-is — no worktree, no new branch.",
diff --git a/client/src/i18n/locales/vi/lanes.json b/client/src/i18n/locales/vi/lanes.json
index 2c3ec09..0f89052 100644
--- a/client/src/i18n/locales/vi/lanes.json
+++ b/client/src/i18n/locales/vi/lanes.json
@@ -24,6 +24,8 @@
   "addLaneBranchPlaceholder": "feat/tinh-nang-cua-toi",
   "addLaneNoBranches": "Repo này chưa có commit nào — worktree sẽ bắt đầu trống.",
   "addLaneNotARepo": "Chưa phải repo git (hoặc không có quyền đọc).",
+  "addLanePipelineHint": "Bản đồ lane này sẽ hiện những stage nào. Chọn đúng cái mà skill điều khiển nó khai báo — sau này không màn hình nào đổi được.",
+  "addLanePipelineLabel": "Mẫu pipeline",
   "addLaneProvisionFailed": "Tạo worktree thất bại hoặc quá thời gian chờ — lane vẫn tồn tại nhưng tự động thiết lập đã bị bỏ qua. Kiểm tra git facts của lane, rồi chạy thiết lập agents/mcp thủ công.",
   "addLaneRepoHint": "Một repo git có sẵn. Dashboard tự tạo worktree mới cho lane, không phải thư mục bạn chọn.",
   "addLaneRepoHintAdopt": "Một thư mục có sẵn. Dashboard theo dõi nguyên trạng — không tạo worktree, không tạo nhánh mới.",
diff --git a/client/src/lib/api.ts b/client/src/lib/api.ts
index b855275..d136408 100644
--- a/client/src/lib/api.ts
+++ b/client/src/lib/api.ts
@@ -1900,11 +1900,20 @@ export const api = {
      * @param body The cwd and optional title.
      * @returns `{ lane, created }` — the lane (newly created or existing) and whether it was created.
      */
-    ensure: (body: { cwd: string; title?: string }) =>
+    ensure: (body: { cwd: string; title?: string; pipeline?: string }) =>
       request<{ lane: Lane; created: boolean }>("/lanes/ensure", {
         method: "POST",
         body: JSON.stringify(body),
       }),
+    /**
+     * GET /api/lanes/pipelines — every pipeline template the server can render
+     * a lane against, built-in plus any `DASHBOARD_PIPELINES_DIR` override.
+     * @returns `{ pipelines }` — each with its `id`, display `name` and `nodes`.
+     */
+    pipelines: () =>
+      request<{ pipelines: { id: string; name: string; nodes: { id: string }[] }[] }>(
+        "/lanes/pipelines"
+      ),
     /**
      * GET /api/lanes/branches — a candidate source repo's local branches.
      * @param repo Absolute path to an existing git repository.
@@ -1928,6 +1937,7 @@ export const api = {
       title?: string;
       base?: string;
       branch?: string;
+      pipeline?: string;
     }) =>
       request<{ lane: Lane }>("/lanes/worktree", {
         method: "POST",
diff --git a/docs/API.md b/docs/API.md
index b15349c..5466f7a 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -135,9 +135,14 @@ POST /api/lanes/ensure
 ```
 
 ```json
-{ "cwd": "/absolute/path/to/work", "title": "App package" }
+{ "cwd": "/absolute/path/to/work", "title": "App package", "pipeline": "ship-feature" }
 ```
 
+`pipeline` is optional and, like `title`, applies **only when a lane is
+actually created** — an existing lane is returned untouched. Omitted, the lane
+gets `default`. `POST /api/lanes/worktree` and `POST /api/lanes` take the same
+optional field. An id no template defines returns `400 EBADPIPELINE`.
+
 Idempotent lookup by working directory — the Workspace page opens on a `cwd`,
 not on a lane id. Returns the lane whose own `cwd` is that path, or the longest
 path-boundary parent of it, as `{ "lane": {...}, "created": false }` with `200`.
diff --git a/docs/LANES.md b/docs/LANES.md
index 220e05b..d6e1e28 100644
--- a/docs/LANES.md
+++ b/docs/LANES.md
@@ -420,7 +420,9 @@ The dashboard web UI shows each lane as a card in a grid, with the selected lane
 
 A lane moves through stages defined in a **pipeline template** (see "Custom pipeline templates" below). The default pipeline has eight stages: `intake`, `plan`, `implement`, `tests`, `review`, `gate`, `ship`, and `done`.
 
-**A lane is created on `default` unless told otherwise, and nothing in the web UI changes that** — the "+ Add lane" flow has no template picker, so a lane that should render the 16-node `ship-feature` map will show `default`'s 8 nodes until it is switched:
+**A lane is created on `default` unless told otherwise.** The "+ Add lane" modal has a *Pipeline template* select listing every template the server reports, so this is chosen at creation; `ccam lanes add --pipeline <id>` is the same choice from the terminal. Creation is the point that matters — a lane born on `default` renders 8 nodes for a 16-node workflow.
+
+For a lane that already exists (including every lane created before the picker shipped):
 
 ```bash
 ccam lanes pipeline                 # which template this lane uses, and what else exists
diff --git a/server/routes/lanes.js b/server/routes/lanes.js
index cbadb43..c38278d 100644
--- a/server/routes/lanes.js
+++ b/server/routes/lanes.js
@@ -161,11 +161,15 @@ router.post("/ensure", sameOriginGuard, (req, res) => {
   const owner = lanesLib.resolveLaneByCwd(body.cwd);
   if (owner) return res.json({ lane: payload(owner), created: false });
   try {
-    const lane = lanesLib.createLane({ cwd: body.cwd, title: body.title || "" });
+    const lane = lanesLib.createLane({
+      cwd: body.cwd,
+      title: body.title || "",
+      ...(body.pipeline ? { pipeline: body.pipeline } : {}),
+    });
     broadcastLane(lane.id);
     return res.status(201).json({ lane: payload(lane), created: true });
   } catch (err) {
-    if (err.code === "EBADCWD") {
+    if (err.code === "EBADCWD" || err.code === "EBADPIPELINE") {
       return res.status(400).json({ error: { code: err.code, message: err.message } });
     }
     // The cwd UNIQUE constraint is the arbiter: someone else won the race, so
@@ -248,7 +252,7 @@ router.post("/", sameOriginGuard, (req, res) => {
     broadcastLane(lane.id);
     res.status(201).json({ lane: payload(lane) });
   } catch (err) {
-    if (err.code === "EBADCWD") {
+    if (err.code === "EBADCWD" || err.code === "EBADPIPELINE" || err.code === "EBADKIND") {
       return res.status(400).json({ error: { code: err.code, message: err.message } });
     }
     if (err.code === "SQLITE_CONSTRAINT_UNIQUE" || String(err.message).includes("UNIQUE")) {
@@ -569,6 +573,7 @@ router.post("/worktree", sameOriginGuard, async (req, res) => {
       source_repo: resolvedSourceRepo,
       base_branch: body.base || null,
       slug,
+      ...(body.pipeline ? { pipeline: body.pipeline } : {}),
     });
     lane = lanesLib.updateLane(lane.id, { status: "provisioning" });
   } catch (err) {