refactor: piece系設定解決をresolveConfigValueへ統一

src/__tests__/it-piece-loader.test.ts

@@ -20,15 +20,22 @@ vi.mock('../infra/config/global/globalConfig.js', () => ({
   loadGlobalConfig: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('../infra/config/loadConfig.js', () => ({
+vi.mock('../infra/config/resolveConfigValue.js', () => ({
-  loadConfig: vi.fn(() => ({
+  resolveConfigValue: vi.fn((_cwd: string, key: string) => {
-    global: {
+    if (key === 'language') return languageState.value;
-      language: languageState.value,
+    if (key === 'enableBuiltinPieces') return true;
-      disabledBuiltins: [],
+    if (key === 'disabledBuiltins') return [];
-      enableBuiltinPieces: true,
+    return undefined;
-    },
+  }),
-    project: {},
+  resolveConfigValues: vi.fn((_cwd: string, keys: readonly string[]) => {
-  })),
+    const result: Record<string, unknown> = {};
+    for (const key of keys) {
+      if (key === 'language') result[key] = languageState.value;
+      if (key === 'enableBuiltinPieces') result[key] = true;
+      if (key === 'disabledBuiltins') result[key] = [];
+    }
+    return result;
+  }),
 }));
 
 // --- Imports (after mocks) ---

src/__tests__/it-piece-patterns.test.ts

@@ -57,14 +57,21 @@ vi.mock('../infra/config/project/projectConfig.js', () => ({
   loadProjectConfig: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('../infra/config/loadConfig.js', () => ({
+vi.mock('../infra/config/resolveConfigValue.js', () => ({
-  loadConfig: vi.fn().mockReturnValue({
+  resolveConfigValue: vi.fn((_cwd: string, key: string) => {
-    global: {
+    if (key === 'language') return 'en';
-      language: 'en',
+    if (key === 'enableBuiltinPieces') return true;
-      enableBuiltinPieces: true,
+    if (key === 'disabledBuiltins') return [];
-      disabledBuiltins: [],
+    return undefined;
-    },
+  }),
-    project: {},
+  resolveConfigValues: vi.fn((_cwd: string, keys: readonly string[]) => {
+    const result: Record<string, unknown> = {};
+    for (const key of keys) {
+      if (key === 'language') result[key] = 'en';
+      if (key === 'enableBuiltinPieces') result[key] = true;
+      if (key === 'disabledBuiltins') result[key] = [];
+    }
+    return result;
   }),
 }));
 

src/__tests__/piece-builtin-toggle.test.ts

@@ -17,15 +17,22 @@ vi.mock('../infra/config/global/globalConfig.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../infra/config/loadConfig.js', () => ({
+vi.mock('../infra/config/resolveConfigValue.js', () => ({
-  loadConfig: () => ({
+  resolveConfigValue: (_cwd: string, key: string) => {
-    global: {
+    if (key === 'language') return 'en';
-      language: 'en',
+    if (key === 'enableBuiltinPieces') return false;
-      enableBuiltinPieces: false,
+    if (key === 'disabledBuiltins') return [];
-      disabledBuiltins: [],
+    return undefined;
+  },
+  resolveConfigValues: (_cwd: string, keys: readonly string[]) => {
+    const result: Record<string, unknown> = {};
+    for (const key of keys) {
+      if (key === 'language') result[key] = 'en';
+      if (key === 'enableBuiltinPieces') result[key] = false;
+      if (key === 'disabledBuiltins') result[key] = [];
+    }
+    return result;
   },
-    project: {},
-  }),
 }));
 
 const { listPieces } = await import('../infra/config/loaders/pieceLoader.js');

src/__tests__/piece-category-config.test.ts

@@ -26,15 +26,22 @@ vi.mock('../infra/config/global/globalConfig.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../infra/config/loadConfig.js', () => ({
+vi.mock('../infra/config/resolveConfigValue.js', () => ({
-  loadConfig: () => ({
+  resolveConfigValue: (_cwd: string, key: string) => {
-    global: {
+    if (key === 'language') return languageState.value;
-      language: languageState.value,
+    if (key === 'enableBuiltinPieces') return true;
-      enableBuiltinPieces: true,
+    if (key === 'disabledBuiltins') return [];
-      disabledBuiltins: [],
+    return undefined;
+  },
+  resolveConfigValues: (_cwd: string, keys: readonly string[]) => {
+    const result: Record<string, unknown> = {};
+    for (const key of keys) {
+      if (key === 'language') result[key] = languageState.value;
+      if (key === 'enableBuiltinPieces') result[key] = true;
+      if (key === 'disabledBuiltins') result[key] = [];
+    }
+    return result;
   },
-    project: {},
-  }),
 }));
 
 vi.mock('../infra/resources/index.js', async (importOriginal) => {

src/infra/config/global/pieceCategories.ts

@@ -7,7 +7,7 @@
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { getGlobalConfigDir } from '../paths.js';
-import { loadConfig } from '../loadConfig.js';
+import { resolveConfigValue } from '../resolveConfigValue.js';
 
 const INITIAL_USER_CATEGORIES_CONTENT = 'piece_categories: {}\n';
 
@@ -17,9 +17,9 @@ function getDefaultPieceCategoriesPath(): string {
 
 /** Get the path to the user's piece categories file. */
 export function getPieceCategoriesPath(cwd: string): string {
-  const config = loadConfig(cwd);
+  const pieceCategoriesFile = resolveConfigValue(cwd, 'pieceCategoriesFile');
-  if (config.pieceCategoriesFile) {
+  if (pieceCategoriesFile) {
-    return config.pieceCategoriesFile;
+    return pieceCategoriesFile;
   }
   return getDefaultPieceCategoriesPath();
 }

src/infra/config/loaders/agentLoader.ts

@@ -16,11 +16,11 @@ import {
   getBuiltinPiecesDir,
   isPathSafe,
 } from '../paths.js';
-import { loadConfig } from '../loadConfig.js';
+import { resolveConfigValue } from '../resolveConfigValue.js';
 
 /** Get all allowed base directories for persona prompt files */
 function getAllowedPromptBases(cwd: string): string[] {
-  const lang = loadConfig(cwd).language;
+  const lang = resolveConfigValue(cwd, 'language');
   return [
     getGlobalPersonasDir(),
     getGlobalPiecesDir(),

src/infra/config/loaders/pieceCategories.ts

@@ -13,7 +13,7 @@ import { z } from 'zod/v4';
 import { getPieceCategoriesPath } from '../global/pieceCategories.js';
 import { getLanguageResourcesDir } from '../../resources/index.js';
 import { listBuiltinPieceNames } from './pieceResolver.js';
-import { loadConfig } from '../loadConfig.js';
+import { resolveConfigValues } from '../resolveConfigValue.js';
 import type { PieceWithSource } from './pieceResolver.js';
 
 const CategoryConfigSchema = z.object({
@@ -233,7 +233,7 @@ function resolveOthersCategoryName(defaultConfig: ParsedCategoryConfig, userConf
  * Returns null if file doesn't exist or has no piece_categories.
  */
 export function loadDefaultCategories(cwd: string): CategoryConfig | null {
-  const lang = loadConfig(cwd).language;
+  const { language: lang } = resolveConfigValues(cwd, ['language']);
   const filePath = join(getLanguageResourcesDir(lang), 'piece-categories.yaml');
   const parsed = loadCategoryConfigFromPath(filePath, filePath);
 
@@ -256,7 +256,7 @@ export function loadDefaultCategories(cwd: string): CategoryConfig | null {
 
 /** Get the path to the builtin default categories file. */
 export function getDefaultCategoriesPath(cwd: string): string {
-  const lang = loadConfig(cwd).language;
+  const { language: lang } = resolveConfigValues(cwd, ['language']);
   return join(getLanguageResourcesDir(lang), 'piece-categories.yaml');
 }
 
@@ -378,7 +378,7 @@ export function buildCategorizedPieces(
   config: CategoryConfig,
   cwd: string,
 ): CategorizedPieces {
-  const globalConfig = loadConfig(cwd);
+  const globalConfig = resolveConfigValues(cwd, ['enableBuiltinPieces', 'disabledBuiltins']);
   const ignoreMissing = new Set<string>();
   if (globalConfig.enableBuiltinPieces === false) {
     for (const name of listBuiltinPieceNames(cwd, { includeDisabled: true })) {

src/infra/config/loaders/pieceParser.ts

@@ -11,7 +11,7 @@ import { parse as parseYaml } from 'yaml';
 import type { z } from 'zod';
 import { PieceConfigRawSchema, PieceMovementRawSchema } from '../../../core/models/index.js';
 import type { PieceConfig, PieceMovement, PieceRule, OutputContractEntry, OutputContractItem, LoopMonitorConfig, LoopMonitorJudge, ArpeggioMovementConfig, ArpeggioMergeMovementConfig, TeamLeaderConfig } from '../../../core/models/index.js';
-import { loadConfig } from '../loadConfig.js';
+import { resolveConfigValue } from '../resolveConfigValue.js';
 import {
   type PieceSections,
   type FacetResolutionContext,
@@ -439,7 +439,7 @@ export function loadPieceFromFile(filePath: string, projectDir: string): PieceCo
   const pieceDir = dirname(filePath);
 
   const context: FacetResolutionContext = {
-    lang: loadConfig(projectDir).language,
+    lang: resolveConfigValue(projectDir, 'language'),
     projectDir,
   };
 

src/infra/config/loaders/pieceResolver.ts

@@ -10,7 +10,7 @@ import { join, resolve, isAbsolute } from 'node:path';
 import { homedir } from 'node:os';
 import type { PieceConfig, PieceMovement, InteractiveMode } from '../../../core/models/index.js';
 import { getGlobalPiecesDir, getBuiltinPiecesDir, getProjectConfigDir } from '../paths.js';
-import { loadConfig } from '../loadConfig.js';
+import { resolveConfigValues } from '../resolveConfigValue.js';
 import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
 import { loadPieceFromFile } from './pieceParser.js';
 
@@ -24,7 +24,7 @@ export interface PieceWithSource {
 }
 
 export function listBuiltinPieceNames(cwd: string, options?: { includeDisabled?: boolean }): string[] {
-  const config = loadConfig(cwd);
+  const config = resolveConfigValues(cwd, ['language', 'disabledBuiltins']);
   const lang = config.language;
   const dir = getBuiltinPiecesDir(lang);
   const disabled = options?.includeDisabled ? undefined : (config.disabledBuiltins ?? []);
@@ -37,7 +37,7 @@ export function listBuiltinPieceNames(cwd: string, options?: { includeDisabled?:
 
 /** Get builtin piece by name */
 export function getBuiltinPiece(name: string, projectCwd: string): PieceConfig | null {
-  const config = loadConfig(projectCwd);
+  const config = resolveConfigValues(projectCwd, ['enableBuiltinPieces', 'language', 'disabledBuiltins']);
   if (config.enableBuiltinPieces === false) return null;
   const lang = config.language;
   const disabled = config.disabledBuiltins ?? [];
@@ -373,7 +373,7 @@ function* iteratePieceDir(
 
 /** Get the 3-layer directory list (builtin → user → project-local) */
 function getPieceDirs(cwd: string): { dir: string; source: PieceSource; disabled?: string[] }[] {
-  const config = loadConfig(cwd);
+  const config = resolveConfigValues(cwd, ['enableBuiltinPieces', 'language', 'disabledBuiltins']);
   const disabled = config.disabledBuiltins ?? [];
   const lang = config.language;
   const dirs: { dir: string; source: PieceSource; disabled?: string[] }[] = [];