Merge branch 'release/v0.7.0'

Author: cm-dyoshikawa

src/cli/commands/apply.ts

@@ -22,7 +22,7 @@ export async function applyCommand(options: ApplyOptions): Promise<void> {
     }
 
     // Read existing settings
-    const existing = await readSettings();
+    const existing = await readSettings(options.local);
 
     // Create merge preview
     const { merged, changes } = createMultipleMergePreview(
@@ -32,7 +32,8 @@ export async function applyCommand(options: ApplyOptions): Promise<void> {
     );
 
     // Display preview
-    console.log("\n📋 適用予定の変更:");
+    const settingsType = options.local ? "ローカル設定" : "共有設定";
+    console.log(`\n📋 適用予定の変更 (${settingsType}):`);
     if (changes.added.length > 0) {
       console.log("\n🆕 追加される設定:");
       changes.added.forEach((change) => {
@@ -80,7 +81,7 @@ export async function applyCommand(options: ApplyOptions): Promise<void> {
     // Create backup if requested
     if (options.backup && existing) {
       try {
-        const backupPath = await createBackup();
+        const backupPath = await createBackup(options.local);
         console.log(`💾 バックアップを作成しました: ${backupPath}`);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -89,8 +90,11 @@ export async function applyCommand(options: ApplyOptions): Promise<void> {
     }
 
     // Apply settings
-    await writeSettings(merged);
-    console.log("✅ 設定が正常に適用されました!");
+    await writeSettings(merged, options.local);
+    const successMessage = options.local
+      ? "✅ ローカル設定が正常に適用されました!"
+      : "✅ 設定が正常に適用されました!";
+    console.log(successMessage);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error("❌ エラーが発生しました:", message);

src/cli/main.ts

@@ -20,7 +20,8 @@ export async function main(): Promise<void> {
     .option("-u, --url <url>", "Apply settings from URLs (can be specified multiple times)")
     .option("--dry-run", "Preview changes without applying them")
     .option("--backup", "Create a backup before applying changes")
-    .option("--force", "Apply changes without confirmation");
+    .option("--force", "Apply changes without confirmation")
+    .option("--local", "Apply settings to .claude/settings.local.json instead of settings.json");
 
   // Custom parsing for multiple templates
   let multipleTemplates: string[] | undefined;

src/core/settings.ts

@@ -5,6 +5,7 @@ import type { ClaudeSettings } from "../types/index.js";
 
 const SETTINGS_DIR = ".claude";
 const SETTINGS_FILE = "settings.json";
+const LOCAL_SETTINGS_FILE = "settings.local.json";
 
 export async function findClaudeDirectory(): Promise<string | null> {
   let currentDir = process.cwd();
@@ -26,22 +27,23 @@ export async function findClaudeDirectory(): Promise<string | null> {
   return null;
 }
 
-export async function getSettingsPath(): Promise<string> {
+export async function getSettingsPath(isLocal?: boolean): Promise<string> {
   const claudeDir = await findClaudeDirectory();
+  const fileName = isLocal ? LOCAL_SETTINGS_FILE : SETTINGS_FILE;
 
   if (!claudeDir) {
     // If no .claude directory found, create one in current directory
     const currentClaudeDir = join(process.cwd(), SETTINGS_DIR);
     await fs.mkdir(currentClaudeDir, { recursive: true });
-    return join(currentClaudeDir, SETTINGS_FILE);
+    return join(currentClaudeDir, fileName);
   }
 
-  return join(claudeDir, SETTINGS_FILE);
+  return join(claudeDir, fileName);
 }
 
-export async function readSettings(): Promise<ClaudeSettings | null> {
+export async function readSettings(isLocal?: boolean): Promise<ClaudeSettings | null> {
   try {
-    const settingsPath = await getSettingsPath();
+    const settingsPath = await getSettingsPath(isLocal);
     const content = await fs.readFile(settingsPath, "utf-8");
     const data = JSON.parse(content);
     return ClaudeSettingsSchema.parse(data);
@@ -53,14 +55,14 @@ export async function readSettings(): Promise<ClaudeSettings | null> {
   }
 }
 
-export async function writeSettings(settings: ClaudeSettings): Promise<void> {
-  const settingsPath = await getSettingsPath();
+export async function writeSettings(settings: ClaudeSettings, isLocal?: boolean): Promise<void> {
+  const settingsPath = await getSettingsPath(isLocal);
   const validated = ClaudeSettingsSchema.parse(settings);
   await fs.writeFile(settingsPath, JSON.stringify(validated, null, 2), "utf-8");
 }
 
-export async function createBackup(): Promise<string> {
-  const settingsPath = await getSettingsPath();
+export async function createBackup(isLocal?: boolean): Promise<string> {
+  const settingsPath = await getSettingsPath(isLocal);
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
   const backupPath = settingsPath.replace(".json", `.backup-${timestamp}.json`);
 

src/types/index.ts

@@ -14,6 +14,7 @@ export interface ApplyOptions {
   dryRun?: boolean;
   backup?: boolean;
   force?: boolean;
+  local?: boolean;
 }
 
 export interface TemplateSource {