Move all tests under test/ mirroring src layout

eslint.config.js

@@ -4,7 +4,7 @@ import sonarjs from "eslint-plugin-sonarjs";
 export default tseslint.config(
   { ignores: ["dist/**", "node_modules/**", "**/*.d.ts"] },
   {
-    files: ["index.ts", "src/**/*.{ts,tsx}"],
+    files: ["index.ts", "src/**/*.{ts,tsx}", "test/**/*.ts"],
     languageOptions: { parser: tseslint.parser },
     plugins: { sonarjs },
     rules: {

src/cli/commit.test.ts → test/cli/commit.test.ts

@@ -7,7 +7,7 @@ vi.mock("@/infra/env", () => ({
 import { Commit } from "@/cli/commit";
 import { Future } from "@/libs/future";
 import { Nothing, Just } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 import * as s from "@/libs/json/schema";
 import { Config } from "@/domain/config/config";
 

src/cli/doctor.test.ts → test/cli/doctor.test.ts

@@ -7,7 +7,7 @@ vi.mock("@/infra/env", () => ({
 import { Doctor } from "@/cli/doctor";
 import { Future } from "@/libs/future";
 import { Just } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 
 vi.mock("@/infra/storage/config", async (importOriginal) => {
   const actual = await importOriginal<typeof import("@/infra/storage/config")>();

src/cli/effort.test.ts → test/cli/effort.test.ts

@@ -2,15 +2,15 @@ import { describe, expect, it, vi, beforeEach } from "vitest";
 import { EffortCommand } from "@/cli/effort";
 import { Future } from "@/libs/future";
 import { Nothing, Just } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 import * as s from "@/libs/json/schema";
 import { Config } from "@/domain/config/config";
 
 type ConfigValue = s.Infer<typeof Config>;
 
 vi.mock("@/infra/storage/config", () => ({
   loadConfig: vi.fn(),
-  saveConfig: vi.fn(() => Future.resolve())
+  saveConfig: vi.fn(() => Future.resolve(undefined))
 }));
 vi.mock("@/infra/ui/effort-picker", () => ({
   selectOpenAIEffort: vi.fn(() => Future.resolve(Just("low")))

src/cli/model.test.ts → test/cli/model.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi, beforeEach } from "vitest";
 import { ModelCommand } from "@/cli/model";
 import { Future } from "@/libs/future";
 import { Nothing, Just } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 import * as s from "@/libs/json/schema";
 import { Config } from "@/domain/config/config";
 
@@ -16,7 +16,7 @@ const config = (): ConfigValue => ({
 
 vi.mock("@/infra/storage/config", () => ({
   loadConfig: vi.fn(),
-  saveConfig: vi.fn(() => Future.resolve())
+  saveConfig: vi.fn(() => Future.resolve(undefined))
 }));
 vi.mock("@/domain/llm/auth-resolver", () => ({
   resolveProvider: vi.fn((c: ConfigValue) => Future.resolve(c.ai))

src/cli/parser.test.ts → test/cli/parser.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { parseArgs } from "@/cli/parser";
+import { Failure, Success } from "@/libs/result";
 
 describe("parseArgs", () => {
   it.each([
@@ -17,18 +18,18 @@ describe("parseArgs", () => {
   ] as const)("maps %j to %s", (argv, type) => {
     const result = parseArgs([...argv]);
     expect(result.isSuccess()).toBe(true);
-    if (result.isSuccess()) expect(result.value.type).toBe(type);
+    if (result instanceof Success) expect(result.value.type).toBe(type);
   });
 
   it("rejects unknown commands", () => {
     const result = parseArgs(["wat"]);
     expect(result.isFailure()).toBe(true);
-    if (result.isFailure()) expect(result.error.message).toContain("Unknown command");
+    if (result instanceof Failure) expect(result.error.message).toContain("Unknown command");
   });
 
   it("defaults bare invocation to generate", () => {
     const result = parseArgs([]);
     expect(result.isSuccess()).toBe(true);
-    if (result.isSuccess()) expect(result.value.type).toBe("generate");
+    if (result instanceof Success) expect(result.value.type).toBe("generate");
   });
 });

src/cli/setup.test.ts → test/cli/setup.test.ts

@@ -14,7 +14,7 @@ vi.mock("@/infra/auth/openai", () => ({
 import { Setup } from "@/cli/setup";
 import { Future } from "@/libs/future";
 import { Just } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 
 vi.mock("@clack/prompts", () => ({
   intro: vi.fn(),
@@ -40,7 +40,7 @@ vi.mock("@/infra/ui/spinner", () => ({
   bracketStatus: vi.fn((_a: string, _b: string, f: (s: unknown) => Future<Error, unknown>) => f({}))
 }));
 vi.mock("@/infra/storage/config", () => ({
-  saveConfig: vi.fn(() => Future.resolve())
+  saveConfig: vi.fn(() => Future.resolve(undefined))
 }));
 vi.mock("@/infra/auth/anthropic", () => ({
   validateAnthropicApiKey: vi.fn(),

test/cli-smoke.test.ts → test/cli/smoke.test.ts

@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 
-const BIN = resolve(import.meta.dirname, "../dist/index.js");
+const BIN = resolve(import.meta.dirname, "../../dist/index.js");
 
 const runCli = (args: string[]) =>
   spawnSync(process.execPath, [BIN, ...args], {

src/cli/update.test.ts → test/cli/update.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from "vitest";
 import { detectPackageManager } from "@/cli/update";
 import { Future } from "@/libs/future";
 import { Success } from "@/libs/result";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 
 vi.mock("@/infra/shell", () => ({
   execBin: vi.fn()

src/domain/config/config.test.ts → test/domain/config/config.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import * as s from "@/libs/json/schema";
 import { Config } from "@/domain/config/config";
 import { Just, Nothing } from "@/libs/maybe";
+import { Success } from "@/libs/result";
 
 type ConfigValue = s.Infer<typeof Config>;
 
@@ -21,10 +22,10 @@ describe("Config schema", () => {
     const encoded = s.encode(Config, sampleConfig());
     const decoded = s.decode(Config, encoded);
     expect(decoded.isSuccess()).toBe(true);
-    if (!decoded.isSuccess()) return;
+    if (!(decoded instanceof Success)) return;
     const again = s.decode(Config, s.encode(Config, decoded.value));
     expect(again.isSuccess()).toBe(true);
-    if (again.isSuccess()) {
+    if (again instanceof Success) {
       expect(again.value.ai.provider).toBe("openai");
       expect(again.value.custom_template).toBeInstanceOf(Nothing);
     }
@@ -37,11 +38,11 @@ describe("Config schema", () => {
 
   it("accepts custom convention with template", () => {
     const json = {
-      ...s.encode(Config, { ...sampleConfig(), commit_convention: "custom", custom_template: Just("Summarize:\n{diff}") }),
+      ...(s.encode(Config, { ...sampleConfig(), commit_convention: "custom", custom_template: Just("Summarize:\n{diff}") }) as Record<string, unknown>),
       commit_convention: "custom"
     };
     const result = s.decode(Config, json);
     expect(result.isSuccess()).toBe(true);
-    if (result.isSuccess()) expect(result.value.custom_template).toBeInstanceOf(Just);
+    if (result instanceof Success) expect(result.value.custom_template).toBeInstanceOf(Just);
   });
 });

src/domain/llm/auth-resolver.test.ts → test/domain/llm/auth-resolver.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi, beforeEach } from "vitest";
 import { Future } from "@/libs/future";
 import { resolveProvider, tokensChanged } from "@/domain/llm/auth-resolver";
 import { Just, Nothing } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 import * as s from "@/libs/json/schema";
 import { Config as ConfigSchema } from "@/domain/config/config";
 
@@ -11,8 +11,8 @@ vi.mock("@/infra/auth/google", () => ({
 }));
 vi.mock("@/infra/auth/openai", () => ({ ensureFreshOpenAITokens: vi.fn() }));
 vi.mock("@/infra/storage/config", () => ({
-  updateGoogleTokens: vi.fn(() => Future.resolve()),
-  updateOpenAITokens: vi.fn(() => Future.resolve())
+  updateGoogleTokens: vi.fn(() => Future.resolve(undefined)),
+  updateOpenAITokens: vi.fn(() => Future.resolve(undefined))
 }));
 
 type ConfigValue = s.Infer<typeof ConfigSchema>;

src/domain/llm/response-parser.test.ts → test/domain/llm/response-parser.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { extractResponse } from "@/domain/llm/response-parser";
 import { Just, Nothing } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 
 describe("extractResponse", () => {
   it("trims and returns non-empty text", async () => {

src/domain/llm/router.test.ts → test/domain/llm/router.test.ts

@@ -2,15 +2,16 @@ import { describe, expect, it, vi, beforeEach } from "vitest";
 import { generateCommitMessage, refineCommitMessage } from "@/domain/llm/router";
 import { Future } from "@/libs/future";
 import { Nothing } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 import type { ProviderConfig } from "@/domain/config/config";
 
-const mockProvider = (provider: ProviderConfig["provider"]): ProviderConfig => ({
-  provider,
-  model: "test-model",
-  effort: Nothing(),
-  auth_method: { type: "api_key", content: "sk-test" }
-});
+const mockProvider = (provider: ProviderConfig["provider"]): ProviderConfig =>
+  ({
+    provider,
+    model: "test-model",
+    effort: Nothing(),
+    auth_method: { type: "api_key", content: "sk-test" }
+  }) as ProviderConfig;
 
 vi.mock("@/infra/llm/gemini", () => ({
   generateContentWithGemini: vi.fn(() => Future.resolve({ text: "feat: test", tokens: Nothing() }))

src/infra/git/parsers.test.ts → test/infra/git/parsers.test.ts

@@ -42,7 +42,7 @@ describe("splitCommitFields", () => {
     const line = ["abc", "abc", "subject", "me", "me@x.com", "2024-01-01T00:00:00+00:00"].join("\0");
     const result = splitCommitFields(`${line}\n`);
     expect(result.isSuccess()).toBe(true);
-    if (result.isSuccess()) expect(result.value["subject"]).toBe("subject");
+    if (result instanceof Success) expect(result.value["subject"]).toBe("subject");
   });
 });
 

src/infra/git/repo.integration.test.ts → test/infra/git/repo.integration.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { chdir, cwd } from "node:process";
-import { runFuture } from "../../../test/helpers/run-future";
-import { createTempGitRepo } from "../../../test/helpers/temp-git-repo";
+import { runFuture } from "@test/helpers/run-future";
+import { createTempGitRepo } from "@test/helpers/temp-git-repo";
 import * as repo from "@/infra/git/repo";
 
 describe("git repo integration", () => {

src/infra/github/pr.test.ts → test/infra/github/pr.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi, beforeEach } from "vitest";
 import { getOpenPullRequest } from "@/infra/github/pr";
 import { Future } from "@/libs/future";
 import { Success, Failure } from "@/libs/result";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 
 vi.mock("@/infra/git/repo", () => ({
   getTrackingRemoteUrl: vi.fn(() => Future.resolve("https://github.com/o/r.git")),

src/infra/storage/config.test.ts → test/infra/storage/config.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, beforeEach } from "vitest";
 import { readFile } from "node:fs/promises";
 import { loadConfig, saveConfig, configFile } from "@/infra/storage/config";
 import { Nothing } from "@/libs/maybe";
-import { runFuture } from "../../../test/helpers/run-future";
+import { runFuture } from "@test/helpers/run-future";
 import * as s from "@/libs/json/schema";
 import { Config } from "@/domain/config/config";
 

tsconfig.json

@@ -25,9 +25,10 @@
     "allowUnusedLabels": false,
     "allowUnreachableCode": false,
     "paths": {
-      "@/*": ["./src/*", "./*"]
+      "@/*": ["./src/*", "./*"],
+      "@test/*": ["./test/*"]
     }
   },
-  "include": ["index.ts", "src/**/*"],
-  "exclude": ["node_modules", "dist", "**/*.test.ts", "test"]
+  "include": ["index.ts", "src/**/*", "test/**/*"],
+  "exclude": ["node_modules", "dist"]
 }

vitest.config.ts

@@ -7,12 +7,13 @@ export default defineConfig({
   resolve: {
     alias: [
       { find: "@/package.json", replacement: resolve(root, "package.json") },
+      { find: /^@test\/(.+)$/, replacement: resolve(root, "test/$1") },
       { find: /^@\/(.+)$/, replacement: resolve(root, "src/$1") }
     ]
   },
   test: {
     environment: "node",
-    include: ["src/**/*.test.ts", "test/**/*.test.ts"],
+    include: ["test/**/*.test.ts"],
     setupFiles: ["./test/setup.ts"],
     coverage: {
       provider: "v8",