@sunasteriskrnd/takumi 1.0.0-dev.46 → 1.0.0-dev.48

package/dist/index.js

@@ -19815,7 +19815,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@sunasteriskrnd/takumi",
-    version: "1.0.0-dev.46",
+    version: "1.0.0-dev.48",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -27299,6 +27299,48 @@ var require_ignore = __commonJS((exports, module) => {
   }
 });
 
+// src/domains/migration/release-manifest.ts
+import { join as join11 } from "node:path";
+function normalizeClaudeReleaseManifestPath(relativePath) {
+  const normalized = relativePath.replace(/\\/g, "/").replace(/^\.\//, "");
+  return normalized.startsWith(".claude/") ? normalized.slice(".claude/".length) : normalized;
+}
+
+class ReleaseManifestLoader {
+  static async load(extractDir) {
+    const manifestPath = join11(extractDir, "release-manifest.json");
+    try {
+      const content = await import_fs_extra8.readFile(manifestPath, "utf-8");
+      const parsed = JSON.parse(content);
+      return ReleaseManifestSchema.parse(parsed);
+    } catch (error) {
+      logger.debug(`Release manifest not found or invalid: ${error}`);
+      return null;
+    }
+  }
+  static findFile(manifest, relativePath) {
+    const normalizedPath = normalizeClaudeReleaseManifestPath(relativePath);
+    return manifest.files.find((file) => normalizeClaudeReleaseManifestPath(file.path) === normalizedPath);
+  }
+}
+var import_fs_extra8, ReleaseManifestFileSchema, ReleaseManifestSchema;
+var init_release_manifest = __esm(() => {
+  init_logger();
+  init_zod();
+  import_fs_extra8 = __toESM(require_lib(), 1);
+  ReleaseManifestFileSchema = exports_external.object({
+    path: exports_external.string(),
+    checksum: exports_external.string().regex(/^[a-f0-9]{64}$/),
+    size: exports_external.number(),
+    lastModified: exports_external.string().datetime({ offset: true }).optional()
+  });
+  ReleaseManifestSchema = exports_external.object({
+    version: exports_external.string(),
+    generatedAt: exports_external.string(),
+    files: exports_external.array(ReleaseManifestFileSchema)
+  });
+});
+
 // node_modules/semver/internal/constants.js
 var require_constants4 = __commonJS((exports, module) => {
   var SEMVER_SPEC_VERSION = "2.0.0";
@@ -29095,7 +29137,7 @@ class SelectiveMerger {
     this.manifestMap = new Map;
     if (manifest) {
       for (const file of manifest.files) {
-        this.manifestMap.set(file.path, file);
+        this.manifestMap.set(normalizeClaudeReleaseManifestPath(file.path), file);
       }
     }
   }
@@ -29104,25 +29146,26 @@ class SelectiveMerger {
     this.installingKit = installingKit;
   }
   async shouldCopyFile(destPath, relativePath) {
+    const providerRelativePath = normalizeClaudeReleaseManifestPath(relativePath);
     let destStat;
     try {
       destStat = await stat2(destPath);
     } catch {
       if (this.claudeDir && this.installingKit) {
-        const installed = await findFileInInstalledKits(this.claudeDir, relativePath, this.installingKit);
+        const installed = await findFileInInstalledKits(this.claudeDir, providerRelativePath, this.installingKit);
         if (installed.exists) {
           logger.debug(`File ${relativePath} tracked by ${installed.ownerKit} but missing on disk`);
         }
       }
       return { changed: true, reason: "new" };
     }
-    const manifestEntry = this.manifestMap.get(relativePath);
+    const manifestEntry = this.manifestMap.get(providerRelativePath);
     if (!manifestEntry) {
       logger.debug(`No manifest entry for ${relativePath}, will copy`);
       return { changed: true, reason: "new" };
     }
     if (this.claudeDir && this.installingKit) {
-      const installed = await findFileInInstalledKits(this.claudeDir, relativePath, this.installingKit);
+      const installed = await findFileInInstalledKits(this.claudeDir, providerRelativePath, this.installingKit);
       if (installed.exists && installed.checksum && installed.ownerKit) {
         if (installed.checksum === manifestEntry.checksum) {
           logger.debug(`Shared identical: ${relativePath} (owned by ${installed.ownerKit})`);
@@ -29137,7 +29180,7 @@ class SelectiveMerger {
         const incomingTimestamp = manifestEntry.lastModified ?? null;
         const existingTimestamp = installed.sourceTimestamp;
         const conflictBase = {
-          relativePath,
+          relativePath: providerRelativePath,
           incomingKit: this.installingKit,
           existingKit: installed.ownerKit,
           incomingTimestamp,
@@ -29253,6 +29296,7 @@ class SelectiveMerger {
 }
 var import_semver;
 var init_selective_merger = __esm(() => {
+  init_release_manifest();
   init_manifest_reader();
   init_ownership_checker();
   init_logger();
@@ -29261,7 +29305,7 @@ var init_selective_merger = __esm(() => {
 
 // src/domains/installation/merger/file-scanner.ts
 import { relative as relative3 } from "node:path";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 
 class FileScanner {
   includeMatchers = [];
@@ -29283,12 +29327,12 @@ class FileScanner {
   }
   async getFiles(dir, baseDir = dir) {
     const files = [];
-    const entries = await import_fs_extra8.readdir(dir, { encoding: "utf8" });
+    const entries = await import_fs_extra9.readdir(dir, { encoding: "utf8" });
     for (const entry of entries) {
-      const fullPath = join11(dir, entry);
+      const fullPath = join12(dir, entry);
       const relativePath = relative3(baseDir, fullPath);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
-      const stats = await import_fs_extra8.lstat(fullPath);
+      const stats = await import_fs_extra9.lstat(fullPath);
       if (stats.isSymbolicLink()) {
         logger.warning(`Skipping symbolic link: ${normalizedRelativePath}`);
         continue;
@@ -29316,10 +29360,10 @@ class FileScanner {
     return files;
   }
 }
-var import_fs_extra8, import_ignore, import_picomatch2;
+var import_fs_extra9, import_ignore, import_picomatch2;
 var init_file_scanner = __esm(() => {
   init_logger();
-  import_fs_extra8 = __toESM(require_lib(), 1);
+  import_fs_extra9 = __toESM(require_lib(), 1);
   import_ignore = __toESM(require_ignore(), 1);
   import_picomatch2 = __toESM(require_picomatch2(), 1);
 });
@@ -29475,8 +29519,8 @@ var init_shared = __esm(() => {
 
 // src/domains/config/installed-settings-tracker.ts
 import { existsSync as existsSync5 } from "node:fs";
-import { mkdir, readFile as readFile6, writeFile as writeFile4 } from "node:fs/promises";
-import { dirname as dirname2, join as join12 } from "node:path";
+import { mkdir, readFile as readFile7, writeFile as writeFile4 } from "node:fs/promises";
+import { dirname as dirname2, join as join13 } from "node:path";
 
 class InstalledSettingsTracker {
   projectDir;
@@ -29489,9 +29533,9 @@ class InstalledSettingsTracker {
   }
   getCkJsonPath() {
     if (this.isGlobal) {
-      return join12(this.projectDir, TAKUMI_JSON_FILE);
+      return join13(this.projectDir, TAKUMI_JSON_FILE);
     }
-    return join12(this.projectDir, ".claude", TAKUMI_JSON_FILE);
+    return join13(this.projectDir, ".claude", TAKUMI_JSON_FILE);
   }
   async loadInstalledSettings() {
     const ckJsonPath = this.getCkJsonPath();
@@ -29499,7 +29543,7 @@ class InstalledSettingsTracker {
       return { hooks: [], mcpServers: [] };
     }
     try {
-      const content = await readFile6(ckJsonPath, "utf-8");
+      const content = await readFile7(ckJsonPath, "utf-8");
       const data = JSON.parse(content);
       const installed = data.kits?.[this.kitName]?.installedSettings;
       if (installed) {
@@ -29516,7 +29560,7 @@ class InstalledSettingsTracker {
     try {
       let data = {};
       if (existsSync5(ckJsonPath)) {
-        const content = await readFile6(ckJsonPath, "utf-8");
+        const content = await readFile7(ckJsonPath, "utf-8");
         data = JSON.parse(content);
       }
       if (!data.kits) {
@@ -29965,16 +30009,16 @@ var init_merge_engine = __esm(() => {
 
 // src/domains/config/merger/file-io.ts
 import { randomUUID } from "node:crypto";
-import { dirname as dirname3, join as join13 } from "node:path";
+import { dirname as dirname3, join as join14 } from "node:path";
 function stripBOM(content) {
   return content.charCodeAt(0) === 65279 ? content.slice(1) : content;
 }
 async function readSettingsFile(filePath) {
   try {
-    if (!await import_fs_extra9.pathExists(filePath)) {
+    if (!await import_fs_extra10.pathExists(filePath)) {
       return null;
     }
-    const rawContent = await import_fs_extra9.readFile(filePath, "utf-8");
+    const rawContent = await import_fs_extra10.readFile(filePath, "utf-8");
     const content = stripBOM(rawContent);
     const parsed = JSON.parse(content);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
@@ -29989,14 +30033,14 @@ async function readSettingsFile(filePath) {
 }
 async function atomicWriteFile(filePath, content) {
   const dir = dirname3(filePath);
-  const tempPath = join13(dir, `.settings-${randomUUID()}.tmp`);
+  const tempPath = join14(dir, `.settings-${randomUUID()}.tmp`);
   try {
-    await import_fs_extra9.writeFile(tempPath, content, "utf-8");
-    await import_fs_extra9.rename(tempPath, filePath);
+    await import_fs_extra10.writeFile(tempPath, content, "utf-8");
+    await import_fs_extra10.rename(tempPath, filePath);
   } catch (error) {
     try {
-      if (await import_fs_extra9.pathExists(tempPath)) {
-        await import_fs_extra9.unlink(tempPath);
+      if (await import_fs_extra10.pathExists(tempPath)) {
+        await import_fs_extra10.unlink(tempPath);
       }
     } catch {}
     throw error;
@@ -30006,10 +30050,10 @@ async function writeSettingsFile(filePath, settings) {
   const content = JSON.stringify(settings, null, 2);
   await atomicWriteFile(filePath, content);
 }
-var import_fs_extra9;
+var import_fs_extra10;
 var init_file_io = __esm(() => {
   init_logger();
-  import_fs_extra9 = __toESM(require_lib(), 1);
+  import_fs_extra10 = __toESM(require_lib(), 1);
 });
 
 // src/domains/config/merger/index.ts
@@ -30079,7 +30123,7 @@ class SettingsProcessor {
   }
   async processSettingsJson(sourceFile, destFile) {
     try {
-      const sourceContent = await import_fs_extra10.readFile(sourceFile, "utf-8");
+      const sourceContent = await import_fs_extra11.readFile(sourceFile, "utf-8");
       let transformedSource = sourceContent;
       if (this.isGlobal) {
         const homeVar = '"$HOME"';
@@ -30093,7 +30137,7 @@ class SettingsProcessor {
           logger.debug("Transformed paths to $CLAUDE_PROJECT_DIR/.claude/ in settings.json for local installation");
         }
       }
-      const destExists = await import_fs_extra10.pathExists(destFile);
+      const destExists = await import_fs_extra11.pathExists(destFile);
       if (destExists && !this.forceOverwriteSettings) {
         await this.selectiveMergeSettings(transformedSource, destFile);
       } else {
@@ -30114,13 +30158,13 @@ class SettingsProcessor {
           }
         } catch {
           const formattedContent = this.formatJsonContent(transformedSource);
-          await import_fs_extra10.writeFile(destFile, formattedContent, "utf-8");
+          await import_fs_extra11.writeFile(destFile, formattedContent, "utf-8");
         }
         await this.injectTeamHooksIfSupported(destFile);
       }
     } catch (error) {
       logger.error(`Failed to process settings.json: ${error}`);
-      await import_fs_extra10.copy(sourceFile, destFile, { overwrite: true });
+      await import_fs_extra11.copy(sourceFile, destFile, { overwrite: true });
     }
   }
   async selectiveMergeSettings(transformedSourceContent, destFile) {
@@ -30130,7 +30174,7 @@ class SettingsProcessor {
     } catch {
       logger.warning("Failed to parse source settings.json, falling back to overwrite");
       const formattedContent = this.formatJsonContent(transformedSourceContent);
-      await import_fs_extra10.writeFile(destFile, formattedContent, "utf-8");
+      await import_fs_extra11.writeFile(destFile, formattedContent, "utf-8");
       return;
     }
     let destSettings;
@@ -30322,7 +30366,7 @@ class SettingsProcessor {
   }
   async readAndNormalizeGlobalSettings(destFile) {
     try {
-      const content = await import_fs_extra10.readFile(destFile, "utf-8");
+      const content = await import_fs_extra11.readFile(destFile, "utf-8");
       if (!content.trim())
         return null;
       const homeVar = "$HOME";
@@ -30527,17 +30571,17 @@ class SettingsProcessor {
     }
   }
 }
-var import_fs_extra10, import_semver2;
+var import_fs_extra11, import_semver2;
 var init_settings_processor = __esm(() => {
   init_installed_settings_tracker();
   init_settings_merger();
   init_logger();
-  import_fs_extra10 = __toESM(require_lib(), 1);
+  import_fs_extra11 = __toESM(require_lib(), 1);
   import_semver2 = __toESM(require_semver2(), 1);
 });
 
 // src/domains/installation/merger/copy-executor.ts
-import { dirname as dirname4, join as join14, relative as relative4 } from "node:path";
+import { dirname as dirname4, join as join15, relative as relative4 } from "node:path";
 async function withRetry(fn, retries = 3) {
   for (let i = 0;i < retries; i++) {
     try {
@@ -30612,8 +30656,8 @@ class CopyExecutor {
     for (const file of files) {
       const relativePath = relative4(sourceDir, file);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
-      const destPath = join14(destDir, relativePath);
-      if (await import_fs_extra11.pathExists(destPath)) {
+      const destPath = join15(destDir, relativePath);
+      if (await import_fs_extra12.pathExists(destPath)) {
         if (this.fileScanner.shouldNeverCopy(normalizedRelativePath)) {
           logger.debug(`Security-sensitive file exists but won't be overwritten: ${normalizedRelativePath}`);
           continue;
@@ -30634,14 +30678,14 @@ class CopyExecutor {
     for (const file of files) {
       const relativePath = relative4(sourceDir, file);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
-      const destPath = join14(destDir, relativePath);
+      const destPath = join15(destDir, relativePath);
       if (this.fileScanner.shouldNeverCopy(normalizedRelativePath)) {
         logger.debug(`Skipping security-sensitive file: ${normalizedRelativePath}`);
         skippedCount++;
         continue;
       }
       if (this.userConfigChecker.ignores(normalizedRelativePath)) {
-        const fileExists = await import_fs_extra11.pathExists(destPath);
+        const fileExists = await import_fs_extra12.pathExists(destPath);
         if (fileExists) {
           logger.debug(`Preserving user config: ${normalizedRelativePath}`);
           skippedCount++;
@@ -30672,7 +30716,7 @@ class CopyExecutor {
           continue;
         }
       }
-      await withRetry(() => import_fs_extra11.copy(file, destPath, { overwrite: true }));
+      await withRetry(() => import_fs_extra12.copy(file, destPath, { overwrite: true }));
       this.trackInstalledFile(normalizedRelativePath);
       copiedCount++;
     }
@@ -30718,7 +30762,7 @@ class CopyExecutor {
     }
   }
 }
-var import_fs_extra11, import_ignore2, isRetryable = (e2) => {
+var import_fs_extra12, import_ignore2, isRetryable = (e2) => {
   const code = e2.code ?? "";
   return ["EBUSY", "EPERM", "EACCES"].includes(code);
 }, delay = (ms) => new Promise((r2) => setTimeout(r2, ms));
@@ -30728,7 +30772,7 @@ var init_copy_executor = __esm(() => {
   init_selective_merger();
   init_file_scanner();
   init_settings_processor();
-  import_fs_extra11 = __toESM(require_lib(), 1);
+  import_fs_extra12 = __toESM(require_lib(), 1);
   import_ignore2 = __toESM(require_ignore(), 1);
 });
 
@@ -30826,7 +30870,7 @@ var init_file_merger = __esm(() => {
 
 // src/shared/kit-layout.ts
 import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 function uniquePaths(paths) {
   return [...new Set(paths)];
 }
@@ -30839,7 +30883,7 @@ function findFirstExistingPath(paths) {
   return null;
 }
 function resolveKitLayout(projectRoot) {
-  const packageJsonPath = join15(projectRoot, "package.json");
+  const packageJsonPath = join16(projectRoot, "package.json");
   if (!existsSync6(packageJsonPath)) {
     return DEFAULT_KIT_LAYOUT;
   }
@@ -30856,8 +30900,8 @@ function resolveKitLayout(projectRoot) {
 function getProjectLayoutCandidates(projectRoot, subPath) {
   const layout = resolveKitLayout(projectRoot);
   return uniquePaths([
-    join15(projectRoot, layout.sourceDir, subPath),
-    join15(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, subPath)
+    join16(projectRoot, layout.sourceDir, subPath),
+    join16(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, subPath)
   ]);
 }
 function findExistingProjectLayoutPath(projectRoot, subPath) {
@@ -30866,9 +30910,9 @@ function findExistingProjectLayoutPath(projectRoot, subPath) {
 function getProjectConfigCandidates(projectRoot) {
   const layout = resolveKitLayout(projectRoot);
   return uniquePaths([
-    join15(projectRoot, "CLAUDE.md"),
-    join15(projectRoot, layout.sourceDir, "CLAUDE.md"),
-    join15(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, "CLAUDE.md")
+    join16(projectRoot, "CLAUDE.md"),
+    join16(projectRoot, layout.sourceDir, "CLAUDE.md"),
+    join16(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, "CLAUDE.md")
   ]);
 }
 function findExistingProjectConfigPath(projectRoot) {
@@ -34352,21 +34396,21 @@ var require_gray_matter = __commonJS((exports, module) => {
 });
 
 // src/domains/installers/shared/skills-discovery.ts
-import { readFile as readFile9, readdir as readdir3, stat as stat3 } from "node:fs/promises";
+import { readFile as readFile10, readdir as readdir3, stat as stat3 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
-import { basename, dirname as dirname5, join as join16 } from "node:path";
+import { basename, dirname as dirname5, join as join17 } from "node:path";
 function getSkillSourcePath() {
-  const bundledRoot = join16(process.cwd(), "node_modules", "takumi-engineer");
+  const bundledRoot = join17(process.cwd(), "node_modules", "takumi-engineer");
   return findFirstExistingPath([
-    join16(bundledRoot, "skills"),
+    join17(bundledRoot, "skills"),
     ...getProjectLayoutCandidates(bundledRoot, "skills"),
     ...getProjectLayoutCandidates(process.cwd(), "skills"),
-    join16(home, ".claude/skills")
+    join17(home, ".claude/skills")
   ]);
 }
 async function hasSkillMd(dir) {
   try {
-    const skillPath = join16(dir, "SKILL.md");
+    const skillPath = join17(dir, "SKILL.md");
     const stats = await stat3(skillPath);
     return stats.isFile();
   } catch {
@@ -34375,7 +34419,7 @@ async function hasSkillMd(dir) {
 }
 async function parseSkillMd(skillMdPath) {
   try {
-    const content = await readFile9(skillMdPath, "utf-8");
+    const content = await readFile10(skillMdPath, "utf-8");
     const { data } = import_gray_matter.default(content);
     const skillDir = dirname5(skillMdPath);
     const dirName = skillDir.split(/[/\\]/).pop() || "";
@@ -34423,7 +34467,7 @@ async function readWorkflowSlashNames(workflowsDir) {
   return names;
 }
 async function readSiblingWorkflowNames(skillsDir) {
-  return readWorkflowSlashNames(join16(dirname5(skillsDir), "workflows"));
+  return readWorkflowSlashNames(join17(dirname5(skillsDir), "workflows"));
 }
 async function discoverSkills(sourcePath) {
   const skills = [];
@@ -34443,9 +34487,9 @@ async function discoverSkills(sourcePath) {
         logger.verbose(`Skipping skill "${entry.name}": shadowed by workflow with the same name`);
         continue;
       }
-      const skillDir = join16(searchPath, entry.name);
+      const skillDir = join17(searchPath, entry.name);
       if (await hasSkillMd(skillDir)) {
-        const skill = await parseSkillMd(join16(skillDir, "SKILL.md"));
+        const skill = await parseSkillMd(join17(skillDir, "SKILL.md"));
         if (skill && !seenNames.has(skill.name)) {
           skills.push(skill);
           seenNames.add(skill.name);
@@ -34465,43 +34509,6 @@ var init_skills_discovery = __esm(() => {
   WORKFLOW_ENTRY_EXTENSIONS = [".js", ".mjs", ".cjs"];
 });
 
-// src/domains/migration/release-manifest.ts
-import { join as join17 } from "node:path";
-
-class ReleaseManifestLoader {
-  static async load(extractDir) {
-    const manifestPath = join17(extractDir, "release-manifest.json");
-    try {
-      const content = await import_fs_extra12.readFile(manifestPath, "utf-8");
-      const parsed = JSON.parse(content);
-      return ReleaseManifestSchema.parse(parsed);
-    } catch (error) {
-      logger.debug(`Release manifest not found or invalid: ${error}`);
-      return null;
-    }
-  }
-  static findFile(manifest, relativePath) {
-    return manifest.files.find((f3) => f3.path === relativePath);
-  }
-}
-var import_fs_extra12, ReleaseManifestFileSchema, ReleaseManifestSchema;
-var init_release_manifest = __esm(() => {
-  init_logger();
-  init_zod();
-  import_fs_extra12 = __toESM(require_lib(), 1);
-  ReleaseManifestFileSchema = exports_external.object({
-    path: exports_external.string(),
-    checksum: exports_external.string().regex(/^[a-f0-9]{64}$/),
-    size: exports_external.number(),
-    lastModified: exports_external.string().datetime({ offset: true }).optional()
-  });
-  ReleaseManifestSchema = exports_external.object({
-    version: exports_external.string(),
-    generatedAt: exports_external.string(),
-    files: exports_external.array(ReleaseManifestFileSchema)
-  });
-});
-
 // src/domains/migration/legacy-migration.ts
 import { readdir as readdir4, stat as stat4 } from "node:fs/promises";
 import { join as join18, relative as relative5 } from "node:path";
@@ -35362,6 +35369,28 @@ var init_commands_prefix = __esm(() => {
   };
 });
 
+// src/domains/installers/claude-code/ownership-resolver.ts
+function createClaudeOwnershipResolver(releaseManifest) {
+  return (installedPath) => {
+    const providerRelativePath = normalizeClaudeReleaseManifestPath(installedPath);
+    if (providerRelativePath === "settings.json" || userConfigMatcher.ignores(providerRelativePath)) {
+      return { ownership: "user" };
+    }
+    const entry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
+    return {
+      ownership: entry ? "takumi" : "user",
+      sourceTimestamp: entry?.lastModified
+    };
+  };
+}
+var import_ignore3, userConfigMatcher;
+var init_ownership_resolver = __esm(() => {
+  init_release_manifest();
+  init_types2();
+  import_ignore3 = __toESM(require_ignore(), 1);
+  userConfigMatcher = import_ignore3.default().add(USER_CONFIG_PATTERNS);
+});
+
 // src/domains/ui/ownership-display.ts
 var exports_ownership_display = {};
 __export(exports_ownership_display, {
@@ -35619,13 +35648,7 @@ async function handleMerge(ctx) {
     logger.debug(`Cleanup of deprecated files failed: ${error}`);
   }
   const installedFiles = merger.getAllInstalledFiles();
-  const resolver = (installedPath) => {
-    const entry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
-    return {
-      ownership: entry ? "takumi" : "user",
-      sourceTimestamp: entry?.lastModified
-    };
-  };
+  const resolver = createClaudeOwnershipResolver(releaseManifest);
   const filesToTrack = buildFileTrackingList({
     installedFiles,
     providerRoot: ctx.claudeDir,
@@ -35659,6 +35682,7 @@ var init_merge_handler = __esm(() => {
   init_commands_prefix();
   init_logger();
   init_output_manager();
+  init_ownership_resolver();
   import_fs_extra18 = __toESM(require_lib(), 1);
 });
 
@@ -52646,7 +52670,7 @@ import { promises as fs13 } from "node:fs";
 import { basename as basename12, extname as extname5, resolve as resolve16 } from "node:path";
 
 // src/domains/artifact/folder-walk.ts
-var import_ignore3 = __toESM(require_ignore(), 1);
+var import_ignore4 = __toESM(require_ignore(), 1);
 import { promises as fs12 } from "node:fs";
 import { join as join72, relative as relative14 } from "node:path";
 var MAX_FILE_BYTES = 20 * 1024 * 1024;
@@ -52661,7 +52685,7 @@ class FolderLimitError extends Error {
   }
 }
 async function buildIgnoreMatcher(rootDir) {
-  const ig = import_ignore3.default();
+  const ig = import_ignore4.default();
   for (const file of IGNORE_FILES) {
     try {
       ig.add(await fs12.readFile(join72(rootDir, file), "utf8"));
@@ -53591,6 +53615,44 @@ function tryOpenBrowser(target) {
 init_logger();
 import * as http from "node:http";
 
+// src/domains/sessions/analytics-daily-by-model.ts
+function buildDailyByModel(aggregates, oldestAllowedMs) {
+  const byDayModel = new Map;
+  for (const agg of aggregates) {
+    const ms = startedMs(agg?.startedAt);
+    if (ms === null)
+      continue;
+    const perModel = agg?.tokensByModel;
+    if (!perModel || typeof perModel !== "object")
+      continue;
+    const date = dayKey(ms);
+    if (Date.parse(`${date}T00:00:00.000Z`) < oldestAllowedMs)
+      continue;
+    let byModel = byDayModel.get(date);
+    if (!byModel) {
+      byModel = new Map;
+      byDayModel.set(date, byModel);
+    }
+    for (const [model, mtok] of Object.entries(perModel)) {
+      let acc = byModel.get(model);
+      if (!acc) {
+        acc = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+        byModel.set(model, acc);
+      }
+      accumulateTokens(acc, normalizeTokens(mtok));
+    }
+  }
+  const rows = [];
+  for (const [date, byModel] of byDayModel) {
+    for (const [model, tokens] of byModel) {
+      if (sumTokens(tokens) > 0)
+        rows.push({ date, model, tokens });
+    }
+  }
+  rows.sort((a3, b3) => a3.date.localeCompare(b3.date) || a3.model.localeCompare(b3.model));
+  return rows;
+}
+
 // src/domains/sessions/analytics.ts
 var DAY_MS = 24 * 60 * 60 * 1000;
 var PER_DAY_MAX = 371;
@@ -53704,6 +53766,7 @@ function foldAnalytics(aggregates, now, range) {
   const rankedModels = [...tokensByModel.entries()].map(([label, tokens]) => ({ label, tokens, total: sumTokens(tokens) })).filter((m2) => m2.total > 0).sort((a3, b3) => b3.total - a3.total || a3.label.localeCompare(b3.label)).slice(0, TOP_PROJECTS);
   const byModel = rankedModels.map(({ label, total }) => ({ label, tokens: total }));
   const byModelDetailed = rankedModels.map(({ label, tokens }) => ({ label, tokens }));
+  const dailyByModel = buildDailyByModel(aggregates, oldestAllowedMs);
   const cacheDenom = totals.cacheRead + totals.input;
   const cacheHitRate = cacheDenom > 0 ? totals.cacheRead / cacheDenom : 0;
   return {
@@ -53725,7 +53788,8 @@ function foldAnalytics(aggregates, now, range) {
       byProject,
       daily,
       byModel,
-      byModelDetailed
+      byModelDetailed,
+      dailyByModel
     },
     window: {
       earliest: earliestMs === null ? null : new Date(earliestMs).toISOString(),
@@ -69558,7 +69622,7 @@ function detectBroadGlob(pattern, pathHint) {
 }
 
 // src/domains/hooks/handlers/guard-breadth-scout/check-ignore.ts
-var import_ignore4 = __toESM(require_ignore(), 1);
+var import_ignore5 = __toESM(require_ignore(), 1);
 import { existsSync as existsSync45, readFileSync as readFileSync13 } from "node:fs";
 import { dirname as dirname24, join as join93 } from "node:path";
 var BUILTIN_HEAVY_DIR_LINES = [
@@ -69619,7 +69683,7 @@ function cleanLines(lines) {
 }
 function buildIgnoreConfig(lines, sourceLabel) {
   const cleaned = cleanLines(lines);
-  const ig = import_ignore4.default().add(cleaned);
+  const ig = import_ignore5.default().add(cleaned);
   const patterns = cleaned.filter((line) => !line.startsWith("!"));
   return { ig, patterns, sourceLabel };
 }
@@ -69659,7 +69723,7 @@ function findMatchingIgnoreRule(candidatePath, config) {
   let matched = null;
   for (const pattern of config.patterns) {
     try {
-      if (import_ignore4.default().add(pattern).ignores(rel))
+      if (import_ignore5.default().add(pattern).ignores(rel))
         matched = pattern;
     } catch {}
   }
@@ -77277,7 +77341,7 @@ function registerTempDir(dir) {
 
 // src/domains/installation/download-manager.ts
 init_types2();
-var import_ignore5 = __toESM(require_ignore(), 1);
+var import_ignore6 = __toESM(require_ignore(), 1);
 
 // src/domains/installation/download/file-downloader.ts
 init_logger();
@@ -81172,11 +81236,11 @@ class DownloadManager {
   ig;
   userExcludePatterns = [];
   constructor() {
-    this.ig = import_ignore5.default().add(EXCLUDE_PATTERNS);
+    this.ig = import_ignore6.default().add(EXCLUDE_PATTERNS);
   }
   setExcludePatterns(patterns) {
     this.userExcludePatterns = patterns;
-    this.ig = import_ignore5.default().add([...EXCLUDE_PATTERNS, ...this.userExcludePatterns]);
+    this.ig = import_ignore6.default().add([...EXCLUDE_PATTERNS, ...this.userExcludePatterns]);
     if (patterns.length > 0) {
       logger.info(`Added ${patterns.length} custom exclude pattern(s)`);
       patterns.forEach((p2) => logger.debug(`  - ${p2}`));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sunasteriskrnd/takumi",
-	"version": "1.0.0-dev.46",
+	"version": "1.0.0-dev.48",
 	"description": "CLI tool for bootstrapping and managing Takumi projects",
 	"type": "module",
 	"repository": {