@sunasteriskrnd/takumi 1.0.0-dev.31 → 1.0.0-dev.33

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.31",
+    version: "1.0.0-dev.33",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -22283,6 +22283,7 @@ var init_commands = __esm(() => {
     fresh: exports_external.boolean().default(false),
     force: exports_external.boolean().default(false),
     installSkills: exports_external.boolean().default(false),
+    installHooks: exports_external.boolean().default(false),
     withSudo: exports_external.boolean().default(false),
     prefix: exports_external.boolean().default(false),
     beta: exports_external.boolean().default(false),
@@ -61954,6 +61955,7 @@ function buildSessionPayload(args) {
   const endedAt = summary.timing.ended_at ?? startedAt;
   const durationS = summary.timing.duration_s ?? Math.max(0, Math.round((Date.parse(endedAt) - Date.parse(startedAt)) / 1000));
   const tokens = summary.totals;
+  const hasTokenUsage = summary.token_usage && Object.keys(summary.token_usage).length > 0;
   return {
     session: {
       id: summary.session_id,
@@ -61970,7 +61972,8 @@ function buildSessionPayload(args) {
       cache_write_tokens: tokens.cache_write,
       milestone_completed: args.milestone,
       error_count: args.errorCount,
-      tool_stats: summary.tool_stats
+      tool_stats: summary.tool_stats,
+      ...hasTokenUsage ? { token_usage: summary.token_usage } : {}
     }
   };
 }
@@ -61990,6 +61993,7 @@ function initialSummary(args) {
     project: args.project,
     timing: { started_at: args.startedAt, ended_at: null, duration_s: null },
     main_loop_tokens: zeroTokens(),
+    token_usage: {},
     subagents: [],
     skills: [],
     tool_stats: {
@@ -62122,6 +62126,7 @@ async function tailRead(args) {
 function bucketTokens(records) {
   const mainLoopDelta = zeroTokens2();
   const subagentDeltas = new Map;
+  const tokenUsageDeltas = new Map;
   for (const record of records) {
     if (record.type !== "assistant")
       continue;
@@ -62140,8 +62145,13 @@ function bucketTokens(records) {
     } else {
       Object.assign(mainLoopDelta, addTokens2(mainLoopDelta, tokens));
     }
+    const model = record.message?.model;
+    if (model) {
+      const prev = tokenUsageDeltas.get(model) ?? zeroTokens2();
+      tokenUsageDeltas.set(model, addTokens2(prev, tokens));
+    }
   }
-  return { mainLoopDelta, subagentDeltas };
+  return { mainLoopDelta, subagentDeltas, tokenUsageDeltas };
 }
 
 // src/domains/hooks/telemetry/lib/transcript-apply.ts
@@ -62156,6 +62166,13 @@ function addTokens3(a3, b3) {
     cache_write: a3.cache_write + b3.cache_write
   };
 }
+function mergeTokenUsageDeltas(existing, deltas) {
+  const out = { ...existing ?? {} };
+  for (const [model, delta] of deltas) {
+    out[model] = addTokens3(ensureTokens(out[model]), delta);
+  }
+  return out;
+}
 async function applyTranscriptDelta(args) {
   if (!args.transcriptPath) {
     return { summary: args.summary, read: false };
@@ -62168,7 +62185,7 @@ async function applyTranscriptDelta(args) {
     if (records.length === 0 && nextOffset === args.summary.transcript_offset) {
       return { summary: args.summary, read: true };
     }
-    const { mainLoopDelta, subagentDeltas } = bucketTokens(records);
+    const { mainLoopDelta, subagentDeltas, tokenUsageDeltas } = bucketTokens(records);
     const updated = {
       ...args.summary,
       main_loop_tokens: addTokens3(args.summary.main_loop_tokens, mainLoopDelta),
@@ -62178,6 +62195,7 @@ async function applyTranscriptDelta(args) {
           return rec;
         return { ...rec, tokens: addTokens3(ensureTokens(rec.tokens), delta) };
       }),
+      token_usage: mergeTokenUsageDeltas(args.summary.token_usage, tokenUsageDeltas),
       transcript_offset: nextOffset
     };
     return { summary: updated, read: true };
@@ -66467,6 +66485,12 @@ var AGENT_DISPLAY3 = {
   claude: "Claude Code",
   codex: "Codex"
 };
+function selectHandlersForInstall(categories) {
+  if (!categories)
+    return HOOK_HANDLERS;
+  const wanted = new Set(categories);
+  return HOOK_HANDLERS.filter((h2) => wanted.has(h2.category));
+}
 function countEntries(section) {
   let count = 0;
   for (const groups of Object.values(section)) {
@@ -66483,7 +66507,7 @@ async function installForAgent(agent, options2, interactive, useStepUI) {
   const section = buildHookSection(agent, options2.bin, {
     noDetach: options2.noDetach,
     debug: options2.debug
-  });
+  }, selectHandlersForInstall(options2.categories));
   const entriesPlanned = countEntries(section);
   const result = await writeSettingsWithConfirm({
     path: location2.realPath,
@@ -67952,6 +67976,7 @@ function createInitContext(rawOptions, prompts) {
     exclude: [],
     only: [],
     installSkills: false,
+    installHooks: false,
     withSudo: false,
     forceOverwrite: false,
     forceOverwriteSettings: false,
@@ -72669,6 +72694,7 @@ async function resolveOptions(ctx) {
     docsDir: parsed.docsDir,
     plansDir: parsed.plansDir,
     installSkills: parsed.installSkills ?? false,
+    installHooks: parsed.installHooks ?? false,
     withSudo: parsed.withSudo ?? false,
     forceOverwrite: parsed.forceOverwrite ?? false,
     forceOverwriteSettings: parsed.forceOverwriteSettings ?? false,
@@ -75020,6 +75046,7 @@ function mapAgentToHookAgent(agent) {
   return null;
 }
 async function installTkmHooksForAgents(targetAgents2, options2) {
+  const categories = options2.installHooks ? undefined : ["metrics"];
   for (const agent of targetAgents2) {
     const hookAgent = mapAgentToHookAgent(agent);
     if (!hookAgent)
@@ -75029,6 +75056,7 @@ async function installTkmHooksForAgents(targetAgents2, options2) {
         agent: hookAgent,
         global: options2.global,
         dryRun: options2.dryRun,
+        categories,
         yes: true
       });
     } catch (err) {
@@ -75148,7 +75176,8 @@ async function executeInit(options2, prompts) {
   if (!isSyncMode) {
     await installTkmHooksForAgents(targetAgents2, {
       global: Boolean(ctx.options.global),
-      dryRun: Boolean(ctx.options.dryRun)
+      dryRun: Boolean(ctx.options.dryRun),
+      installHooks: Boolean(ctx.options.installHooks)
     });
   }
   if (targetAgents2.length > 1) {
@@ -77525,7 +77554,7 @@ ${import_picocolors29.default.bold(import_picocolors29.default.cyan(result.kitCo
 // src/cli/command-registry.ts
 init_logger();
 function registerCommands(cli) {
-  cli.command("init", "Initialize or update Takumi project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit(s) to install (core, extras). Repeat the flag to install multiple kits, e.g. --kit core --kit extras.").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove SK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /sk: prefix to all slash commands by moving them to commands/sk/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").option("--local", "Use local monorepo as kit source (auto-detects from CLI location)").option("--use-gh", "Force GitHub release source (bypass Worker R2 proxy; default uses Worker)").option("-a, --agent <agents...>", "Target agents (claude-code, codex). Default: claude-code").action(async (options2) => {
+  cli.command("init", "Initialize or update Takumi project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit(s) to install (core, extras). Repeat the flag to install multiple kits, e.g. --kit core --kit extras.").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove SK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--install-hooks", "Install all agent hooks (guard, session, convention, extension). Default installs only telemetry hooks.").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /sk: prefix to all slash commands by moving them to commands/sk/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").option("--local", "Use local monorepo as kit source (auto-detects from CLI location)").option("--use-gh", "Force GitHub release source (bypass Worker R2 proxy; default uses Worker)").option("-a, --agent <agents...>", "Target agents (claude-code, codex). Default: claude-code").action(async (options2) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }

package/package.json

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