@sunasteriskrnd/takumi 1.0.0-dev.16 → 1.0.0-dev.17

package/dist/index.js

@@ -43742,10 +43742,11 @@ async function handleConflicts(ctx) {
     return ctx;
   if (!ctx.options.global)
     return ctx;
-  if (isLocalSameAsGlobal()) {
+  const projectRoot = ctx.resolvedDir ?? process.cwd();
+  if (isLocalSameAsGlobal(projectRoot)) {
     return ctx;
   }
-  const localSettingsPath = join13(process.cwd(), ".claude", "settings.json");
+  const localSettingsPath = join13(projectRoot, ".claude", "settings.json");
   if (!await import_fs_extra6.pathExists(localSettingsPath)) {
     return ctx;
   }
@@ -43760,7 +43761,7 @@ async function handleConflicts(ctx) {
     return { ...ctx, cancelled: true };
   }
   if (choice === "remove") {
-    const localClaudeDir = join13(process.cwd(), ".claude");
+    const localClaudeDir = join13(projectRoot, ".claude");
     try {
       await import_fs_extra6.remove(localClaudeDir);
       logger.success("Removed local .claude/ directory");
@@ -51621,7 +51622,7 @@ import { join as join48 } from "node:path";
 init_logger();
 var CODEX_ENV_MARKER = `module.exports = { agent: 'codex' };
 `;
-function writeCodexEnvMarker(global3) {
+function writeCodexEnvMarker(global3, projectRoot) {
   try {
     const pathConfig = providers.codex.hooks;
     if (!pathConfig)
@@ -51629,7 +51630,7 @@ function writeCodexEnvMarker(global3) {
     const scopedPath = global3 ? pathConfig.globalPath : pathConfig.projectPath;
     if (!scopedPath)
       return;
-    const targetHooksDir = global3 ? scopedPath : join48(process.cwd(), scopedPath);
+    const targetHooksDir = global3 ? scopedPath : join48(projectRoot ?? process.cwd(), scopedPath);
     const libDir = join48(targetHooksDir, "lib");
     mkdirSync(libDir, { recursive: true });
     writeFileSync2(join48(libDir, "env.cjs"), CODEX_ENV_MARKER);
@@ -52589,8 +52590,16 @@ function isPathWithinBoundary(targetPath, boundaryPath) {
   const resolvedBoundary = resolve6(boundaryPath);
   return resolvedTarget === resolvedBoundary || resolvedTarget.startsWith(`${resolvedBoundary}${sep3}`);
 }
+function getProjectBoundary(options2) {
+  return options2.projectRoot ?? process.cwd();
+}
+function resolveInstallBasePath(rawPath, options2) {
+  if (options2.global)
+    return rawPath;
+  return resolve6(getProjectBoundary(options2), rawPath);
+}
 function validateStrategyTargetPath(targetPath, options2) {
-  const boundary = options2.global ? homedir11() : process.cwd();
+  const boundary = options2.global ? homedir11() : getProjectBoundary(options2);
   if (!isPathWithinBoundary(targetPath, boundary)) {
     return `Unsafe path: target escapes ${options2.global ? "home" : "project"} directory`;
   }
@@ -52724,8 +52733,8 @@ async function installOneFile(item, provider, kind, options2) {
       error: `${config.displayName} does not support ${kind}s`
     };
   }
-  const basePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
-  if (!basePath) {
+  const rawBasePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
+  if (!rawBasePath) {
     return {
       provider,
       providerDisplayName: config.displayName,
@@ -52734,6 +52743,7 @@ async function installOneFile(item, provider, kind, options2) {
       error: `${config.displayName} does not support ${options2.global ? "global" : "project"}-level ${kind}s`
     };
   }
+  const basePath = resolveInstallBasePath(rawBasePath, options2);
   const segmentError = validatePortableItemSegments(item);
   if (segmentError) {
     return {
@@ -53124,8 +53134,8 @@ async function installMergeSingle(items, provider, kind, options2) {
       error: `${config.displayName} does not support ${kind}s`
     };
   }
-  const targetPath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
-  if (!targetPath) {
+  const rawTargetPath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
+  if (!rawTargetPath) {
     return {
       provider,
       providerDisplayName: config.displayName,
@@ -53134,6 +53144,7 @@ async function installMergeSingle(items, provider, kind, options2) {
       error: `${config.displayName} does not support ${options2.global ? "global" : "project"}-level ${kind}s`
     };
   }
+  const targetPath = resolveInstallBasePath(rawTargetPath, options2);
   const targetPathError = validateStrategyTargetPath(targetPath, options2);
   if (targetPathError) {
     return {
@@ -53587,8 +53598,8 @@ async function installCodexToml(items, provider, kind, options2, deps) {
       error: `${config.displayName} does not support agents`
     };
   }
-  const basePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
-  if (!basePath) {
+  const rawBasePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
+  if (!rawBasePath) {
     return {
       provider,
       providerDisplayName: config.displayName,
@@ -53597,8 +53608,8 @@ async function installCodexToml(items, provider, kind, options2, deps) {
       error: `${config.displayName} does not support ${options2.global ? "global" : "project"}-level agents`
     };
   }
-  const boundary = options2.global ? homedir12() : process.cwd();
-  const agentsDir = resolve8(basePath);
+  const boundary = options2.global ? homedir12() : getProjectBoundary(options2);
+  const agentsDir = resolveInstallBasePath(rawBasePath, options2);
   const configTomlPath = join51(dirname12(agentsDir), "config.toml");
   if (!isPathWithinBoundary2(agentsDir, boundary)) {
     return {
@@ -53811,10 +53822,10 @@ async function cleanupStaleCodexConfigEntries(options2) {
   const pathConfig = config.agents;
   if (!pathConfig)
     return [];
-  const basePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
-  if (!basePath)
+  const rawBasePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
+  if (!rawBasePath)
     return [];
-  const agentsDir = resolve8(basePath);
+  const agentsDir = resolveInstallBasePath(rawBasePath, options2);
   const configTomlPath = join51(dirname12(agentsDir), "config.toml");
   if (!existsSync21(configTomlPath))
     return [];
@@ -53948,8 +53959,8 @@ async function installSkillDirectories(skills, targetProviders, options2) {
       });
       continue;
     }
-    const basePath = options2.global ? skillConfig.globalPath : skillConfig.projectPath;
-    if (!basePath) {
+    const rawBasePath = options2.global ? skillConfig.globalPath : skillConfig.projectPath;
+    if (!rawBasePath) {
       results.push({
         provider,
         providerDisplayName: config.displayName,
@@ -53959,6 +53970,7 @@ async function installSkillDirectories(skills, targetProviders, options2) {
       });
       continue;
     }
+    const basePath = resolveInstallBasePath(rawBasePath, options2);
     for (const skill of skills) {
       const targetDir = join52(basePath, skill.name);
       if (resolve9(skill.path) === resolve9(targetDir)) {
@@ -55052,9 +55064,11 @@ async function migrateCodexHooksSettings(options2) {
     installedHookFiles,
     installedHookAbsolutePaths,
     global: isGlobal,
+    projectRoot,
     sourceSettingsPathOverride,
     sourceHooksDirOverride
   } = options2;
+  const projectBase = projectRoot ?? process.cwd();
   if (installedHookFiles.length === 0) {
     return {
       status: "no-installed-files",
@@ -55095,8 +55109,8 @@ async function migrateCodexHooksSettings(options2) {
       codexCapabilitiesVersion: capabilities.version
     };
   }
-  const resolvedSourcePath = sourceSettingsPathOverride ? sourceSettingsPathOverride : isGlobal ? sourceSettingsPath : join56(process.cwd(), sourceSettingsPath);
-  const resolvedTargetPath = isGlobal ? targetSettingsPath : join56(process.cwd(), targetSettingsPath);
+  const resolvedSourcePath = sourceSettingsPathOverride ? sourceSettingsPathOverride : isGlobal ? sourceSettingsPath : join56(projectBase, sourceSettingsPath);
+  const resolvedTargetPath = isGlobal ? targetSettingsPath : join56(projectBase, targetSettingsPath);
   const sourceHooksResult = await inspectHooksSettings(resolvedSourcePath);
   if (sourceHooksResult.status === "missing-file") {
     return {
@@ -55143,8 +55157,8 @@ async function migrateCodexHooksSettings(options2) {
   const wrapperPaths = [];
   const commandSubstitutions = new Map;
   if (targetHooksDir) {
-    const absSourceHooksDir = sourceHooksDir ? isAbsolute2(sourceHooksDir) ? sourceHooksDir : resolve13(sourceHooksDir) : "";
-    const absTargetHooksDir = isAbsolute2(targetHooksDir) ? targetHooksDir : resolve13(targetHooksDir);
+    const absSourceHooksDir = sourceHooksDir ? isAbsolute2(sourceHooksDir) ? sourceHooksDir : resolve13(projectBase, sourceHooksDir) : "";
+    const absTargetHooksDir = isAbsolute2(targetHooksDir) ? targetHooksDir : resolve13(projectBase, targetHooksDir);
     const targetAbsolutePaths = installedHookAbsolutePaths && installedHookAbsolutePaths.length > 0 ? installedHookAbsolutePaths.filter(isCodexWrappableHookPath) : installedHookFiles.filter(isCodexWrappableHookPath).map((basenameOrPath) => basenameOrPath.includes("/") || basenameOrPath.includes("\\") ? basenameOrPath : join56(absTargetHooksDir, basenameOrPath));
     const wrapperResults = generateCodexHookWrappers(targetAbsolutePaths, absTargetHooksDir, capabilities);
     for (const wr of wrapperResults) {
@@ -55206,7 +55220,7 @@ async function migrateCodexHooksSettings(options2) {
   }
   let featureFlagWritten = false;
   if (capabilities.requiresFeatureFlag) {
-    const configTomlPath = isGlobal ? join56(homedir15(), ".codex", "config.toml") : join56(process.cwd(), ".codex", "config.toml");
+    const configTomlPath = isGlobal ? join56(homedir15(), ".codex", "config.toml") : join56(projectBase, ".codex", "config.toml");
     const flagResult = await ensureCodexHooksFeatureFlag(configTomlPath, isGlobal);
     featureFlagWritten = flagResult.status === "written" || flagResult.status === "updated";
   }
@@ -55321,7 +55335,7 @@ function pruneDeletedHooks(userHooksJson, deletions, wrapperDir) {
 
 // src/domains/installers/codex/post-pipeline.ts
 var HOOK_SUPPORT_SKIP_DIRS = new Set(["__tests__", "tests", "docs"]);
-function installCodexHookSupportDirs(hookItems, global3) {
+function installCodexHookSupportDirs(hookItems, global3, projectRoot) {
   const firstSource = hookItems[0]?.sourcePath;
   if (!firstSource)
     return;
@@ -55333,7 +55347,7 @@ function installCodexHookSupportDirs(hookItems, global3) {
     const scopedPath = global3 ? pathConfig.globalPath : pathConfig.projectPath;
     if (!scopedPath)
       return;
-    const targetHooksDir = global3 ? scopedPath : join58(process.cwd(), scopedPath);
+    const targetHooksDir = global3 ? scopedPath : join58(projectRoot ?? process.cwd(), scopedPath);
     for (const entry of readdirSync3(sourceHooksDir, { withFileTypes: true })) {
       if (!entry.isDirectory() || HOOK_SUPPORT_SKIP_DIRS.has(entry.name))
         continue;
@@ -55349,13 +55363,14 @@ function installCodexHookSupportDirs(hookItems, global3) {
     logger.debug(`[init/codex] hook support-dir copy failed: ${String(e2)}`);
   }
 }
-async function mergeInstalledHooks(hookFiles, global3, kitSource) {
+async function mergeInstalledHooks(hookFiles, global3, kitSource, projectRoot) {
   if (hookFiles.length === 0)
     return;
   const merge = await migrateCodexHooksSettings({
     sourceProvider: "claude-code",
     installedHookFiles: hookFiles,
     global: global3,
+    projectRoot,
     sourceSettingsPathOverride: kitSource?.settingsPath,
     sourceHooksDirOverride: kitSource?.hooksDir
   });
@@ -55374,9 +55389,13 @@ function deriveKitHookSource(items) {
     hooksDir: ".claude/hooks"
   };
 }
-async function cleanupStaleCodexToml(global3) {
+async function cleanupStaleCodexToml(global3, projectRoot) {
   try {
-    const staleSlugs = await cleanupStaleCodexConfigEntries({ global: global3, provider: "codex" });
+    const staleSlugs = await cleanupStaleCodexConfigEntries({
+      global: global3,
+      projectRoot,
+      provider: "codex"
+    });
     if (staleSlugs.length > 0) {
       const staleSet = new Set(staleSlugs.map((s) => `${s}.toml`));
       await removeInstallationsByFilter((i) => i.type === "agent" && i.provider === "codex" && i.global === global3 && staleSet.has(basename8(i.path)));
@@ -55392,7 +55411,7 @@ async function healRegistryChecksums(actions, registry) {
     logger.debug("[init/codex] backfill checksums failed");
   }
 }
-async function pruneCodexDeletedHooks(items, global3) {
+async function pruneCodexDeletedHooks(items, global3, projectRoot) {
   try {
     const kitRoot = items.agents[0]?.sourcePath?.split(/[/\\]agents[/\\]/)[0] ?? items.commands[0]?.sourcePath?.split(/[/\\]commands[/\\]/)[0] ?? items.hooks[0]?.sourcePath?.split(/[/\\]hooks[/\\]/)[0] ?? null;
     if (!kitRoot)
@@ -55406,10 +55425,11 @@ async function pruneCodexDeletedHooks(items, global3) {
     if (deletions.length === 0)
       return;
     const codex = providers.codex;
-    const hooksJsonPath = global3 ? codex.settingsJsonPath?.globalPath : codex.settingsJsonPath?.projectPath ? join58(process.cwd(), codex.settingsJsonPath.projectPath) : null;
+    const root = projectRoot ?? process.cwd();
+    const hooksJsonPath = global3 ? codex.settingsJsonPath?.globalPath : codex.settingsJsonPath?.projectPath ? join58(root, codex.settingsJsonPath.projectPath) : null;
     if (!hooksJsonPath || !existsSync26(hooksJsonPath))
       return;
-    const wrapperDir = global3 ? codex.hooks?.globalPath : codex.hooks?.projectPath ? join58(process.cwd(), codex.hooks.projectPath) : null;
+    const wrapperDir = global3 ? codex.hooks?.globalPath : codex.hooks?.projectPath ? join58(root, codex.hooks.projectPath) : null;
     if (!wrapperDir)
       return;
     const userJson = JSON.parse(readFileSync7(hooksJsonPath, "utf-8"));
@@ -56109,7 +56129,7 @@ async function discoverFromSources(sources) {
 async function executeCodexPipeline(items, options2) {
   const ui = new InstallerStepUI("codex");
   const { TakumiConfigManager: TakumiConfigManager2 } = await Promise.resolve().then(() => (init_takumi_config_manager(), exports_takumi_config_manager));
-  const ckConfigResult = await TakumiConfigManager2.loadFull(process.cwd());
+  const ckConfigResult = await TakumiConfigManager2.loadFull(options2.projectRoot ?? process.cwd());
   setTaxonomyOverrides(ckConfigResult.config.modelTaxonomy);
   ui.phase("Discovering kit sources");
   const totalItems = items.agents.length + items.commands.length + items.skills.length + items.rules.length + items.hooks.length + (items.config ? 1 : 0);
@@ -56149,7 +56169,7 @@ async function executeCodexPipeline(items, options2) {
     ui.success(`Resolved ${conflicts.length} conflict(s)`);
   }
   const planned = plan.actions.filter(shouldExecuteAction).sort((a3, b3) => (TYPE_PRIORITY[a3.type] ?? 99) - (TYPE_PRIORITY[b3.type] ?? 99));
-  const installOpts = { global: options2.global };
+  const installOpts = { global: options2.global, projectRoot: options2.projectRoot };
   const results = [];
   const successfulHookFiles = [];
   const byName = {
@@ -56226,12 +56246,12 @@ async function executeCodexPipeline(items, options2) {
   ui.success(`Installed ${execSummary.applied} file(s)${execSummary.skipped > 0 ? `, skipped ${execSummary.skipped}` : ""}`);
   ui.phase("Finalizing post-install");
   if (items.hooks.length > 0) {
-    installCodexHookSupportDirs(items.hooks, options2.global);
-    writeCodexEnvMarker(options2.global);
+    installCodexHookSupportDirs(items.hooks, options2.global, options2.projectRoot);
+    writeCodexEnvMarker(options2.global, options2.projectRoot);
   }
-  await pruneCodexDeletedHooks(items, options2.global);
-  await mergeInstalledHooks(successfulHookFiles, options2.global, deriveKitHookSource(items));
-  await cleanupStaleCodexToml(options2.global);
+  await pruneCodexDeletedHooks(items, options2.global, options2.projectRoot);
+  await mergeInstalledHooks(successfulHookFiles, options2.global, deriveKitHookSource(items), options2.projectRoot);
+  await cleanupStaleCodexToml(options2.global, options2.projectRoot);
   await healRegistryChecksums(plan.actions, registry);
   await bumpAppliedManifestVersion(items);
   ui.success("Hooks merged, registry healed");
@@ -56252,7 +56272,7 @@ import { join as join64 } from "node:path";
 // src/domains/installers/codex/skills-paths.ts
 import { homedir as homedir20 } from "node:os";
 import { resolve as resolve15 } from "node:path";
-function getCodexSkillsTargetDir(global3) {
+function getCodexSkillsTargetDir(global3, projectRoot) {
   const cfg = providers.codex.skills;
   if (!cfg) {
     throw new Error("[codex] skills configuration missing from provider registry");
@@ -56261,8 +56281,9 @@ function getCodexSkillsTargetDir(global3) {
   if (!path7) {
     throw new Error(`[codex] no ${global3 ? "global" : "project"}-level skills path configured`);
   }
-  const resolved = resolve15(path7);
-  const boundary = global3 ? homedir20() : process.cwd();
+  const projectBase = projectRoot ?? process.cwd();
+  const resolved = global3 ? resolve15(path7) : resolve15(projectBase, path7);
+  const boundary = global3 ? homedir20() : projectBase;
   if (!isPathWithinBoundary3(resolved, boundary)) {
     throw new Error(`[codex] resolved skills path "${resolved}" escapes boundary "${boundary}"`);
   }
@@ -56437,6 +56458,7 @@ var codexInstaller = {
           items = { ...items, commands: [] };
         }
       }
+      const projectRoot = ctx.resolvedDir;
       if (ctx.options.fresh) {
         const confirmed = await confirmFresh(ctx, installGlobally);
         if (!confirmed) {
@@ -56448,12 +56470,13 @@ var codexInstaller = {
             cancelled: true
           };
         }
-        await wipeCodexTargets(installGlobally);
+        await wipeCodexTargets(installGlobally, projectRoot);
       }
       const interactive = !ctx.isNonInteractive && Boolean(process.stdout.isTTY);
       const useColor = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
       const { results } = await executeCodexPipeline(items, {
         global: installGlobally,
+        projectRoot,
         force: ctx.options.force,
         dryRun: ctx.options.dryRun,
         interactive,
@@ -56463,7 +56486,7 @@ var codexInstaller = {
         return { provider: "codex", success: true, installedFiles: [], cancelled: true };
       }
       const hasSkills = items.skills.length > 0;
-      const codexSkillsDir = hasSkills ? getCodexSkillsTargetDir(installGlobally) : null;
+      const codexSkillsDir = hasSkills ? getCodexSkillsTargetDir(installGlobally, projectRoot) : null;
       let auxCopySucceeded = false;
       if (hasSkills && sources.skills && codexSkillsDir) {
         try {
@@ -56542,15 +56565,17 @@ async function confirmFresh(ctx, global3) {
     return false;
   return Boolean(result);
 }
-async function wipeCodexTargets(global3) {
+async function wipeCodexTargets(global3, projectRoot) {
   const codexConfig = providers.codex;
-  const targetPaths = [
+  const rawPaths = [
     global3 ? codexConfig.agents?.globalPath : codexConfig.agents?.projectPath,
     global3 ? codexConfig.commands?.globalPath : codexConfig.commands?.projectPath,
     global3 ? codexConfig.hooks?.globalPath : codexConfig.hooks?.projectPath,
     global3 ? codexConfig.settingsJsonPath?.globalPath : codexConfig.settingsJsonPath?.projectPath,
     global3 ? codexConfig.config?.globalPath : codexConfig.config?.projectPath
   ].filter((p) => Boolean(p));
+  const projectBase = projectRoot ?? process.cwd();
+  const targetPaths = rawPaths.map((p) => global3 ? p : join67(projectBase, p));
   for (const path7 of targetPaths) {
     if (existsSync31(path7)) {
       try {
@@ -65058,6 +65083,14 @@ async function resolveOptions(ctx) {
     validOptions.agents = Array.from(new Set(validOptions.agents));
   }
   ConfigManager.setGlobalFlag(validOptions.global);
+  if (validOptions.global && explicitDir) {
+    throw new Error(`Options --global and --dir are mutually exclusive.
+
+` + `  --global: Install to ~/.claude (or ~/.codex) — platform-wide
+` + `  --dir:    Install to a specific project root
+
+` + "Choose one.");
+  }
   if (validOptions.global) {
     logger.info("Global mode enabled - using platform-specific user configuration");
   }
@@ -70906,7 +70939,7 @@ var import_fs_extra37 = __toESM(require_lib(), 1);
 // package.json
 var package_default = {
   name: "@sunasteriskrnd/takumi",
-  version: "1.0.0-dev.16",
+  version: "1.0.0-dev.17",
   description: "CLI tool for bootstrapping and managing Takumi projects",
   type: "module",
   repository: {

package/package.json

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