feat(FN-2982): merge fusion/fn-2982

Merges FN-2982 Step 3: adds model filtering for the droid-cli settings API, fixes planning mode question display and new-session reset in the dashboard, and adds test coverage for droid-cli settings and model route registration.

Fusion-Task-Id: FN-2982

packages/dashboard/src/__tests__/register-model-routes-droid-cli.test.ts

@@ -0,0 +1,61 @@
+import { describe, expect, it, vi } from "vitest";
+import type { Router } from "express";
+import { registerModelRoutes } from "../routes/register-model-routes.js";
+
+function setup(useDroidCli?: boolean) {
+  const getHandlers = new Map<string, (req: unknown, res: { json: (body: unknown) => void }) => Promise<void>>();
+  const router = {
+    get: vi.fn((path: string, handler: (req: unknown, res: { json: (body: unknown) => void }) => Promise<void>) => {
+      getHandlers.set(path, handler);
+    }),
+  } as unknown as Router;
+
+  const store = {
+    getGlobalSettingsStore: () => ({
+      getSettings: vi.fn().mockResolvedValue({ useDroidCli }),
+    }),
+  };
+
+  const runtimeLogger = {
+    child: vi.fn(() => ({ warn: vi.fn() })),
+  };
+
+  const modelRegistry = {
+    refresh: vi.fn(),
+    getAvailable: vi.fn(() => [
+      { provider: "droid-cli", id: "droid/model", name: "Droid", reasoning: false, contextWindow: 0 },
+      { provider: "openai", id: "gpt-5", name: "GPT-5", reasoning: true, contextWindow: 128000 },
+    ]),
+  };
+
+  registerModelRoutes({
+    router,
+    store: store as never,
+    runtimeLogger: runtimeLogger as never,
+    options: { modelRegistry } as never,
+  } as never);
+
+  return { handler: getHandlers.get("/models")!, modelRegistry };
+}
+
+describe("registerModelRoutes droid-cli filter", () => {
+  it("filters droid-cli models when useDroidCli is false", async () => {
+    const { handler } = setup(false);
+    const json = vi.fn();
+
+    await handler({}, { json });
+
+    const response = json.mock.calls[0][0] as { models: Array<{ provider: string }> };
+    expect(response.models.some((model) => model.provider === "droid-cli")).toBe(false);
+  });
+
+  it("includes droid-cli models when useDroidCli is true", async () => {
+    const { handler } = setup(true);
+    const json = vi.fn();
+
+    await handler({}, { json });
+
+    const response = json.mock.calls[0][0] as { models: Array<{ provider: string }> };
+    expect(response.models.some((model) => model.provider === "droid-cli")).toBe(true);
+  });
+});

packages/dashboard/src/__tests__/register-settings-droid-cli.test.ts

@@ -0,0 +1,75 @@
+import { describe, expect, it, vi } from "vitest";
+import type { Router } from "express";
+import { registerSettingsMemoryRoutes } from "../routes/register-settings-memory-routes.js";
+
+function setup(initialUseDroidCli = false) {
+  const putHandlers = new Map<string, (req: { body: Record<string, unknown> }, res: { json: (body: unknown) => void }) => Promise<void>>();
+  const router = {
+    get: vi.fn(),
+    put: vi.fn((path: string, handler: (req: { body: Record<string, unknown> }, res: { json: (body: unknown) => void }) => Promise<void>) => {
+      putHandlers.set(path, handler);
+    }),
+    post: vi.fn(),
+    delete: vi.fn(),
+  } as unknown as Router;
+
+  let globalSettings = { useDroidCli: initialUseDroidCli } as Record<string, unknown>;
+  const onUseDroidCliToggled = vi.fn();
+
+  const store = {
+    getGlobalSettingsStore: () => ({
+      getSettings: vi.fn(async () => globalSettings),
+      invalidateCache: vi.fn(),
+    }),
+    updateGlobalSettings: vi.fn(async (patch: Record<string, unknown>) => {
+      globalSettings = { ...globalSettings, ...patch };
+      return globalSettings;
+    }),
+  };
+
+  registerSettingsMemoryRoutes(
+    {
+      router,
+      store: store as never,
+      options: {
+        onUseDroidCliToggled,
+        engineManager: { getAllEngines: () => new Map() },
+      } as never,
+      runtimeLogger: { warn: vi.fn() } as never,
+      getProjectContext: vi.fn() as never,
+      rethrowAsApiError: (err: unknown): never => {
+        throw err;
+      },
+    } as never,
+    {
+      validateModelPresets: () => undefined,
+      sanitizeOverlapIgnorePaths: () => undefined,
+      discoverDashboardPiExtensions: async () => ({ entries: [] }) as never,
+    },
+  );
+
+  return {
+    putSettingsGlobal: putHandlers.get("/settings/global")!,
+    onUseDroidCliToggled,
+  };
+}
+
+describe("registerSettingsMemoryRoutes useDroidCli hook", () => {
+  it("fires onUseDroidCliToggled on transition", async () => {
+    const { putSettingsGlobal, onUseDroidCliToggled } = setup(false);
+    await putSettingsGlobal({ body: { useDroidCli: true } }, { json: vi.fn() });
+    expect(onUseDroidCliToggled).toHaveBeenCalledWith(false, true);
+  });
+
+  it("does not fire onUseDroidCliToggled when value does not change", async () => {
+    const { putSettingsGlobal, onUseDroidCliToggled } = setup(true);
+    await putSettingsGlobal({ body: { useDroidCli: true } }, { json: vi.fn() });
+    expect(onUseDroidCliToggled).not.toHaveBeenCalled();
+  });
+
+  it("does not fire onUseDroidCliToggled for unrelated settings updates", async () => {
+    const { putSettingsGlobal, onUseDroidCliToggled } = setup(false);
+    await putSettingsGlobal({ body: { defaultProvider: "openai" } }, { json: vi.fn() });
+    expect(onUseDroidCliToggled).not.toHaveBeenCalled();
+  });
+});