sonamu 0.8.24 → 0.8.26

package/src/bin/cli.ts

@@ -159,6 +159,7 @@ async function bootstrap() {
         ["fixture", "explore"],
         ["migrate", "run"],
         ["migrate", "apply", "#targets"],
+        ["migrate", "generate"],
         ["migrate", "status"],
         ["stub", "practice", "#name"],
         ["stub", "entity", "#name"],
@@ -185,6 +186,7 @@ async function bootstrap() {
         migrate_status,
         migrate_run,
         migrate_apply,
+        migrate_generate,
         fixture_init,
         fixture_import,
         fixture_sync,
@@ -546,6 +548,31 @@ async function migrate_run() {
   await migrator.runAction("apply", targets as (keyof SonamuDBConfig)[]);
 }
 
+async function migrate_generate() {
+  await setupMigrator();
+
+  const { conns } = await migrator.getStatus();
+  const hasStatus0 = conns.some((conn) => conn.status === 0);
+  if (!hasStatus0) {
+    console.log(
+      chalk.red(
+        "마이그레이션 파일을 생성하려면 기존 마이그레이션이 최소 하나의 DB에 모두 적용되어 있어야 합니다.",
+      ),
+    );
+    for (const conn of conns) {
+      if (conn.pending.length > 0) {
+        console.log(chalk.yellow(`  ${conn.name}: pending ${conn.pending.length}개`));
+      }
+    }
+    process.exit(1);
+  }
+
+  const count = await migrator.generatePreparedCodes();
+  if (count > 0) {
+    console.log(chalk.green(`${count}개의 마이그레이션 파일이 생성되었습니다.`));
+  }
+}
+
 async function migrate_status() {
   await setupMigrator();
 
@@ -972,11 +999,23 @@ async function skills_sync() {
   }
 
   if (isGlobal) {
-    await skills_sync_to(path.join(os.homedir(), ".claude"), sourceSkillsDir, sourceClaudeMd, {
+    const homeClaudeDir = path.join(os.homedir(), ".claude");
+    await skills_sync_to(homeClaudeDir, sourceSkillsDir, sourceClaudeMd, {
       useSymlink: false,
       copyProjectTemplates: false,
       isGlobal: true,
     });
+
+    // ~/.claude/commands/sonamu-skills.md 설치
+    const sourceCommandsDir = path.join(sourceBase, "commands");
+    const sourceCommand = path.join(sourceCommandsDir, "sonamu-skills.md");
+    if (await exists(sourceCommand)) {
+      const targetCommandsDir = path.join(homeClaudeDir, "commands");
+      await mkdir(targetCommandsDir, { recursive: true });
+      await cp(sourceCommand, path.join(targetCommandsDir, "sonamu-skills.md"));
+      console.log(chalk.green(`✓ /sonamu-skills command installed → ~/.claude/commands/`));
+    }
+
     console.log(chalk.cyan(`\n  Global sync complete → ~/.claude/skills/sonamu/`));
     console.log(chalk.dim(`  These skills are available in all Claude Code sessions.`));
     console.log(
@@ -1325,23 +1364,21 @@ async function auth_add_companions() {
 
 /**
  * 워크스페이스 루트를 찾습니다.
- * 우선순위: pnpm-workspace.yaml > CLAUDE.md > 루트 package.json (workspaces 필드)
+ * 우선순위: pnpm-workspace.yaml > package.json(workspaces) > .agents/
+ *
+ * CLAUDE.md는 서브패키지에도 존재할 수 있으므로 사용하지 않습니다.
+ * .agents/는 agents init이 생성하는 디렉토리로, 워크스페이스 루트에만 존재합니다.
  */
 async function findWorkspaceRoot() {
   let dir = process.cwd();
 
   while (dir !== path.dirname(dir)) {
-    // 1. pnpm-workspace.yaml 파일이 있는지 확인. 있으면 확실한 monorepo 루트.
+    // 1. pnpm-workspace.yaml: 확실한 monorepo 루트.
     if (await exists(path.join(dir, "pnpm-workspace.yaml"))) {
       return dir;
     }
 
-    // 2. CLAUDE.md 파일이 있는지 확인. 있으면 프로젝트 루트로 간주함.
-    if (await exists(path.join(dir, "CLAUDE.md"))) {
-      return dir;
-    }
-
-    // 3. package.json에 workspaces 필드가 있으면 루트.
+    // 2. package.json에 workspaces 필드가 있으면 monorepo 루트.
     const packagePath = path.join(dir, "package.json");
     if (await exists(packagePath)) {
       try {
@@ -1353,6 +1390,12 @@ async function findWorkspaceRoot() {
         // 파싱 실패시 무시
       }
     }
+
+    // 3. .agents/: agents init이 생성한 디렉토리. 서브패키지에는 존재하지 않음.
+    if (await exists(path.join(dir, ".agents"))) {
+      return dir;
+    }
+
     dir = path.dirname(dir);
   }
 

package/src/bin/ts-loader-register.ts

@@ -1,38 +1,8 @@
-import { register } from "node:module";
-import * as path from "node:path";
-import { exists } from "../utils/fs-utils.js";
 import { findApiRootPath } from "../utils/utils.js";
+import { ensureTsLoaderRegistered } from "./ts-loader-registration.js";
 
 /**
  * @sonamu-kit/ts-loader/loader를 등록하는 스크립트입니다.
  * 이 스크립트는 sonamu cli로 dev 실행할 때 --import로 실행됩니다.
  */
-async function setupSwcConfig() {
-  try {
-    const apiRoot = findApiRootPath();
-
-    // 프로젝트 루트에서 .swcrc 찾기
-    const projectSwcrcPath = path.join(apiRoot, ".swcrc");
-    if (await exists(projectSwcrcPath)) {
-      // 사용자 프로젝트에 .swcrc가 있으면 우선으로 사용합니다.
-      process.env.SWCRC_PATH = projectSwcrcPath;
-      return;
-    }
-
-    // 아니라면 sonamu가 관리하는 .swcrc.project-default를 가져다 씁니다.
-    const sonamuSwcrcPath = path.join(import.meta.dirname, "..", "..", ".swcrc.project-default");
-    if (await exists(sonamuSwcrcPath)) {
-      process.env.SWCRC_PATH = sonamuSwcrcPath;
-      return;
-    }
-  } catch {
-    // 환경 변수 설정 실패는 무시 (loader가 기본 설정 사용)
-  }
-}
-
-// swc 설정 파일 경로를 환경 변수로 설정
-await setupSwcConfig();
-
-register("@sonamu-kit/ts-loader/loader", {
-  parentURL: import.meta.url,
-});
+await ensureTsLoaderRegistered(findApiRootPath());

package/src/bin/ts-loader-registration.ts

@@ -0,0 +1,55 @@
+import { register } from "node:module";
+import * as path from "node:path";
+import { exists } from "../utils/fs-utils.js";
+
+const tsLoaderRegisterStateKey = Symbol.for("sonamu.ts-loader-register.state");
+
+type TsLoaderRegisterState = {
+  registered: boolean;
+};
+
+type GlobalWithTsLoaderRegisterState = typeof globalThis & {
+  [tsLoaderRegisterStateKey]?: TsLoaderRegisterState;
+};
+
+function getTsLoaderRegisterState(): TsLoaderRegisterState {
+  const globalState = globalThis as GlobalWithTsLoaderRegisterState;
+
+  if (!globalState[tsLoaderRegisterStateKey]) {
+    globalState[tsLoaderRegisterStateKey] = { registered: false };
+  }
+
+  return globalState[tsLoaderRegisterStateKey];
+}
+
+async function setupSwcConfig(apiRoot: string) {
+  try {
+    const projectSwcrcPath = path.join(apiRoot, ".swcrc");
+    if (await exists(projectSwcrcPath)) {
+      process.env.SWCRC_PATH = projectSwcrcPath;
+      return;
+    }
+
+    const sonamuSwcrcPath = path.join(import.meta.dirname, "..", "..", ".swcrc.project-default");
+    if (await exists(sonamuSwcrcPath)) {
+      process.env.SWCRC_PATH = sonamuSwcrcPath;
+      return;
+    }
+  } catch {
+    // 환경 변수 설정 실패는 무시 (loader가 기본 설정 사용)
+  }
+}
+
+export async function ensureTsLoaderRegistered(apiRoot: string): Promise<void> {
+  const state = getTsLoaderRegisterState();
+  if (state.registered) {
+    return;
+  }
+
+  await setupSwcConfig(apiRoot);
+
+  register("@sonamu-kit/ts-loader/loader", {
+    parentURL: import.meta.url,
+  });
+  state.registered = true;
+}

package/src/cone/cone-generator.ts

@@ -63,7 +63,7 @@ function getApiKey(): string {
   try {
     // Sonamu가 초기화되어 있는 경우
     const { Sonamu } = require("../api");
-    apiKey = Sonamu.secret?.anthropic_api_key;
+    apiKey = Sonamu.secrets?.anthropic_api_key;
   } catch {
     // Sonamu가 초기화되지 않은 경우 (테스트 등)
     apiKey = undefined;
@@ -294,7 +294,7 @@ async function callAnthropicAPI(
     });
 
     const { text, usage } = await generateText({
-      model: anthropic("claude-sonnet-4-5"),
+      model: anthropic("claude-sonnet-4-6"),
       prompt,
     });
 

package/src/database/puri-subset.test-d.ts

@@ -160,6 +160,51 @@ describe("LoadersResult", () => {
     }>();
   });
 
+  it("중첩 로더의 as 경로도 hydrate한다", () => {
+    type IngredientLoaderQb = (
+      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      fromIds: number[] | string[],
+    ) => MockPuri<{ id: number; name: string; refId: number }>;
+
+    type PrescriptionItemLoaderQb = (
+      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      fromIds: number[] | string[],
+    ) => MockPuri<{
+      id: number;
+      test__id: number;
+      test__name: string;
+      refId: number;
+    }>;
+
+    type Loaders = [
+      {
+        as: "items";
+        refId: "id";
+        qb: PrescriptionItemLoaderQb;
+        loaders: [
+          {
+            as: "test__items";
+            refId: "test__id";
+            qb: IngredientLoaderQb;
+          },
+        ];
+      },
+    ];
+    type Result = LoadersResult<Loaders>;
+
+    const result = {} as Result;
+    expectTypeOf(result).toEqualTypeOf<{
+      items: {
+        id: number;
+        test: {
+          id: number;
+          name: string;
+          items: { id: number; name: string }[];
+        };
+      }[];
+    }>();
+  });
+
   it("여러 로더를 처리한다", () => {
     type ProjectLoader = {
       as: "projects";
@@ -351,6 +396,63 @@ describe("InferAllSubsets", () => {
         };
       }>();
     });
+
+    it("중첩 로더 경로 alias를 포함한 Subset 결과를 추론한다", () => {
+      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+        id: number;
+        root__id: number;
+      }>;
+      type SubsetQueries = {
+        A: SubsetFnA;
+      };
+
+      type RootItemLoader = {
+        as: "root__items";
+        refId: "root__id";
+        qb: (
+          qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+          fromIds: number[] | string[],
+        ) => MockPuri<{
+          id: number;
+          test__id: number;
+          test__name: string;
+          refId: number;
+        }>;
+        loaders: [
+          {
+            as: "test__inner_items";
+            refId: "test__id";
+            qb: (
+              qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+              fromIds: number[] | string[],
+            ) => MockPuri<{ id: number; name: string; refId: number }>;
+          },
+        ];
+      };
+      type LoaderQueries = {
+        A: [RootItemLoader];
+      };
+
+      type Result = InferAllSubsets<SubsetQueries, LoaderQueries>;
+
+      const result = {} as Result;
+      expectTypeOf(result).toEqualTypeOf<{
+        A: {
+          id: number;
+          root: {
+            id: number;
+            items: {
+              id: number;
+              test: {
+                id: number;
+                name: string;
+                inner_items: { id: number; name: string }[];
+              };
+            }[];
+          };
+        };
+      }>();
+    });
   });
 
   describe("서브셋이 여러 개인 경우", () => {

package/src/database/puri-subset.types.ts

@@ -134,7 +134,7 @@ export type LoadersResult<TLoaders extends GenericPuriLoader[]> = Expand<{
  * 기본 결과와 Loader 결과 병합
  */
 type WithLoaders<TBase, TLoaders> = TLoaders extends GenericPuriLoader[]
-  ? Expand<TBase & LoadersResult<TLoaders>>
+  ? Expand<Hydrate<TBase & LoadersResult<TLoaders>>>
   : TBase;
 
 // ============================================================================

package/src/skills/commands/sonamu-skills.md

@@ -0,0 +1,20 @@
+Read ~/.claude/skills/sonamu/SKILL.md and follow its instructions.
+
+Then greet the user with the following format (exactly):
+
+---
+Sonamu 스킬 가이드가 로드됐습니다. 어떤 작업을 하실 건가요?
+
+**Workflow**  · CDD · project-init · config
+**Entity/DB** · entity-basic · entity-relations · subset · migration · database
+**API**       · model · api · puri · upsert
+**Testing**   · testing · devrunner · naite · cone · fixture-cli
+**Auth**      · auth · auth-migration · auth-plugins
+**Frontend**  · frontend · scaffolding · i18n
+**Advanced**  · vector · ai-agents · tasks
+**Meta**      · skill-contribution · framework-change
+
+어떤 스킬이나 작업을 도와드릴까요? (하고 싶은 작업을 자유롭게 설명해도 됩니다.)
+---
+
+If the user provides $ARGUMENTS, skip the greeting and directly help with: $ARGUMENTS