@sunasteriskrnd/takumi 1.0.0-dev.35 → 1.0.0-dev.36

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.35",
+    version: "1.0.0-dev.36",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -43277,6 +43277,43 @@ var init_capabilities = __esm(() => {
   import_semver4 = __toESM(require_semver2(), 1);
   execFileAsync2 = promisify2(execFile2);
   CODEX_CAPABILITY_TABLE = [
+    {
+      version: "0.138.0",
+      events: {
+        SessionStart: {
+          supported: true,
+          supportsAdditionalContext: true,
+          allowedMatchers: ["startup", "resume", "clear"]
+        },
+        UserPromptSubmit: {
+          supported: true,
+          supportsAdditionalContext: true
+        },
+        PreToolUse: {
+          supported: true,
+          supportsAdditionalContext: true,
+          permissionDecisionValues: ["deny", "allow", "block"]
+        },
+        PostToolUse: {
+          supported: true,
+          supportsAdditionalContext: true
+        },
+        PermissionRequest: {
+          supported: true,
+          supportsAdditionalContext: false
+        },
+        Stop: {
+          supported: true,
+          supportsAdditionalContext: false
+        },
+        SubagentStop: {
+          supported: true,
+          supportsAdditionalContext: false
+        }
+      },
+      sessionStartMatchersOnly: ["startup", "resume", "clear"],
+      requiresFeatureFlag: true
+    },
     {
       version: "0.130.0",
       events: {
@@ -49082,11 +49119,11 @@ var exports_monorepo_resolver = {};
 __export(exports_monorepo_resolver, {
   resolveMonorepoRoot: () => resolveMonorepoRoot
 });
-import { existsSync as existsSync54, readFileSync as readFileSync22 } from "node:fs";
+import { existsSync as existsSync55, readFileSync as readFileSync22 } from "node:fs";
 import { dirname as dirname33, join as join116, resolve as resolve26 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function parseMetadataAt(metadataPath) {
-  if (!existsSync54(metadataPath))
+  if (!existsSync55(metadataPath))
     return null;
   try {
     const raw = readFileSync22(metadataPath, "utf-8");
@@ -49101,7 +49138,7 @@ function parseMetadataAt(metadataPath) {
 }
 function readSourceDirFromPackageJson(candidateRoot) {
   const packageJsonPath = join116(candidateRoot, "package.json");
-  if (!existsSync54(packageJsonPath))
+  if (!existsSync55(packageJsonPath))
     return null;
   try {
     const parsed = JSON.parse(readFileSync22(packageJsonPath, "utf-8"));
@@ -49938,7 +49975,7 @@ function renderGlobalHelp(commands, options2 = DEFAULT_HELP_OPTIONS) {
     theme.heading("Commands:")
   ];
   const commandNames = Object.keys(commands);
-  const maxNameWidth = Math.max(...commandNames.map((n) => n.length));
+  const maxNameWidth = Math.max(...commandNames.map((n2) => n2.length));
   const sortedCommands = Object.entries(commands).sort(([a3], [b4]) => a3.localeCompare(b4));
   for (const [name, help] of sortedCommands) {
     const cmdPart = `  ${padEnd(theme.command(name), maxNameWidth + 4)}`;
@@ -56974,6 +57011,26 @@ async function checkCodexHooksHealth() {
     details: configTomlPath,
     autoFixable: false
   });
+  const hasSubagentStop = await hasSubagentStopEntry(hooksJsonPath);
+  results.push(hasSubagentStop ? {
+    id: "codex-hooks-subagent-stop",
+    name: "Codex SubagentStop telemetry",
+    group: "takumi",
+    priority: "standard",
+    status: "pass",
+    message: "SubagentStop hook wired (per-subagent token attribution active)",
+    details: hooksJsonPath,
+    autoFixable: false
+  } : {
+    id: "codex-hooks-subagent-stop",
+    name: "Codex SubagentStop telemetry",
+    group: "takumi",
+    priority: "standard",
+    status: "warn",
+    message: "No SubagentStop hook — per-subagent tokens won't be attributed. Expected on Codex < 0.138; otherwise re-run `tkm init -a codex`.",
+    details: hooksJsonPath,
+    autoFixable: false
+  });
   const missing = await collectMissingWrapperTargets(hooksJsonPath);
   results.push(missing.length === 0 ? {
     id: "codex-hooks-command-targets",
@@ -56996,6 +57053,18 @@ async function checkCodexHooksHealth() {
   });
   return results;
 }
+async function hasSubagentStopEntry(hooksJsonPath) {
+  let parsed;
+  try {
+    parsed = JSON.parse(await readFile33(hooksJsonPath, "utf8"));
+  } catch {
+    return false;
+  }
+  const groups = parsed?.hooks?.SubagentStop;
+  if (!Array.isArray(groups))
+    return false;
+  return groups.some((group) => Array.isArray(group?.hooks) && group.hooks.length > 0);
+}
 async function collectMissingWrapperTargets(hooksJsonPath) {
   let parsed;
   try {
@@ -60084,6 +60153,119 @@ async function readStdinJson() {
   }
 }
 
+// src/domains/hooks/telemetry/lib/claude-transcript-reader.ts
+function num2(v2) {
+  return typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
+}
+function zeroTokens() {
+  return { input: 0, output: 0, cache_read: 0, cache_write: 0 };
+}
+function addTokens2(a3, b3) {
+  return {
+    input: a3.input + b3.input,
+    output: a3.output + b3.output,
+    cache_read: a3.cache_read + b3.cache_read,
+    cache_write: a3.cache_write + b3.cache_write
+  };
+}
+function extractTokens(record) {
+  const usage = record.message?.usage;
+  if (!usage)
+    return null;
+  return {
+    input: num2(usage.input_tokens),
+    output: num2(usage.output_tokens),
+    cache_read: num2(usage.cache_read_input_tokens),
+    cache_write: num2(usage.cache_creation_input_tokens)
+  };
+}
+async function tailRead(args) {
+  const { records, newOffset } = readNew(args.transcriptPath, args.offset);
+  return { records, nextOffset: newOffset };
+}
+function bucketTokens(records) {
+  const mainLoopDelta = zeroTokens();
+  const subagentDeltas = new Map;
+  const tokenUsageDeltas = new Map;
+  for (const record of records) {
+    if (record.type !== "assistant")
+      continue;
+    const tokens = extractTokens(record);
+    if (!tokens)
+      continue;
+    if (record.isSidechain === true) {
+      const key = record.agentId ?? record.toolUseID;
+      if (!key) {
+        const prev2 = mainLoopDelta;
+        Object.assign(mainLoopDelta, addTokens2(prev2, tokens));
+        continue;
+      }
+      const prev = subagentDeltas.get(key) ?? zeroTokens();
+      subagentDeltas.set(key, addTokens2(prev, tokens));
+    } else {
+      Object.assign(mainLoopDelta, addTokens2(mainLoopDelta, tokens));
+    }
+    const model = record.message?.model;
+    if (model) {
+      const prev = tokenUsageDeltas.get(model) ?? zeroTokens();
+      tokenUsageDeltas.set(model, addTokens2(prev, tokens));
+    }
+  }
+  return { mainLoopDelta, subagentDeltas, tokenUsageDeltas };
+}
+
+// src/domains/hooks/telemetry/lib/claude-transcript-apply.ts
+function ensureTokens(t) {
+  return t ?? { input: 0, output: 0, cache_read: 0, cache_write: 0 };
+}
+function addTokens3(a3, b3) {
+  return {
+    input: a3.input + b3.input,
+    output: a3.output + b3.output,
+    cache_read: a3.cache_read + b3.cache_read,
+    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 applyClaudeTranscriptDelta(args) {
+  if (!args.transcriptPath) {
+    return { summary: args.summary, read: false };
+  }
+  try {
+    const { records, nextOffset } = await tailRead({
+      transcriptPath: args.transcriptPath,
+      offset: args.summary.transcript_offset
+    });
+    if (records.length === 0 && nextOffset === args.summary.transcript_offset) {
+      return { summary: args.summary, read: true };
+    }
+    const { mainLoopDelta, subagentDeltas, tokenUsageDeltas } = bucketTokens(records);
+    const updated = {
+      ...args.summary,
+      main_loop_tokens: addTokens3(args.summary.main_loop_tokens, mainLoopDelta),
+      subagents: args.summary.subagents.map((rec) => {
+        const delta = subagentDeltas.get(rec.id);
+        if (!delta)
+          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 };
+  } catch (e2) {
+    const error = e2?.message ?? String(e2);
+    hookLog("transcript_apply", { error });
+    return { summary: args.summary, read: false, error };
+  }
+}
+
 // src/domains/hooks/telemetry/lib/detached-put.ts
 import { spawn as spawn2 } from "node:child_process";
 import { openSync as openSync4 } from "node:fs";
@@ -60326,7 +60508,7 @@ function buildSessionPayload(args) {
 
 // src/domains/hooks/telemetry/lib/summary.ts
 import { promises as fs21 } from "node:fs";
-function zeroTokens() {
+function zeroTokens2() {
   return { input: 0, output: 0, cache_read: 0, cache_write: 0 };
 }
 function initialSummary(args) {
@@ -60338,7 +60520,7 @@ function initialSummary(args) {
     kit_versions: args.kitVersions ?? {},
     project: args.project,
     timing: { started_at: args.startedAt, ended_at: null, duration_s: null },
-    main_loop_tokens: zeroTokens(),
+    main_loop_tokens: zeroTokens2(),
     token_usage: {},
     subagents: [],
     skills: [],
@@ -60351,7 +60533,7 @@ function initialSummary(args) {
       subagents: { by_type: {} },
       skills: { by_name: {} }
     },
-    totals: zeroTokens(),
+    totals: zeroTokens2(),
     pending_user_triggers: [],
     skills_in_flight: {},
     transcript_offset: 0,
@@ -60439,119 +60621,6 @@ async function shouldFlush(args) {
   return false;
 }
 
-// src/domains/hooks/telemetry/lib/transcript-reader.ts
-function num2(v2) {
-  return typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
-}
-function zeroTokens2() {
-  return { input: 0, output: 0, cache_read: 0, cache_write: 0 };
-}
-function addTokens2(a3, b3) {
-  return {
-    input: a3.input + b3.input,
-    output: a3.output + b3.output,
-    cache_read: a3.cache_read + b3.cache_read,
-    cache_write: a3.cache_write + b3.cache_write
-  };
-}
-function extractTokens(record) {
-  const usage = record.message?.usage;
-  if (!usage)
-    return null;
-  return {
-    input: num2(usage.input_tokens),
-    output: num2(usage.output_tokens),
-    cache_read: num2(usage.cache_read_input_tokens),
-    cache_write: num2(usage.cache_creation_input_tokens)
-  };
-}
-async function tailRead(args) {
-  const { records, newOffset } = readNew(args.transcriptPath, args.offset);
-  return { records, nextOffset: newOffset };
-}
-function bucketTokens(records) {
-  const mainLoopDelta = zeroTokens2();
-  const subagentDeltas = new Map;
-  const tokenUsageDeltas = new Map;
-  for (const record of records) {
-    if (record.type !== "assistant")
-      continue;
-    const tokens = extractTokens(record);
-    if (!tokens)
-      continue;
-    if (record.isSidechain === true) {
-      const key = record.agentId ?? record.toolUseID;
-      if (!key) {
-        const prev2 = mainLoopDelta;
-        Object.assign(mainLoopDelta, addTokens2(prev2, tokens));
-        continue;
-      }
-      const prev = subagentDeltas.get(key) ?? zeroTokens2();
-      subagentDeltas.set(key, addTokens2(prev, tokens));
-    } 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, tokenUsageDeltas };
-}
-
-// src/domains/hooks/telemetry/lib/transcript-apply.ts
-function ensureTokens(t) {
-  return t ?? { input: 0, output: 0, cache_read: 0, cache_write: 0 };
-}
-function addTokens3(a3, b3) {
-  return {
-    input: a3.input + b3.input,
-    output: a3.output + b3.output,
-    cache_read: a3.cache_read + b3.cache_read,
-    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 };
-  }
-  try {
-    const { records, nextOffset } = await tailRead({
-      transcriptPath: args.transcriptPath,
-      offset: args.summary.transcript_offset
-    });
-    if (records.length === 0 && nextOffset === args.summary.transcript_offset) {
-      return { summary: args.summary, read: true };
-    }
-    const { mainLoopDelta, subagentDeltas, tokenUsageDeltas } = bucketTokens(records);
-    const updated = {
-      ...args.summary,
-      main_loop_tokens: addTokens3(args.summary.main_loop_tokens, mainLoopDelta),
-      subagents: args.summary.subagents.map((rec) => {
-        const delta = subagentDeltas.get(rec.id);
-        if (!delta)
-          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 };
-  } catch (e2) {
-    const error = e2?.message ?? String(e2);
-    hookLog("transcript_apply", { error });
-    return { summary: args.summary, read: false, error };
-  }
-}
-
 // src/domains/hooks/telemetry/flush/session-end.ts
 var PUT_TIMEOUT_MS = 5000;
 function readCliVersion() {
@@ -60597,7 +60666,7 @@ async function runSessionEndFlush(data, ctx) {
     const transcriptPath = typeof data.transcript_path === "string" ? data.transcript_path : (await readMeta(sessionDir))?.transcript_path ?? null;
     let finalSummary = summary;
     if (transcriptPath) {
-      const applied = await applyTranscriptDelta({ summary, transcriptPath });
+      const applied = await applyClaudeTranscriptDelta({ summary, transcriptPath });
       if (applied.read)
         finalSummary = applied.summary;
     }
@@ -60685,13 +60754,123 @@ async function handleSessionEnd(agent, flags = {}) {
 // src/domains/hooks/telemetry/flush/stop.ts
 init_takumi_constants();
 
+// src/domains/hooks/telemetry/lib/codex-tokens.ts
+import * as fs23 from "node:fs";
+function n(v2) {
+  return typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
+}
+function codexTokensOf(rec) {
+  const r2 = rec;
+  if (r2?.type !== "event_msg")
+    return null;
+  if (r2?.payload?.type !== "token_count")
+    return null;
+  const u = r2?.payload?.info?.last_token_usage;
+  if (!u)
+    return null;
+  const input = n(u.input_tokens);
+  const cached = n(u.cached_input_tokens);
+  return {
+    input: Math.max(0, input - cached),
+    output: n(u.output_tokens) + n(u.reasoning_output_tokens),
+    cache_read: cached,
+    cache_write: 0
+  };
+}
+function sumCodexChildTokens(jsonlPath) {
+  const acc = { input: 0, output: 0, cache_read: 0, cache_write: 0 };
+  if (!jsonlPath || !fs23.existsSync(jsonlPath))
+    return acc;
+  const { records } = readNew(jsonlPath, 0);
+  for (const rec of records) {
+    const tok = codexTokensOf(rec);
+    if (!tok)
+      continue;
+    acc.input += tok.input;
+    acc.output += tok.output;
+    acc.cache_read += tok.cache_read;
+    acc.cache_write += tok.cache_write;
+  }
+  return acc;
+}
+
+// src/domains/hooks/telemetry/lib/codex-transcript-apply.ts
+function addTokens4(a3, b3) {
+  return {
+    input: a3.input + b3.input,
+    output: a3.output + b3.output,
+    cache_read: a3.cache_read + b3.cache_read,
+    cache_write: a3.cache_write + b3.cache_write
+  };
+}
+function turnContextModel(rec) {
+  const r2 = rec;
+  if (r2?.type !== "turn_context")
+    return null;
+  const m2 = r2.payload?.model;
+  return typeof m2 === "string" && m2 ? m2 : null;
+}
+async function applyCodexTranscriptDelta(args) {
+  if (!args.transcriptPath) {
+    return { summary: args.summary, read: false };
+  }
+  try {
+    const fromOffset = args.summary.transcript_offset;
+    const { records, newOffset } = readNew(args.transcriptPath, fromOffset);
+    if (records.length === 0 && newOffset === fromOffset) {
+      return { summary: args.summary, read: true };
+    }
+    let currentModel = args.summary.last_codex_model ?? args.stdinModel ?? null;
+    const mainLoopDelta = { input: 0, output: 0, cache_read: 0, cache_write: 0 };
+    const tokenUsageDeltas = new Map;
+    for (const rec of records) {
+      const model = turnContextModel(rec);
+      if (model) {
+        currentModel = model;
+        continue;
+      }
+      const tok = codexTokensOf(rec);
+      if (!tok)
+        continue;
+      mainLoopDelta.input += tok.input;
+      mainLoopDelta.output += tok.output;
+      mainLoopDelta.cache_read += tok.cache_read;
+      mainLoopDelta.cache_write += tok.cache_write;
+      if (currentModel) {
+        tokenUsageDeltas.set(currentModel, addTokens4(tokenUsageDeltas.get(currentModel) ?? {
+          input: 0,
+          output: 0,
+          cache_read: 0,
+          cache_write: 0
+        }, tok));
+      }
+    }
+    const tokenUsage = { ...args.summary.token_usage ?? {} };
+    for (const [model, delta] of tokenUsageDeltas) {
+      tokenUsage[model] = addTokens4(tokenUsage[model] ?? { input: 0, output: 0, cache_read: 0, cache_write: 0 }, delta);
+    }
+    const updated = {
+      ...args.summary,
+      main_loop_tokens: addTokens4(args.summary.main_loop_tokens, mainLoopDelta),
+      token_usage: tokenUsage,
+      transcript_offset: newOffset,
+      ...currentModel ? { last_codex_model: currentModel } : {}
+    };
+    return { summary: updated, read: true };
+  } catch (e2) {
+    const error = e2?.message ?? String(e2);
+    hookLog("codex_transcript_apply", { error });
+    return { summary: args.summary, read: false, error };
+  }
+}
+
 // src/domains/hooks/lib/jsonl-append.ts
-import { promises as fs23, appendFileSync as appendFileSync2, mkdirSync as mkdirSync4 } from "node:fs";
+import { promises as fs24, appendFileSync as appendFileSync2, mkdirSync as mkdirSync4 } from "node:fs";
 import { dirname as dirname27 } from "node:path";
 async function appendJsonl(filePath, record) {
   try {
-    await fs23.mkdir(dirname27(filePath), { recursive: true });
-    await fs23.appendFile(filePath, `${JSON.stringify(record)}
+    await fs24.mkdir(dirname27(filePath), { recursive: true });
+    await fs24.appendFile(filePath, `${JSON.stringify(record)}
 `, "utf8");
   } catch {}
 }
@@ -60845,9 +61024,10 @@ async function runStopFlush(data, ctx) {
     const endedAtIso = new Date().toISOString();
     const startedAtIso = typeof data.session_started_at === "string" ? data.session_started_at : endedAtIso;
     const transcriptPath = typeof data.transcript_path === "string" ? data.transcript_path : null;
+    const stdinModel = typeof data.model === "string" && data.model ? data.model : null;
     const manifest = readManifestVersions(cwd2);
     const cliVersion = readCliVersion2();
-    const hasTranscript = agent === "claude" && Boolean(transcriptPath);
+    const hasTranscript = Boolean(transcriptPath) && (agent === "claude" || agent === "codex");
     const result = await recordEvent({
       agent,
       cwd: cwd2,
@@ -60877,7 +61057,11 @@ async function runStopFlush(data, ctx) {
       setHookDebugLog(sessionDebugLogPath(result.sessionDir));
     let payloadSummary = result.summary;
     if (hasTranscript && transcriptPath) {
-      const applied = await applyTranscriptDelta({
+      const applied = agent === "codex" ? await applyCodexTranscriptDelta({
+        summary: result.summary,
+        transcriptPath,
+        stdinModel
+      }) : await applyClaudeTranscriptDelta({
         summary: result.summary,
         transcriptPath
       });
@@ -60962,15 +61146,15 @@ async function handleStop(agent, flags = {}) {
 
 // src/domains/hooks/telemetry/otlp/observations-export.ts
 init_paths2();
-import { promises as fs27, openSync as openSync6 } from "node:fs";
+import { promises as fs28, openSync as openSync6 } from "node:fs";
 import { join as join99 } from "node:path";
 
 // src/domains/hooks/telemetry/lib/retention.ts
-import { promises as fs24 } from "node:fs";
+import { promises as fs25 } from "node:fs";
 import { join as join98 } from "node:path";
 async function pathExists24(path10) {
   try {
-    await fs24.access(path10);
+    await fs25.access(path10);
     return true;
   } catch {
     return false;
@@ -60982,7 +61166,7 @@ async function hasUnexportedObservations(dir) {
 async function decideDelete(dir, args) {
   let mtimeMs = 0;
   try {
-    const stat8 = await fs24.stat(dir);
+    const stat8 = await fs25.stat(dir);
     if (!stat8.isDirectory())
       return false;
     mtimeMs = stat8.mtimeMs;
@@ -61001,8 +61185,8 @@ async function decideDelete(dir, args) {
 }
 async function listChildren(dir) {
   try {
-    const names = await fs24.readdir(dir);
-    return names.map((n) => join98(dir, n));
+    const names = await fs25.readdir(dir);
+    return names.map((n2) => join98(dir, n2));
   } catch {
     return [];
   }
@@ -61037,7 +61221,7 @@ async function sweepRetention(args) {
       continue;
     }
     try {
-      await fs24.rm(dir, { recursive: true, force: true });
+      await fs25.rm(dir, { recursive: true, force: true });
       deleted.push(dir);
     } catch {}
   }
@@ -61045,10 +61229,10 @@ async function sweepRetention(args) {
 }
 
 // src/domains/hooks/telemetry/otlp/observations-export-state.ts
-import { promises as fs25 } from "node:fs";
+import { promises as fs26 } from "node:fs";
 async function exists(path10) {
   try {
-    await fs25.access(path10);
+    await fs26.access(path10);
     return true;
   } catch {
     return false;
@@ -61060,7 +61244,7 @@ async function stageObservationsForFlush(sessionDir) {
     return flushing;
   const live = getObservationsFile(sessionDir);
   try {
-    await fs25.rename(live, flushing);
+    await fs26.rename(live, flushing);
     return flushing;
   } catch {
     return null;
@@ -61068,15 +61252,15 @@ async function stageObservationsForFlush(sessionDir) {
 }
 async function completeObservationsFlush(sessionDir, flushingPath, now) {
   try {
-    await fs25.writeFile(getObservationsPushedFile(sessionDir), String(now), "utf8");
+    await fs26.writeFile(getObservationsPushedFile(sessionDir), String(now), "utf8");
   } catch {}
   try {
-    await fs25.rm(flushingPath, { force: true });
+    await fs26.rm(flushingPath, { force: true });
   } catch {}
 }
 async function readObsPushed(sessionDir) {
   try {
-    const raw = await fs25.readFile(getObservationsPushedFile(sessionDir), "utf8");
+    const raw = await fs26.readFile(getObservationsPushedFile(sessionDir), "utf8");
     const parsed = Number.parseInt(raw.trim(), 10);
     return Number.isFinite(parsed) ? parsed : null;
   } catch {
@@ -61091,7 +61275,7 @@ async function shouldFlushObservations(sessionDir, gate) {
     return true;
   let size = 0;
   try {
-    size = (await fs25.stat(getObservationsFile(sessionDir))).size;
+    size = (await fs26.stat(getObservationsFile(sessionDir))).size;
   } catch {
     return false;
   }
@@ -61118,7 +61302,7 @@ async function resolveOtlpConfig() {
 
 // src/domains/hooks/telemetry/otlp/otlp-post.ts
 import { spawn as spawn3 } from "node:child_process";
-import { promises as fs26, openSync as openSync5 } from "node:fs";
+import { promises as fs27, openSync as openSync5 } from "node:fs";
 
 // src/domains/hooks/telemetry/otlp/otlp-payload-builder.ts
 import { createHash as createHash10 } from "node:crypto";
@@ -61303,7 +61487,7 @@ async function runOtlpPost(job, deps = {}) {
   const now = deps.now ?? Date.now;
   let content;
   try {
-    content = await fs26.readFile(job.flushingPath, "utf8");
+    content = await fs27.readFile(job.flushingPath, "utf8");
   } catch {
     return { ok: false, skipped: true, error: "no_flushing_file" };
   }
@@ -61447,7 +61631,7 @@ function lockPath() {
 async function acquireSweepLock(now) {
   const path10 = lockPath();
   try {
-    await fs27.mkdir(getConfigDir(), { recursive: true });
+    await fs28.mkdir(getConfigDir(), { recursive: true });
   } catch {
     return false;
   }
@@ -61456,9 +61640,9 @@ async function acquireSweepLock(now) {
     return true;
   } catch {
     try {
-      const stat8 = await fs27.stat(path10);
+      const stat8 = await fs28.stat(path10);
       if (now - stat8.mtimeMs > STALE_LOCK_MS) {
-        await fs27.rm(path10, { force: true });
+        await fs28.rm(path10, { force: true });
         openSync6(path10, "wx");
         return true;
       }
@@ -61468,7 +61652,7 @@ async function acquireSweepLock(now) {
 }
 async function releaseSweepLock() {
   try {
-    await fs27.rm(lockPath(), { force: true });
+    await fs28.rm(lockPath(), { force: true });
   } catch {}
 }
 async function flushOrphanObservations(deps = {}) {
@@ -61558,6 +61742,10 @@ function classifyTool(toolName, toolInput) {
     const subagent = typeof input.subagent_type === "string" ? input.subagent_type : null;
     return { kind: "agent", name: capName(subagent) || "unknown" };
   }
+  if (toolName === "spawn_agent") {
+    const agentType = typeof input.agent_type === "string" ? input.agent_type : null;
+    return { kind: "agent", name: capName(agentType) || "unknown" };
+  }
   if (toolName === "Skill") {
     const skill = typeof input.skill === "string" ? input.skill : null;
     return { kind: "skill", name: capName(skill) || "unknown" };
@@ -61670,7 +61858,7 @@ async function runPostToolUseCapture(data, ctx) {
         const before = await readSummary(sessionDir);
         const baseline = before?.skills_in_flight[classified.name]?.baseline;
         if (before && baseline) {
-          const applied = await applyTranscriptDelta({ summary: before, transcriptPath });
+          const applied = await applyClaudeTranscriptDelta({ summary: before, transcriptPath });
           if (applied.read) {
             await writeSummary(sessionDir, applied.summary);
             skillTokens = diffTokens(applied.summary.main_loop_tokens, baseline);
@@ -61841,6 +62029,103 @@ async function handleSessionStart(agent, flags = {}) {
   await runSessionStartCapture(data, { agent, cwd: process.cwd(), flags });
 }
 
+// src/domains/hooks/telemetry/capture/subagent-stop.ts
+function zeroTokens3() {
+  return { input: 0, output: 0, cache_read: 0, cache_write: 0 };
+}
+function addTokens5(a3, b3) {
+  return {
+    input: a3.input + b3.input,
+    output: a3.output + b3.output,
+    cache_read: a3.cache_read + b3.cache_read,
+    cache_write: a3.cache_write + b3.cache_write
+  };
+}
+function projectSubagentTokensByType(s) {
+  const sums = new Map;
+  for (const rec of s.subagents) {
+    if (!rec.tokens)
+      continue;
+    sums.set(rec.type, addTokens5(sums.get(rec.type) ?? zeroTokens3(), rec.tokens));
+  }
+  for (const [type, tokens] of sums) {
+    const entry = s.tool_stats.subagents.by_type[type] ?? {
+      invocations: 0,
+      user_triggered: 0,
+      agent_triggered: 0
+    };
+    entry.tokens = tokens;
+    s.tool_stats.subagents.by_type[type] = entry;
+  }
+}
+function upsertCodexSubagent(s, agentId, agentType, tokens) {
+  const existing = s.subagents.find((r2) => r2.id === agentId);
+  if (existing) {
+    if (agentType && agentType !== "unknown")
+      existing.type = agentType;
+    if (tokens)
+      existing.tokens = tokens;
+  } else {
+    const rec = { id: agentId, type: agentType };
+    if (tokens)
+      rec.tokens = tokens;
+    s.subagents.push(rec);
+  }
+  projectSubagentTokensByType(s);
+  return s;
+}
+async function runSubagentStopCapture(data, ctx) {
+  const { agent, cwd: cwd2, flags } = ctx;
+  try {
+    if (agent !== "codex") {
+      hookLog("subagent-stop", { agent, skipped: "not_codex" });
+      return;
+    }
+    const sessionId = typeof data.session_id === "string" ? data.session_id : null;
+    if (!sessionId) {
+      hookLog("subagent-stop", { agent, skipped: "no_session_id" });
+      return;
+    }
+    const agentId = typeof data.agent_id === "string" && data.agent_id ? data.agent_id : null;
+    if (!agentId) {
+      hookLog("subagent-stop", { agent, session_id: sessionId, skipped: "no_agent_id" });
+      return;
+    }
+    const agentType = typeof data.agent_type === "string" && data.agent_type ? data.agent_type : "unknown";
+    const childPath = typeof data.agent_transcript_path === "string" ? data.agent_transcript_path : null;
+    const transcriptPath = typeof data.transcript_path === "string" ? data.transcript_path : null;
+    if (flags.debug) {
+      const sessionDir = getSessionDirV2({ agent, cwd: cwd2, sessionId });
+      if (sessionDir)
+        setHookDebugLog(sessionDebugLogPath(sessionDir));
+    }
+    const tokens = childPath ? sumCodexChildTokens(childPath) : null;
+    const tsIso = new Date().toISOString();
+    const result = await recordEvent({
+      agent,
+      cwd: cwd2,
+      sessionId,
+      startedAt: tsIso,
+      transcriptPath,
+      bufferEvent: { event_type: "subagent", event_name: agentType, ts: tsIso },
+      mutate: (s) => upsertCodexSubagent(s, agentId, agentType, tokens)
+    });
+    if (!result) {
+      hookLog("subagent-stop", { agent, session_id: sessionId, skipped: "bad_session_dir" });
+      return;
+    }
+    hookLog("subagent-stop", {
+      agent,
+      session_id: sessionId,
+      agent_id: agentId,
+      type: agentType,
+      tokens: tokens ? tokens.input + tokens.output : null
+    });
+  } catch (e2) {
+    hookLog("subagent-stop", { error: e2?.message ?? String(e2) });
+  }
+}
+
 // src/domains/hooks/telemetry/lib/trigger-detector.ts
 var SLASH_COMMAND_RE = /\B\/(?:[a-z][a-z0-9-]*:)?([a-z][a-z0-9-]*)/g;
 var SUBAGENT_MENTION_RE = /\buse the ([a-z][a-z0-9-]+) (?:agent|subagent)\b/gi;
@@ -61956,8 +62241,9 @@ var metricsRecord = {
   name: "metrics-record",
   category: "metrics",
   policy: "record",
-  events: ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse"],
+  events: ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "SubagentStop"],
   matchers: { SessionStart: "startup|resume|clear|compact" },
+  codexOnlyEvents: ["SubagentStop"],
   async run(input, ctx) {
     const cc = metricsCaptureContext(ctx);
     switch (ctx.event) {
@@ -61973,6 +62259,9 @@ var metricsRecord = {
       case "PostToolUse":
         await runPostToolUseCapture(input, cc);
         return METRICS_RECORD_RESULT;
+      case "SubagentStop":
+        await runSubagentStopCapture(input, cc);
+        return METRICS_RECORD_RESULT;
       default:
         return { status: "no-op", timingMs: 0 };
     }
@@ -61984,7 +62273,7 @@ import { mkdirSync as mkdirSync5 } from "node:fs";
 import { dirname as dirname28, join as join103 } from "node:path";
 
 // src/domains/hooks/handlers/_shared/project-detector.ts
-import { existsSync as existsSync46, readFileSync as readFileSync15 } from "node:fs";
+import { existsSync as existsSync47, readFileSync as readFileSync15 } from "node:fs";
 import { join as join100 } from "node:path";
 var LOCKFILE_PRIORITY = [
   { manager: "bun", files: ["bun.lockb", "bun.lock"] },
@@ -62020,7 +62309,7 @@ var APP_FRAMEWORKS = new Set([
 var WORKSPACE_MARKER_FILES = ["pnpm-workspace.yaml", "turbo.json", "lerna.json"];
 function fileExists(cwd2, name) {
   try {
-    return existsSync46(join100(cwd2, name));
+    return existsSync47(join100(cwd2, name));
   } catch {
     return false;
   }
@@ -62114,13 +62403,13 @@ import { platform as platform8, userInfo } from "node:os";
 import { join as join102 } from "node:path";
 
 // src/domains/hooks/handlers/session-init/plan-resolver.ts
-import { existsSync as existsSync47, readFileSync as readFileSync16, readdirSync as readdirSync7 } from "node:fs";
+import { existsSync as existsSync48, readFileSync as readFileSync16, readdirSync as readdirSync7 } from "node:fs";
 import { join as join101 } from "node:path";
 var MAX_PLAN_DIRS = 100;
 var MAX_PLAN_FILE_BYTES = 64 * 1024;
 function listPlanDirs(plansPath) {
   try {
-    if (!existsSync47(plansPath))
+    if (!existsSync48(plansPath))
       return [];
     return readdirSync7(plansPath, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort().slice(0, MAX_PLAN_DIRS);
   } catch {
@@ -62130,7 +62419,7 @@ function listPlanDirs(plansPath) {
 function planFileMentionsSession(planDir, sessionId) {
   try {
     const planFile = join101(planDir, "plan.md");
-    if (!existsSync47(planFile))
+    if (!existsSync48(planFile))
       return false;
     const body = readFileSync16(planFile, { encoding: "utf8" });
     if (body.length > MAX_PLAN_FILE_BYTES)
@@ -62359,7 +62648,7 @@ var sessionInit = {
 // src/domains/hooks/handlers/_shared/context-assembler.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { createHash as createHash12 } from "node:crypto";
-import { existsSync as existsSync48, mkdirSync as mkdirSync6, readFileSync as readFileSync17, rmSync as rmSync3, statSync as statSync6, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync49, mkdirSync as mkdirSync6, readFileSync as readFileSync17, rmSync as rmSync3, statSync as statSync6, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir27, platform as platform9, tmpdir as tmpdir4 } from "node:os";
 import { basename as basename18, join as join104, resolve as resolve21 } from "node:path";
 var INJECTED_TTL_MS = 12 * 60 * 60 * 1000;
@@ -62447,7 +62736,7 @@ function stateFile(sessionId, scope, transcriptPath) {
 }
 function readState(file) {
   try {
-    if (!existsSync48(file))
+    if (!existsSync49(file))
       return null;
     return JSON.parse(readFileSync17(file, "utf8"));
   } catch {
@@ -62514,7 +62803,7 @@ function clearPending(sessionId, scope, transcriptPath) {
 function resolveSkillsVenv(_cwd) {
   const base = join104(homedir27(), ".claude", "skills", ".venv");
   const interpreter = platform9() === "win32" ? join104(base, "Scripts", "python.exe") : join104(base, "bin", "python3");
-  return existsSync48(interpreter) ? interpreter : null;
+  return existsSync49(interpreter) ? interpreter : null;
 }
 
 // src/domains/hooks/handlers/session-prompt-context/handler.ts
@@ -62581,7 +62870,7 @@ function gitFacts(dir) {
   };
 }
 function stamp(fmt, now) {
-  const p = (n) => String(n).padStart(2, "0");
+  const p = (n2) => String(n2).padStart(2, "0");
   return fmt.replace(/YYYY/g, String(now.getFullYear())).replace(/YY/g, p(now.getFullYear() % 100)).replace(/MM/g, p(now.getMonth() + 1)).replace(/DD/g, p(now.getDate())).replace(/HH/g, p(now.getHours())).replace(/mm/g, p(now.getMinutes())).replace(/ss/g, p(now.getSeconds()));
 }
 function planDirTemplate(format, dateStr) {
@@ -63271,7 +63560,7 @@ init_hooks_settings_merger();
 
 // src/commands/portable/settings-write-with-confirm.ts
 init_safe_prompts();
-import { existsSync as existsSync49, mkdirSync as mkdirSync7, readFileSync as readFileSync18, renameSync as renameSync3, rmSync as rmSync4, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync50, mkdirSync as mkdirSync7, readFileSync as readFileSync18, renameSync as renameSync3, rmSync as rmSync4, writeFileSync as writeFileSync10 } from "node:fs";
 import { dirname as dirname29 } from "node:path";
 
 // node_modules/diff/libesm/diff/base.js
@@ -64444,7 +64733,7 @@ var EMPTY_RESULT = (status2) => ({
   backupPath: null
 });
 function readCurrent(path10) {
-  if (!existsSync49(path10))
+  if (!existsSync50(path10))
     return { kind: "missing" };
   let raw = "";
   try {
@@ -64561,7 +64850,7 @@ init_dist2();
 // src/commands/hooks/lib/agent-target-picker.ts
 init_safe_prompts();
 init_dist2();
-import { existsSync as existsSync50 } from "node:fs";
+import { existsSync as existsSync51 } from "node:fs";
 
 // src/commands/hooks/lib/settings-path-resolver.ts
 import { lstatSync as lstatSync3, realpathSync as realpathSync3 } from "node:fs";
@@ -64600,7 +64889,7 @@ function probe(global3) {
     return {
       agent,
       path: location2.realPath,
-      exists: existsSync50(location2.realPath)
+      exists: existsSync51(location2.realPath)
     };
   });
 }
@@ -64687,6 +64976,8 @@ function buildHookExecCommand(handler, event, agent, bin = DEFAULT_HOOK_BIN, fla
 function planEntry(handler, event, agent, bin, flags) {
   if (agent === "codex" && !codexSupportsEvent(event))
     return null;
+  if (agent !== "codex" && handler.codexOnlyEvents?.includes(event))
+    return null;
   const command = buildHookExecCommand(handler, event, agent, bin, flags);
   if (!command)
     return null;
@@ -64721,7 +65012,7 @@ function buildHookSection(agent, bin, flags = {}, handlers3 = HOOK_HANDLERS) {
 
 // src/commands/hooks/uninstall-handler.ts
 init_logger();
-import { existsSync as existsSync51, mkdirSync as mkdirSync8, readFileSync as readFileSync19, renameSync as renameSync4, rmSync as rmSync5, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync52, mkdirSync as mkdirSync8, readFileSync as readFileSync19, renameSync as renameSync4, rmSync as rmSync5, writeFileSync as writeFileSync11 } from "node:fs";
 import { dirname as dirname30 } from "node:path";
 var AGENT_DISPLAY2 = {
   claude: "Claude Code",
@@ -64781,7 +65072,7 @@ async function uninstallForAgent(agent, options2) {
     removed: 0,
     dryRun: Boolean(options2.dryRun)
   };
-  if (!existsSync51(location2.realPath)) {
+  if (!existsSync52(location2.realPath)) {
     return result;
   }
   let parsed;
@@ -65000,7 +65291,7 @@ async function installHook(options2) {
 // src/commands/hooks/status.ts
 init_takumi_config_manager();
 init_logger();
-import { existsSync as existsSync52, readFileSync as readFileSync20 } from "node:fs";
+import { existsSync as existsSync53, readFileSync as readFileSync20 } from "node:fs";
 var AGENT_DISPLAY4 = { claude: "Claude Code", codex: "Codex" };
 var NEW_SHAPE = /\bhook-exec\b.*--hook\s+(guard|session|convention|extension|metrics|perf)\.(\S+).*-a\s+(claude|codex)(?![\w-])/;
 var LEGACY_SHAPE = /\bhooks\s+(?:session-start|user-prompt-submit|pre-tool-use|post-tool-use|stop|session-end)\s+-a\s+(claude|codex)(?![\w-])/;
@@ -65030,7 +65321,7 @@ async function statusForAgent(agent, options2, cwd2 = process.cwd()) {
   const result = {
     agent,
     settingsPath: location2.realPath,
-    exists: existsSync52(location2.realPath),
+    exists: existsSync53(location2.realPath),
     shape: "none",
     byCategory: {},
     newEntryCount: 0,
@@ -65068,7 +65359,7 @@ function report(result) {
     logger.info(`[hooks] ${label}: no settings file at ${result.settingsPath}`);
     return;
   }
-  const categories = Object.entries(result.byCategory).sort(([a3], [b3]) => a3.localeCompare(b3)).map(([cat, n]) => `${cat}=${n}`).join(", ");
+  const categories = Object.entries(result.byCategory).sort(([a3], [b3]) => a3.localeCompare(b3)).map(([cat, n2]) => `${cat}=${n2}`).join(", ");
   const parts = [`shape=${result.shape}`, `${result.newEntryCount} hook-exec entries`];
   if (result.legacyEntryCount > 0)
     parts.push(`${result.legacyEntryCount} legacy entries`);
@@ -66402,7 +66693,7 @@ async function dispatchInstallers(ctx, targetAgents2, lifecycle) {
 init_logger();
 // src/domains/installation/download-extractor.ts
 init_auth_client();
-import * as fs29 from "node:fs";
+import * as fs30 from "node:fs";
 import * as path10 from "node:path";
 
 // src/domains/github/auth-prompt.ts
@@ -67233,18 +67524,18 @@ var D = class extends Ti {
     if (t === "close") {
       if (this[Ne] = true, !this[rt] && !this[w3])
         return false;
-      let n = super.emit("close");
-      return this.removeAllListeners("close"), n;
+      let n2 = super.emit("close");
+      return this.removeAllListeners("close"), n2;
     } else if (t === "error") {
       this[jt] = i, super.emit(Ri, i);
-      let n = !this[Jt] || this.listeners("error").length ? super.emit("error", i) : false;
-      return this[j2](), n;
+      let n2 = !this[Jt] || this.listeners("error").length ? super.emit("error", i) : false;
+      return this[j2](), n2;
     } else if (t === "resume") {
-      let n = super.emit("resume");
-      return this[j2](), n;
+      let n2 = super.emit("resume");
+      return this[j2](), n2;
     } else if (t === "finish" || t === "prefinish") {
-      let n = super.emit(t);
-      return this.removeAllListeners(t), n;
+      let n2 = super.emit(t);
+      return this.removeAllListeners(t), n2;
     }
     let r2 = super.emit(t, ...e2);
     return this[j2](), r2;
@@ -67302,15 +67593,15 @@ var D = class extends Ti {
         return Promise.resolve({ done: false, value: r2 });
       if (this[q3])
         return e2();
-      let n, o2, h2 = (d3) => {
+      let n2, o2, h2 = (d3) => {
         this.off("data", a3), this.off("end", l2), this.off(w3, c2), e2(), o2(d3);
       }, a3 = (d3) => {
-        this.off("error", h2), this.off("end", l2), this.off(w3, c2), this.pause(), n({ value: d3, done: !!this[q3] });
+        this.off("error", h2), this.off("end", l2), this.off(w3, c2), this.pause(), n2({ value: d3, done: !!this[q3] });
       }, l2 = () => {
-        this.off("error", h2), this.off("data", a3), this.off(w3, c2), e2(), n({ done: true, value: undefined });
+        this.off("error", h2), this.off("data", a3), this.off(w3, c2), e2(), n2({ done: true, value: undefined });
       }, c2 = () => h2(new Error("stream destroyed"));
       return new Promise((d3, S3) => {
-        o2 = S3, n = d3, this.once(w3, c2), this.once("error", h2), this.once("end", l2), this.once("data", a3);
+        o2 = S3, n2 = d3, this.once(w3, c2), this.once("error", h2), this.once("end", l2), this.once("data", a3);
       });
     }, throw: e2, return: e2, [Symbol.asyncIterator]() {
       return this;
@@ -67601,9 +67892,9 @@ var re2 = (s = {}) => {
   }
   return t.chmod === undefined && t.noChmod === false && (t.chmod = true), delete t.noChmod, t;
 };
-var K3 = (s, t, e2, i, r2) => Object.assign((n = [], o2, h2) => {
-  Array.isArray(n) && (o2 = n, n = {}), typeof o2 == "function" && (h2 = o2, o2 = undefined), o2 = o2 ? Array.from(o2) : [];
-  let a3 = re2(n);
+var K3 = (s, t, e2, i, r2) => Object.assign((n2 = [], o2, h2) => {
+  Array.isArray(n2) && (o2 = n2, n2 = {}), typeof o2 == "function" && (h2 = o2, o2 = undefined), o2 = o2 ? Array.from(o2) : [];
+  let a3 = re2(n2);
   if (r2?.(a3, o2), As(a3)) {
     if (typeof h2 == "function")
       throw new TypeError("callback not supported for sync tar functions");
@@ -67696,7 +67987,7 @@ var ne2 = class extends D {
     if (typeof e2 == "function" && (i = e2, e2 = "utf8"), typeof t == "string" && (t = gt.from(t, e2)), this.#t)
       return;
     Mi(this.#e, "zlib binding closed");
-    let r2 = this.#e._handle, n = r2.close;
+    let r2 = this.#e._handle, n2 = r2.close;
     r2.close = () => {};
     let o2 = this.#e.close;
     this.#e.close = () => {}, ki(true);
@@ -67707,7 +67998,7 @@ var ne2 = class extends D {
     } catch (l2) {
       ki(false), this.#o(new Gt(l2, this.write));
     } finally {
-      this.#e && (this.#e._handle = r2, r2.close = n, this.#e.close = o2, this.#e.removeAllListeners("error"));
+      this.#e && (this.#e._handle = r2, r2.close = n2, this.#e.close = o2, this.#e.removeAllListeners("error"));
     }
     this.#e && this.#e.on("error", (l2) => this.#o(new Gt(l2, this.write)));
     let a3;
@@ -67737,8 +68028,8 @@ var Be = class extends ne2 {
       if (this.#t !== t || this.#i !== e2) {
         this.flush(M3.Z_SYNC_FLUSH), Mi(this.handle, "zlib binding closed");
         let i = this.handle.flush;
-        this.handle.flush = (r2, n) => {
-          typeof r2 == "function" && (n = r2, r2 = this.flushFlag), this.flush(r2), n?.();
+        this.handle.flush = (r2, n2) => {
+          typeof r2 == "function" && (n2 = r2, r2 = this.flushFlag), this.flush(r2), n2?.();
         };
         try {
           this.handle.params(t, e2);
@@ -67825,8 +68116,8 @@ var Bs = (s) => {
 };
 var rn = (s) => {
   for (var t = s.length, e2 = 0, i = false, r2 = t - 1;r2 > -1; r2--) {
-    var n = Number(s[r2]), o2;
-    i ? o2 = Ps(n) : n === 0 ? o2 = n : (i = true, o2 = zs(n)), o2 !== 0 && (e2 -= o2 * Math.pow(256, t - r2 - 1));
+    var n2 = Number(s[r2]), o2;
+    i ? o2 = Ps(n2) : n2 === 0 ? o2 = n2 : (i = true, o2 = zs(n2)), o2 !== 0 && (e2 -= o2 * Math.pow(256, t - r2 - 1));
   }
   return e2;
 };
@@ -67874,8 +68165,8 @@ var F = class {
     if (e2 || (e2 = 0), !t || !(t.length >= e2 + 512))
       throw new Error("need 512 bytes for header");
     this.path = i?.path ?? Tt(t, e2, 100), this.mode = i?.mode ?? r2?.mode ?? at(t, e2 + 100, 8), this.uid = i?.uid ?? r2?.uid ?? at(t, e2 + 108, 8), this.gid = i?.gid ?? r2?.gid ?? at(t, e2 + 116, 8), this.size = i?.size ?? r2?.size ?? at(t, e2 + 124, 12), this.mtime = i?.mtime ?? r2?.mtime ?? Pi(t, e2 + 136, 12), this.cksum = at(t, e2 + 148, 12), r2 && this.#i(r2, true), i && this.#i(i);
-    let n = Tt(t, e2 + 156, 1);
-    if (oe2(n) && (this.#t = n || "0"), this.#t === "0" && this.path.slice(-1) === "/" && (this.#t = "5"), this.#t === "5" && (this.size = 0), this.linkpath = Tt(t, e2 + 157, 100), t.subarray(e2 + 257, e2 + 265).toString() === "ustar\x0000")
+    let n2 = Tt(t, e2 + 156, 1);
+    if (oe2(n2) && (this.#t = n2 || "0"), this.#t === "0" && this.path.slice(-1) === "/" && (this.#t = "5"), this.#t === "5" && (this.size = 0), this.linkpath = Tt(t, e2 + 157, 100), t.subarray(e2 + 257, e2 + 265).toString() === "ustar\x0000")
       if (this.uname = i?.uname ?? r2?.uname ?? Tt(t, e2 + 265, 32), this.gname = i?.gname ?? r2?.gname ?? Tt(t, e2 + 297, 32), this.devmaj = i?.devmaj ?? r2?.devmaj ?? at(t, e2 + 329, 8) ?? 0, this.devmin = i?.devmin ?? r2?.devmin ?? at(t, e2 + 337, 8) ?? 0, t[e2 + 475] !== 0) {
         let h2 = Tt(t, e2 + 345, 155);
         this.path = h2 + "/" + this.path;
@@ -67896,8 +68187,8 @@ var F = class {
   encode(t, e2 = 0) {
     if (t || (t = this.block = Buffer.alloc(512)), this.#t === "Unsupported" && (this.#t = "0"), !(t.length >= e2 + 512))
       throw new Error("need 512 bytes for header");
-    let i = this.ctime || this.atime ? 130 : 155, r2 = an(this.path || "", i), n = r2[0], o2 = r2[1];
-    this.needPax = !!r2[2], this.needPax = xt(t, e2, 100, n) || this.needPax, this.needPax = lt(t, e2 + 100, 8, this.mode) || this.needPax, this.needPax = lt(t, e2 + 108, 8, this.uid) || this.needPax, this.needPax = lt(t, e2 + 116, 8, this.gid) || this.needPax, this.needPax = lt(t, e2 + 124, 12, this.size) || this.needPax, this.needPax = zi(t, e2 + 136, 12, this.mtime) || this.needPax, t[e2 + 156] = Number(this.#t.codePointAt(0)), this.needPax = xt(t, e2 + 157, 100, this.linkpath) || this.needPax, t.write("ustar\x0000", e2 + 257, 8), this.needPax = xt(t, e2 + 265, 32, this.uname) || this.needPax, this.needPax = xt(t, e2 + 297, 32, this.gname) || this.needPax, this.needPax = lt(t, e2 + 329, 8, this.devmaj) || this.needPax, this.needPax = lt(t, e2 + 337, 8, this.devmin) || this.needPax, this.needPax = xt(t, e2 + 345, i, o2) || this.needPax, t[e2 + 475] !== 0 ? this.needPax = xt(t, e2 + 345, 155, o2) || this.needPax : (this.needPax = xt(t, e2 + 345, 130, o2) || this.needPax, this.needPax = zi(t, e2 + 476, 12, this.atime) || this.needPax, this.needPax = zi(t, e2 + 488, 12, this.ctime) || this.needPax);
+    let i = this.ctime || this.atime ? 130 : 155, r2 = an(this.path || "", i), n2 = r2[0], o2 = r2[1];
+    this.needPax = !!r2[2], this.needPax = xt(t, e2, 100, n2) || this.needPax, this.needPax = lt(t, e2 + 100, 8, this.mode) || this.needPax, this.needPax = lt(t, e2 + 108, 8, this.uid) || this.needPax, this.needPax = lt(t, e2 + 116, 8, this.gid) || this.needPax, this.needPax = lt(t, e2 + 124, 12, this.size) || this.needPax, this.needPax = zi(t, e2 + 136, 12, this.mtime) || this.needPax, t[e2 + 156] = Number(this.#t.codePointAt(0)), this.needPax = xt(t, e2 + 157, 100, this.linkpath) || this.needPax, t.write("ustar\x0000", e2 + 257, 8), this.needPax = xt(t, e2 + 265, 32, this.uname) || this.needPax, this.needPax = xt(t, e2 + 297, 32, this.gname) || this.needPax, this.needPax = lt(t, e2 + 329, 8, this.devmaj) || this.needPax, this.needPax = lt(t, e2 + 337, 8, this.devmin) || this.needPax, this.needPax = xt(t, e2 + 345, i, o2) || this.needPax, t[e2 + 475] !== 0 ? this.needPax = xt(t, e2 + 345, 155, o2) || this.needPax : (this.needPax = xt(t, e2 + 345, 130, o2) || this.needPax, this.needPax = zi(t, e2 + 476, 12, this.atime) || this.needPax, this.needPax = zi(t, e2 + 488, 12, this.ctime) || this.needPax);
     let h2 = 256;
     for (let a3 = e2;a3 < e2 + 148; a3++)
       h2 += t[a3];
@@ -67922,17 +68213,17 @@ var F = class {
   }
 };
 var an = (s, t) => {
-  let i = s, r2 = "", n, o2 = Zt.parse(s).root || ".";
+  let i = s, r2 = "", n2, o2 = Zt.parse(s).root || ".";
   if (Buffer.byteLength(i) < 100)
-    n = [i, r2, false];
+    n2 = [i, r2, false];
   else {
     r2 = Zt.dirname(i), i = Zt.basename(i);
     do
-      Buffer.byteLength(i) <= 100 && Buffer.byteLength(r2) <= t ? n = [i, r2, false] : Buffer.byteLength(i) > 100 && Buffer.byteLength(r2) <= t ? n = [i.slice(0, 99), r2, true] : (i = Zt.join(Zt.basename(r2), i), r2 = Zt.dirname(r2));
-    while (r2 !== o2 && n === undefined);
-    n || (n = [s.slice(0, 99), "", true]);
+      Buffer.byteLength(i) <= 100 && Buffer.byteLength(r2) <= t ? n2 = [i, r2, false] : Buffer.byteLength(i) > 100 && Buffer.byteLength(r2) <= t ? n2 = [i.slice(0, 99), r2, true] : (i = Zt.join(Zt.basename(r2), i), r2 = Zt.dirname(r2));
+    while (r2 !== o2 && n2 === undefined);
+    n2 || (n2 = [s.slice(0, 99), "", true]);
   }
-  return n;
+  return n2;
 };
 var Tt = (s, t, e2) => s.subarray(t, t + e2).toString("utf8").replace(/\0.*/, "");
 var Pi = (s, t, e2) => ln(at(s, t, e2));
@@ -67974,11 +68265,11 @@ var ct = class s {
     if (t === "")
       return Buffer.allocUnsafe(0);
     let e2 = Buffer.byteLength(t), i = 512 * Math.ceil(1 + e2 / 512), r2 = Buffer.allocUnsafe(i);
-    for (let n = 0;n < 512; n++)
-      r2[n] = 0;
+    for (let n2 = 0;n2 < 512; n2++)
+      r2[n2] = 0;
     new F({ path: ("PaxHeader/" + wn(this.path ?? "")).slice(0, 99), mode: this.mode || 420, uid: this.uid, gid: this.gid, size: e2, mtime: this.mtime, type: this.global ? "GlobalExtendedHeader" : "ExtendedHeader", linkpath: "", uname: this.uname || "", gname: this.gname || "", devmaj: 0, devmin: 0, atime: this.atime, ctime: this.ctime }).encode(r2), r2.write(t, 512, e2, "utf8");
-    for (let n = e2 + 512;n < r2.length; n++)
-      r2[n] = 0;
+    for (let n2 = e2 + 512;n2 < r2.length; n2++)
+      r2[n2] = 0;
     return r2;
   }
   encodeBody() {
@@ -67988,8 +68279,8 @@ var ct = class s {
     if (this[t] === undefined)
       return "";
     let e2 = this[t], i = e2 instanceof Date ? e2.getTime() / 1000 : e2, r2 = " " + (t === "dev" || t === "ino" || t === "nlink" ? "SCHILY." : "") + t + "=" + i + `
-`, n = Buffer.byteLength(r2), o2 = Math.floor(Math.log(n) / Math.log(10)) + 1;
-    return n + o2 >= Math.pow(10, o2) && (o2 += 1), o2 + n + r2;
+`, n2 = Buffer.byteLength(r2), o2 = Math.floor(Math.log(n2) / Math.log(10)) + 1;
+    return n2 + o2 >= Math.pow(10, o2) && (o2 += 1), o2 + n2 + r2;
   }
   static parse(t, e2, i = false) {
     return new s(Sn(yn(t), e2), i);
@@ -68006,8 +68297,8 @@ var Rn = (s2, t) => {
   let i = t.split("="), r2 = i.shift();
   if (!r2)
     return s2;
-  let n = r2.replace(/^SCHILY\.(dev|ino|nlink)/, "$1"), o2 = i.join("=");
-  return s2[n] = /^([A-Z]+\.)?([mac]|birth|creation)time$/.test(n) ? new Date(Number(o2) * 1000) : /^[0-9]+$/.test(o2) ? +o2 : o2, s2;
+  let n2 = r2.replace(/^SCHILY\.(dev|ino|nlink)/, "$1"), o2 = i.join("=");
+  return s2[n2] = /^([A-Z]+\.)?([mac]|birth|creation)time$/.test(n2) ? new Date(Number(o2) * 1000) : /^[0-9]+$/.test(o2) ? +o2 : o2, s2;
 };
 var bn = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
 var f3 = bn !== "win32" ? (s2) => s2 : (s2) => s2 && s2.replaceAll(/\\/g, "/");
@@ -68176,16 +68467,16 @@ var st = class extends _n {
       else if (!/^(Symbolic)?Link$/.test(r2) && !/^(Global)?ExtendedHeader$/.test(r2) && i.linkpath)
         this.warn("TAR_ENTRY_INVALID", "linkpath forbidden", { header: i });
       else {
-        let n = this[Nt] = new Yt(i, this[V2], this[ae2]);
+        let n2 = this[Nt] = new Yt(i, this[V2], this[ae2]);
         if (!this[Dt])
-          if (n.remain) {
+          if (n2.remain) {
             let o2 = () => {
-              n.invalid || (this[Dt] = true);
+              n2.invalid || (this[Dt] = true);
             };
-            n.on("end", o2);
+            n2.on("end", o2);
           } else
             this[Dt] = true;
-        n.meta ? n.size > this.maxMetaEntrySize ? (n.ignore = true, this[At]("ignoredEntry", n), this[B2] = "ignore", n.resume()) : n.size > 0 && (this[ft] = "", n.on("data", (o2) => this[ft] += o2), this[B2] = "meta") : (this[V2] = undefined, n.ignore = n.ignore || !this.filter(n.path, n), n.ignore ? (this[At]("ignoredEntry", n), this[B2] = n.remain ? "ignore" : "header", n.resume()) : (n.remain ? this[B2] = "body" : (this[B2] = "header", n.end()), this[et] ? this[it].push(n) : (this[it].push(n), this[Ui]())));
+        n2.meta ? n2.size > this.maxMetaEntrySize ? (n2.ignore = true, this[At]("ignoredEntry", n2), this[B2] = "ignore", n2.resume()) : n2.size > 0 && (this[ft] = "", n2.on("data", (o2) => this[ft] += o2), this[B2] = "meta") : (this[V2] = undefined, n2.ignore = n2.ignore || !this.filter(n2.path, n2), n2.ignore ? (this[At]("ignoredEntry", n2), this[B2] = n2.remain ? "ignore" : "header", n2.resume()) : (n2.remain ? this[B2] = "body" : (this[B2] = "header", n2.end()), this[et] ? this[it].push(n2) : (this[it].push(n2), this[Ui]())));
       }
     }
   }
@@ -68216,8 +68507,8 @@ var st = class extends _n {
     let i = this[Nt];
     if (!i)
       throw new Error("attempt to consume body without entry??");
-    let r2 = i.blockRemain ?? 0, n = r2 >= t.length && e2 === 0 ? t : t.subarray(e2, e2 + r2);
-    return i.write(n), i.blockRemain || (this[B2] = "header", this[Nt] = undefined, i.end()), n.length;
+    let r2 = i.blockRemain ?? 0, n2 = r2 >= t.length && e2 === 0 ? t : t.subarray(e2, e2 + r2);
+    return i.write(n2), i.blockRemain || (this[B2] = "header", this[Nt] = undefined, i.end()), n2.length;
   }
   [Ws](t, e2) {
     let i = this[Nt], r2 = this[Wi](t, e2);
@@ -68293,8 +68584,8 @@ var st = class extends _n {
       }
     }
     this[Kt] = true, this[y3] ? this[y3].write(t) : this[Ve](t), this[Kt] = false;
-    let n = this[it].length > 0 ? false : this[et] ? this[et].flowing : true;
-    return !n && this[it].length === 0 && this[et]?.once("drain", () => this.emit("drain")), i?.(), n;
+    let n2 = this[it].length > 0 ? false : this[et] ? this[et].flowing : true;
+    return !n2 && this[it].length === 0 && this[et]?.once("drain", () => this.emit("drain")), i?.(), n2;
   }
   [Gi](t) {
     t && !this[ut] && (this[p] = this[p] ? Buffer.concat([this[p], t]) : t);
@@ -68367,30 +68658,30 @@ var Nn = (s2) => {
   } : (e2) => e2.resume();
 };
 var Ki = (s2, t) => {
-  let e2 = new Map(t.map((n) => [mt(n), true])), i = s2.filter, r2 = (n, o2 = "") => {
-    let h2 = o2 || Ln(n).root || ".", a3;
-    if (n === h2)
+  let e2 = new Map(t.map((n2) => [mt(n2), true])), i = s2.filter, r2 = (n2, o2 = "") => {
+    let h2 = o2 || Ln(n2).root || ".", a3;
+    if (n2 === h2)
       a3 = false;
     else {
-      let l2 = e2.get(n);
-      a3 = l2 !== undefined ? l2 : r2(xn(n), h2);
+      let l2 = e2.get(n2);
+      a3 = l2 !== undefined ? l2 : r2(xn(n2), h2);
     }
-    return e2.set(n, a3), a3;
+    return e2.set(n2, a3), a3;
   };
-  s2.filter = i ? (n, o2) => i(n, o2) && r2(mt(n)) : (n) => r2(mt(n));
+  s2.filter = i ? (n2, o2) => i(n2, o2) && r2(mt(n2)) : (n2) => r2(mt(n2));
 };
 var An = (s2) => {
   let t = new st(s2), e2 = s2.file, i;
   try {
     i = Vt.openSync(e2, "r");
-    let r2 = Vt.fstatSync(i), n = s2.maxReadSize || 16 * 1024 * 1024;
-    if (r2.size < n) {
+    let r2 = Vt.fstatSync(i), n2 = s2.maxReadSize || 16 * 1024 * 1024;
+    if (r2.size < n2) {
       let o2 = Buffer.allocUnsafe(r2.size), h2 = Vt.readSync(i, o2, 0, r2.size, 0);
       t.end(h2 === o2.byteLength ? o2 : o2.subarray(0, h2));
     } else {
-      let o2 = 0, h2 = Buffer.allocUnsafe(n);
+      let o2 = 0, h2 = Buffer.allocUnsafe(n2);
       for (;o2 < r2.size; ) {
-        let a3 = Vt.readSync(i, h2, 0, n, o2);
+        let a3 = Vt.readSync(i, h2, 0, n2, o2);
         if (a3 === 0)
           break;
         o2 += a3, t.write(h2.subarray(0, a3));
@@ -68496,8 +68787,8 @@ var de2 = class extends D {
       o2 && typeof h2 == "string" && (this.path = h2, r2 = o2);
     }
     this.win32 = !!i.win32 || process.platform === "win32", this.win32 && (this.path = Ks(this.path.replaceAll(/\\/g, "/")), t = t.replaceAll(/\\/g, "/")), this.absolute = f3(i.absolute || $s.resolve(this.cwd, t)), this.path === "" && (this.path = "./"), r2 && this.warn("TAR_ENTRY_INFO", `stripping ${r2} from absolute path`, { entry: this, path: r2 + this.path });
-    let n = this.statCache.get(this.absolute);
-    n ? this[ei](n) : this[Qi]();
+    let n2 = this.statCache.get(this.absolute);
+    n2 ? this[ei](n2) : this[Qi]();
   }
   warn(t, e2, i = {}) {
     return Lt(this, t, e2, i);
@@ -68592,10 +68883,10 @@ var de2 = class extends D {
     this.buf = Buffer.allocUnsafe(e2), this.offset = 0, this.pos = 0, this.remain = this.stat.size, this.length = this.buf.length, this[ti]();
   }
   [ti]() {
-    let { fd: t, buf: e2, offset: i, length: r2, pos: n } = this;
+    let { fd: t, buf: e2, offset: i, length: r2, pos: n2 } = this;
     if (t === undefined || e2 === undefined)
       throw new Error("cannot read file without first opening");
-    $2.read(t, e2, i, r2, n, (o2, h2) => {
+    $2.read(t, e2, i, r2, n2, (o2, h2) => {
       if (o2)
         return this[pt](() => this.emit("error", o2));
       this[Ji](h2);
@@ -68653,10 +68944,10 @@ var si = class extends de2 {
   [ti]() {
     let t = true;
     try {
-      let { fd: e2, buf: i, offset: r2, length: n, pos: o2 } = this;
+      let { fd: e2, buf: i, offset: r2, length: n2, pos: o2 } = this;
       if (e2 === undefined || i === undefined)
         throw new Error("fd and buf must be set in READ method");
-      let h2 = $2.readSync(e2, i, r2, n, o2);
+      let h2 = $2.readSync(e2, i, r2, n2, o2);
       this[Ji](h2), t = false;
     } finally {
       if (t)
@@ -68710,12 +69001,12 @@ var ri = class extends D {
     if (r2 === "Unsupported")
       throw new Error("writing entry that should be ignored");
     this.type = r2, this.type === "Directory" && this.portable && (this.noMtime = true), this.prefix = i.prefix, this.path = f3(t.path), this.mode = t.mode !== undefined ? this[ii](t.mode) : undefined, this.uid = this.portable ? undefined : t.uid, this.gid = this.portable ? undefined : t.gid, this.uname = this.portable ? undefined : t.uname, this.gname = this.portable ? undefined : t.gname, this.size = t.size, this.mtime = this.noMtime ? undefined : i.mtime || t.mtime, this.atime = this.portable ? undefined : t.atime, this.ctime = this.portable ? undefined : t.ctime, this.linkpath = t.linkpath !== undefined ? f3(t.linkpath) : undefined, typeof i.onwarn == "function" && this.on("warn", i.onwarn);
-    let n = false;
+    let n2 = false;
     if (!this.preservePaths) {
       let [h2, a3] = ce2(this.path);
-      h2 && typeof a3 == "string" && (this.path = a3, n = h2);
+      h2 && typeof a3 == "string" && (this.path = a3, n2 = h2);
     }
-    this.remain = t.size, this.blockRemain = t.startBlockSize, this.onWriteEntry?.(this), this.header = new F({ path: this[X3](this.path), linkpath: this.type === "Link" && this.linkpath !== undefined ? this[X3](this.linkpath) : this.linkpath, mode: this.mode, uid: this.portable ? undefined : this.uid, gid: this.portable ? undefined : this.gid, size: this.size, mtime: this.noMtime ? undefined : this.mtime, type: this.type, uname: this.portable ? undefined : this.uname, atime: this.portable ? undefined : this.atime, ctime: this.portable ? undefined : this.ctime }), n && this.warn("TAR_ENTRY_INFO", `stripping ${n} from absolute path`, { entry: this, path: n + this.path }), this.header.encode() && !this.noPax && super.write(new ct({ atime: this.portable ? undefined : this.atime, ctime: this.portable ? undefined : this.ctime, gid: this.portable ? undefined : this.gid, mtime: this.noMtime ? undefined : this.mtime, path: this[X3](this.path), linkpath: this.type === "Link" && this.linkpath !== undefined ? this[X3](this.linkpath) : this.linkpath, size: this.size, uid: this.portable ? undefined : this.uid, uname: this.portable ? undefined : this.uname, dev: this.portable ? undefined : this.readEntry.dev, ino: this.portable ? undefined : this.readEntry.ino, nlink: this.portable ? undefined : this.readEntry.nlink }).encode());
+    this.remain = t.size, this.blockRemain = t.startBlockSize, this.onWriteEntry?.(this), this.header = new F({ path: this[X3](this.path), linkpath: this.type === "Link" && this.linkpath !== undefined ? this[X3](this.linkpath) : this.linkpath, mode: this.mode, uid: this.portable ? undefined : this.uid, gid: this.portable ? undefined : this.gid, size: this.size, mtime: this.noMtime ? undefined : this.mtime, type: this.type, uname: this.portable ? undefined : this.uname, atime: this.portable ? undefined : this.atime, ctime: this.portable ? undefined : this.ctime }), n2 && this.warn("TAR_ENTRY_INFO", `stripping ${n2} from absolute path`, { entry: this, path: n2 + this.path }), this.header.encode() && !this.noPax && super.write(new ct({ atime: this.portable ? undefined : this.atime, ctime: this.portable ? undefined : this.ctime, gid: this.portable ? undefined : this.gid, mtime: this.noMtime ? undefined : this.mtime, path: this[X3](this.path), linkpath: this.type === "Link" && this.linkpath !== undefined ? this[X3](this.linkpath) : this.linkpath, size: this.size, uid: this.portable ? undefined : this.uid, uname: this.portable ? undefined : this.uname, dev: this.portable ? undefined : this.readEntry.dev, ino: this.portable ? undefined : this.readEntry.ino, nlink: this.portable ? undefined : this.readEntry.nlink }).encode());
     let o2 = this.header?.block;
     if (!o2)
       throw new Error("failed to encode header");
@@ -68842,8 +69133,8 @@ var ni = class s2 {
       r2 = this.head.next, i = this.head.value;
     else
       throw new TypeError("Reduce of empty list with no initial value");
-    for (var n = 0;r2; n++)
-      i = t(i, r2.value, n), r2 = r2.next;
+    for (var n2 = 0;r2; n2++)
+      i = t(i, r2.value, n2), r2 = r2.next;
     return i;
   }
   reduceReverse(t, e2) {
@@ -68854,8 +69145,8 @@ var ni = class s2 {
       r2 = this.tail.prev, i = this.tail.value;
     else
       throw new TypeError("Reduce of empty list with no initial value");
-    for (let n = this.length - 1;r2; n--)
-      i = t(i, r2.value, n), r2 = r2.prev;
+    for (let n2 = this.length - 1;r2; n2--)
+      i = t(i, r2.value, n2), r2 = r2.prev;
     return i;
   }
   toArray() {
@@ -68876,10 +69167,10 @@ var ni = class s2 {
     if (e2 < t || e2 < 0)
       return i;
     t < 0 && (t = 0), e2 > this.length && (e2 = this.length);
-    let r2 = this.head, n = 0;
-    for (n = 0;r2 && n < t; n++)
+    let r2 = this.head, n2 = 0;
+    for (n2 = 0;r2 && n2 < t; n2++)
       r2 = r2.next;
-    for (;r2 && n < e2; n++, r2 = r2.next)
+    for (;r2 && n2 < e2; n2++, r2 = r2.next)
       i.push(r2.value);
     return i;
   }
@@ -68889,11 +69180,11 @@ var ni = class s2 {
     if (e2 < t || e2 < 0)
       return i;
     t < 0 && (t = 0), e2 > this.length && (e2 = this.length);
-    let r2 = this.length, n = this.tail;
-    for (;n && r2 > e2; r2--)
-      n = n.prev;
-    for (;n && r2 > t; r2--, n = n.prev)
-      i.push(n.value);
+    let r2 = this.length, n2 = this.tail;
+    for (;n2 && r2 > e2; r2--)
+      n2 = n2.prev;
+    for (;n2 && r2 > t; r2--, n2 = n2.prev)
+      i.push(n2.value);
     return i;
   }
   splice(t, e2 = 0, ...i) {
@@ -68901,13 +69192,13 @@ var ni = class s2 {
     let r2 = this.head;
     for (let o2 = 0;r2 && o2 < t; o2++)
       r2 = r2.next;
-    let n = [];
+    let n2 = [];
     for (let o2 = 0;r2 && o2 < e2; o2++)
-      n.push(r2.value), r2 = this.removeNode(r2);
+      n2.push(r2.value), r2 = this.removeNode(r2);
     r2 ? r2 !== this.tail && (r2 = r2.prev) : r2 = this.tail;
     for (let o2 of i)
       r2 = Bn(this, r2, o2);
-    return n;
+    return n2;
   }
   reverse() {
     let t = this.head, e2 = this.tail;
@@ -68919,8 +69210,8 @@ var ni = class s2 {
   }
 };
 function Bn(s3, t, e2) {
-  let i = t, r2 = t ? t.next : s3.head, n = new ue2(e2, i, r2, s3);
-  return n.next === undefined && (s3.tail = n), n.prev === undefined && (s3.head = n), s3.length++, n;
+  let i = t, r2 = t ? t.next : s3.head, n2 = new ue2(e2, i, r2, s3);
+  return n2.next === undefined && (s3.tail = n2), n2.prev === undefined && (s3.head = n2), s3.length++, n2;
 }
 function Pn(s3, t) {
   s3.tail = new ue2(t, s3.tail, undefined, s3), s3.head || (s3.head = s3.tail), s3.length++;
@@ -69115,7 +69406,7 @@ var Et = class extends D {
   }
   [li](t) {
     t.piped = true, t.readdir && t.readdir.forEach((r2) => {
-      let n = t.path, o2 = n === "./" ? "" : n.replace(/\/*$/, "/");
+      let n2 = t.path, o2 = n2 === "./" ? "" : n2.replace(/\/*$/, "/");
       this[hi](o2 + r2);
     });
     let e2 = t.entry, i = this.zip;
@@ -69151,7 +69442,7 @@ var kt = class extends Et {
   [li](t) {
     let e2 = t.entry, i = this.zip;
     if (t.readdir && t.readdir.forEach((r2) => {
-      let n = t.path, o2 = n === "./" ? "" : n.replace(/\/*$/, "/");
+      let n2 = t.path, o2 = n2 === "./" ? "" : n2.replace(/\/*$/, "/");
       this[hi](o2 + r2);
     }), !e2)
       throw new Error("Cannot pipe without source");
@@ -69169,10 +69460,10 @@ var Un = (s3, t) => {
 var Hn = (s3, t) => {
   let e2 = new Et(s3), i = new tt(s3.file, { mode: s3.mode || 438 });
   e2.pipe(i);
-  let r2 = new Promise((n, o2) => {
-    i.on("error", o2), i.on("close", n), e2.on("error", o2);
+  let r2 = new Promise((n2, o2) => {
+    i.on("error", o2), i.on("close", n2), e2.on("error", o2);
   });
-  return hr(e2, t).catch((n) => e2.emit("error", n)), r2;
+  return hr(e2, t).catch((n2) => e2.emit("error", n2)), r2;
 };
 var or = (s3, t) => {
   t.forEach((e2) => {
@@ -69207,7 +69498,7 @@ var Vn = 512 * 1024;
 var $n = pr | ur | dr | mr;
 var lr = !fr && typeof ar == "number" ? ar | ur | dr | mr : null;
 var cs = lr !== null ? () => lr : Kn ? (s3) => s3 < Vn ? $n : "w" : () => "w";
-var fs28 = (s3, t, e2) => {
+var fs29 = (s3, t, e2) => {
   try {
     return mi.lchownSync(s3, t, e2);
   } catch (i) {
@@ -69222,28 +69513,28 @@ var ui = (s3, t, e2, i) => {
 };
 var Xn = (s3, t, e2, i, r2) => {
   if (t.isDirectory())
-    ds(Ee.resolve(s3, t.name), e2, i, (n) => {
-      if (n)
-        return r2(n);
+    ds(Ee.resolve(s3, t.name), e2, i, (n2) => {
+      if (n2)
+        return r2(n2);
       let o2 = Ee.resolve(s3, t.name);
       ui(o2, e2, i, r2);
     });
   else {
-    let n = Ee.resolve(s3, t.name);
-    ui(n, e2, i, r2);
+    let n2 = Ee.resolve(s3, t.name);
+    ui(n2, e2, i, r2);
   }
 };
 var ds = (s3, t, e2, i) => {
-  mi.readdir(s3, { withFileTypes: true }, (r2, n) => {
+  mi.readdir(s3, { withFileTypes: true }, (r2, n2) => {
     if (r2) {
       if (r2.code === "ENOENT")
         return i();
       if (r2.code !== "ENOTDIR" && r2.code !== "ENOTSUP")
         return i(r2);
     }
-    if (r2 || !n.length)
+    if (r2 || !n2.length)
       return ui(s3, t, e2, i);
-    let o2 = n.length, h2 = null, a3 = (l2) => {
+    let o2 = n2.length, h2 = null, a3 = (l2) => {
       if (!h2) {
         if (l2)
           return i(h2 = l2);
@@ -69251,28 +69542,28 @@ var ds = (s3, t, e2, i) => {
           return ui(s3, t, e2, i);
       }
     };
-    for (let l2 of n)
+    for (let l2 of n2)
       Xn(s3, l2, t, e2, a3);
   });
 };
 var qn = (s3, t, e2, i) => {
-  t.isDirectory() && us(Ee.resolve(s3, t.name), e2, i), fs28(Ee.resolve(s3, t.name), e2, i);
+  t.isDirectory() && us(Ee.resolve(s3, t.name), e2, i), fs29(Ee.resolve(s3, t.name), e2, i);
 };
 var us = (s3, t, e2) => {
   let i;
   try {
     i = mi.readdirSync(s3, { withFileTypes: true });
   } catch (r2) {
-    let n = r2;
-    if (n?.code === "ENOENT")
+    let n2 = r2;
+    if (n2?.code === "ENOENT")
       return;
-    if (n?.code === "ENOTDIR" || n?.code === "ENOTSUP")
-      return fs28(s3, t, e2);
-    throw n;
+    if (n2?.code === "ENOTDIR" || n2?.code === "ENOTSUP")
+      return fs29(s3, t, e2);
+    throw n2;
   }
   for (let r2 of i)
     qn(s3, r2, t, e2);
-  return fs28(s3, t, e2);
+  return fs29(s3, t, e2);
 };
 var we = class extends Error {
   path;
@@ -69304,8 +69595,8 @@ var Qn = (s3, t) => {
 };
 var Er = (s3, t, e2) => {
   s3 = f3(s3);
-  let i = t.umask ?? 18, r2 = t.mode | 448, n = (r2 & i) !== 0, o2 = t.uid, h2 = t.gid, a3 = typeof o2 == "number" && typeof h2 == "number" && (o2 !== t.processUid || h2 !== t.processGid), l2 = t.preserve, c2 = t.unlink, d3 = f3(t.cwd), S3 = (E2, x3) => {
-    E2 ? e2(E2) : x3 && a3 ? ds(x3, o2, h2, (xe) => S3(xe)) : n ? k2.chmod(s3, r2, e2) : e2();
+  let i = t.umask ?? 18, r2 = t.mode | 448, n2 = (r2 & i) !== 0, o2 = t.uid, h2 = t.gid, a3 = typeof o2 == "number" && typeof h2 == "number" && (o2 !== t.processUid || h2 !== t.processGid), l2 = t.preserve, c2 = t.unlink, d3 = f3(t.cwd), S3 = (E2, x3) => {
+    E2 ? e2(E2) : x3 && a3 ? ds(x3, o2, h2, (xe) => S3(xe)) : n2 ? k2.chmod(s3, r2, e2) : e2();
   };
   if (s3 === d3)
     return Qn(s3, S3);
@@ -69314,30 +69605,30 @@ var Er = (s3, t, e2) => {
   let N2 = f3(pi.relative(d3, s3)).split("/");
   ms(d3, N2, r2, c2, d3, undefined, S3);
 };
-var ms = (s3, t, e2, i, r2, n, o2) => {
+var ms = (s3, t, e2, i, r2, n2, o2) => {
   if (t.length === 0)
-    return o2(null, n);
+    return o2(null, n2);
   let h2 = t.shift(), a3 = f3(pi.resolve(s3 + "/" + h2));
-  k2.mkdir(a3, e2, wr(a3, t, e2, i, r2, n, o2));
+  k2.mkdir(a3, e2, wr(a3, t, e2, i, r2, n2, o2));
 };
-var wr = (s3, t, e2, i, r2, n, o2) => (h2) => {
+var wr = (s3, t, e2, i, r2, n2, o2) => (h2) => {
   h2 ? k2.lstat(s3, (a3, l2) => {
     if (a3)
       a3.path = a3.path && f3(a3.path), o2(a3);
     else if (l2.isDirectory())
-      ms(s3, t, e2, i, r2, n, o2);
+      ms(s3, t, e2, i, r2, n2, o2);
     else if (i)
       k2.unlink(s3, (c2) => {
         if (c2)
           return o2(c2);
-        k2.mkdir(s3, e2, wr(s3, t, e2, i, r2, n, o2));
+        k2.mkdir(s3, e2, wr(s3, t, e2, i, r2, n2, o2));
       });
     else {
       if (l2.isSymbolicLink())
         return o2(new wt(s3, s3 + "/" + t.join("/")));
       o2(h2);
     }
-  }) : (n = n || s3, ms(s3, t, e2, i, r2, n, o2));
+  }) : (n2 = n2 || s3, ms(s3, t, e2, i, r2, n2, o2));
 };
 var Jn = (s3) => {
   let t = false, e2;
@@ -69352,8 +69643,8 @@ var Jn = (s3) => {
 };
 var Sr = (s3, t) => {
   s3 = f3(s3);
-  let e2 = t.umask ?? 18, i = t.mode | 448, r2 = (i & e2) !== 0, n = t.uid, o2 = t.gid, h2 = typeof n == "number" && typeof o2 == "number" && (n !== t.processUid || o2 !== t.processGid), a3 = t.preserve, l2 = t.unlink, c2 = f3(t.cwd), d3 = (E2) => {
-    E2 && h2 && us(E2, n, o2), r2 && k2.chmodSync(s3, i);
+  let e2 = t.umask ?? 18, i = t.mode | 448, r2 = (i & e2) !== 0, n2 = t.uid, o2 = t.gid, h2 = typeof n2 == "number" && typeof o2 == "number" && (n2 !== t.processUid || o2 !== t.processGid), a3 = t.preserve, l2 = t.unlink, c2 = f3(t.cwd), d3 = (E2) => {
+    E2 && h2 && us(E2, n2, o2), r2 && k2.chmodSync(s3, i);
   };
   if (s3 === c2)
     return Jn(c2), d3();
@@ -69402,19 +69693,19 @@ var Ei = class {
   #s = new Set;
   reserve(t, e2) {
     t = eo ? ["win32 parallelization disabled"] : t.map((r2) => mt(br(Rr(r2))));
-    let i = new Set(t.map((r2) => io(r2)).reduce((r2, n) => r2.concat(n)));
+    let i = new Set(t.map((r2) => io(r2)).reduce((r2, n2) => r2.concat(n2)));
     this.#i.set(e2, { dirs: i, paths: t });
     for (let r2 of t) {
-      let n = this.#t.get(r2);
-      n ? n.push(e2) : this.#t.set(r2, [e2]);
+      let n2 = this.#t.get(r2);
+      n2 ? n2.push(e2) : this.#t.set(r2, [e2]);
     }
     for (let r2 of i) {
-      let n = this.#t.get(r2);
-      if (!n)
+      let n2 = this.#t.get(r2);
+      if (!n2)
         this.#t.set(r2, [new Set([e2])]);
       else {
-        let o2 = n.at(-1);
-        o2 instanceof Set ? o2.add(e2) : n.push(new Set([e2]));
+        let o2 = n2.at(-1);
+        o2 instanceof Set ? o2.add(e2) : n2.push(new Set([e2]));
       }
     }
     return this.#r(e2);
@@ -69438,7 +69729,7 @@ var Ei = class {
     let e2 = this.#i.get(t);
     if (!e2)
       throw new Error("invalid reservation");
-    let { paths: i, dirs: r2 } = e2, n = new Set;
+    let { paths: i, dirs: r2 } = e2, n2 = new Set;
     for (let o2 of i) {
       let h2 = this.#t.get(o2);
       if (!h2 || h2?.[0] !== t)
@@ -69449,10 +69740,10 @@ var Ei = class {
         continue;
       }
       if (h2.shift(), typeof a3 == "function")
-        n.add(a3);
+        n2.add(a3);
       else
         for (let l2 of a3)
-          n.add(l2);
+          n2.add(l2);
     }
     for (let o2 of r2) {
       let h2 = this.#t.get(o2), a3 = h2?.[0];
@@ -69463,11 +69754,11 @@ var Ei = class {
         } else if (a3.size === 1) {
           h2.shift();
           let l2 = h2[0];
-          typeof l2 == "function" && n.add(l2);
+          typeof l2 == "function" && n2.add(l2);
         } else
           a3.delete(t);
     }
-    return this.#s.delete(t), n.forEach((o2) => this.#r(o2)), true;
+    return this.#s.delete(t), n2.forEach((o2) => this.#r(o2)), true;
   }
 };
 var _r = () => process.umask();
@@ -69569,7 +69860,7 @@ var qt = class extends st {
     let i = t[e2], { type: r2 } = t;
     if (!i || this.preservePaths)
       return true;
-    let [n, o2] = ce2(i), h2 = o2.replaceAll(/\\/g, "/").split("/");
+    let [n2, o2] = ce2(i), h2 = o2.replaceAll(/\\/g, "/").split("/");
     if (h2.includes("..") || Oe && /^[a-z]:\.\.$/i.test(h2[0] ?? "")) {
       if (e2 === "path" || r2 === "Link")
         return this.warn("TAR_ENTRY_ERROR", `${e2} contains '..'`, { entry: t, [e2]: i }), false;
@@ -69577,7 +69868,7 @@ var qt = class extends st {
       if (l2.startsWith("../") || l2 === "..")
         return this.warn("TAR_ENTRY_ERROR", `${e2} escapes extraction directory`, { entry: t, [e2]: i }), false;
     }
-    return n && (t[e2] = String(o2), this.warn("TAR_ENTRY_INFO", `stripping ${n} from absolute ${e2}`, { entry: t, [e2]: i })), true;
+    return n2 && (t[e2] = String(o2), this.warn("TAR_ENTRY_INFO", `stripping ${n2} from absolute ${e2}`, { entry: t, [e2]: i })), true;
   }
   [Nr](t) {
     let e2 = f3(t.path), i = e2.split("/");
@@ -69604,8 +69895,8 @@ var qt = class extends st {
     if (this.win32) {
       let { root: r2 } = R3.win32.parse(String(t.absolute));
       t.absolute = r2 + Xi(String(t.absolute).slice(r2.length));
-      let { root: n } = R3.win32.parse(t.path);
-      t.path = n + Xi(t.path.slice(n.length));
+      let { root: n2 } = R3.win32.parse(t.path);
+      t.path = n2 + Xi(t.path.slice(n2.length));
     }
     return true;
   }
@@ -69646,24 +69937,24 @@ var qt = class extends st {
     r2.on("error", (a3) => {
       r2.fd && u.close(r2.fd, () => {}), r2.write = () => true, this[O2](a3, t), e2();
     });
-    let n = 1, o2 = (a3) => {
+    let n2 = 1, o2 = (a3) => {
       if (a3) {
         r2.fd && u.close(r2.fd, () => {}), this[O2](a3, t), e2();
         return;
       }
-      --n === 0 && r2.fd !== undefined && u.close(r2.fd, (l2) => {
+      --n2 === 0 && r2.fd !== undefined && u.close(r2.fd, (l2) => {
         l2 ? this[O2](l2, t) : this[Xt](), e2();
       });
     };
     r2.on("finish", () => {
       let a3 = String(t.absolute), l2 = r2.fd;
       if (typeof l2 == "number" && t.mtime && !this.noMtime) {
-        n++;
+        n2++;
         let c2 = t.atime || new Date, d3 = t.mtime;
         u.futimes(l2, c2, d3, (S3) => S3 ? u.utimes(a3, c2, d3, (T3) => o2(T3 && S3)) : o2());
       }
       if (typeof l2 == "number" && this[Re](t)) {
-        n++;
+        n2++;
         let c2 = this[be](t), d3 = this[_e](t);
         typeof c2 == "number" && typeof d3 == "number" && u.fchown(l2, c2, d3, (S3) => S3 ? u.chown(a3, c2, d3, (T3) => o2(T3 && S3)) : o2());
       }
@@ -69681,10 +69972,10 @@ var qt = class extends st {
         this[O2](r2, t), e2();
         return;
       }
-      let n = 1, o2 = () => {
-        --n === 0 && (e2(), this[Xt](), t.resume());
+      let n2 = 1, o2 = () => {
+        --n2 === 0 && (e2(), this[Xt](), t.resume());
       };
-      t.mtime && !this.noMtime && (n++, u.utimes(String(t.absolute), t.atime || new Date, t.mtime, o2)), this[Re](t) && (n++, u.chown(String(t.absolute), Number(this[be](t)), Number(this[_e](t)), o2)), o2();
+      t.mtime && !this.noMtime && (n2++, u.utimes(String(t.absolute), t.atime || new Date, t.mtime, o2)), this[Re](t) && (n2++, u.chown(String(t.absolute), Number(this[be](t)), Number(this[_e](t)), o2)), o2();
     });
   }
   [Lr](t) {
@@ -69698,11 +69989,11 @@ var qt = class extends st {
   }
   [xr](t, e2) {
     let i = f3(R3.resolve(this.cwd, String(t.linkpath))), r2 = f3(String(t.linkpath)).split("/");
-    this[ye](t, this.cwd, r2, () => this[Si](t, i, "link", e2), (n) => {
-      this[O2](n, t), e2();
+    this[ye](t, this.cwd, r2, () => this[Si](t, i, "link", e2), (n2) => {
+      this[O2](n2, t), e2();
     });
   }
-  [ye](t, e2, i, r2, n) {
+  [ye](t, e2, i, r2, n2) {
     let o2 = i.shift();
     if (this.preservePaths || o2 === undefined)
       return r2();
@@ -69711,8 +70002,8 @@ var qt = class extends st {
       if (a3)
         return r2();
       if (l2?.isSymbolicLink())
-        return n(new wt(h2, R3.resolve(h2, i.join("/"))));
-      this[ye](t, h2, i, r2, n);
+        return n2(new wt(h2, R3.resolve(h2, i.join("/"))));
+      this[ye](t, h2, i, r2, n2);
     });
   }
   [Ar]() {
@@ -69741,9 +70032,9 @@ var qt = class extends st {
           this[O2](h2, t), i();
           return;
         }
-        this[ge] = true, n();
+        this[ge] = true, n2();
       });
-    }, n = () => {
+    }, n2 = () => {
       if (t.absolute !== this.cwd) {
         let h2 = f3(R3.dirname(String(t.absolute)));
         if (h2 !== this.cwd)
@@ -69777,7 +70068,7 @@ var qt = class extends st {
         oo(String(t.absolute), (l2) => this[P2](l2 ?? null, t, i));
       });
     };
-    this[ge] ? n() : r2();
+    this[ge] ? n2() : r2();
   }
   [P2](t, e2, i) {
     if (t) {
@@ -69799,8 +70090,8 @@ var qt = class extends st {
     }
   }
   [Si](t, e2, i, r2) {
-    u[i](e2, String(t.absolute), (n) => {
-      n ? this[O2](n, t) : (this[Xt](), t.resume()), r2();
+    u[i](e2, String(t.absolute), (n2) => {
+      n2 ? this[O2](n2, t) : (this[Xt](), t.resume()), r2();
     });
   }
 };
@@ -69818,15 +70109,15 @@ var Te = class extends qt {
   }
   [ys](t) {
     if (!this[ge]) {
-      let n = this[St](this.cwd, this.dmode);
-      if (n)
-        return this[O2](n, t);
+      let n2 = this[St](this.cwd, this.dmode);
+      if (n2)
+        return this[O2](n2, t);
       this[ge] = true;
     }
     if (t.absolute !== this.cwd) {
-      let n = f3(R3.dirname(String(t.absolute)));
-      if (n !== this.cwd) {
-        let o2 = this[St](n, this.dmode);
+      let n2 = f3(R3.dirname(String(t.absolute)));
+      if (n2 !== this.cwd) {
+        let o2 = this[St](n2, this.dmode);
         if (o2)
           return this[O2](o2, t);
       }
@@ -69843,8 +70134,8 @@ var Te = class extends qt {
         }) : [];
         return this[P2](h2, t);
       }
-      let [n] = Se(() => u.rmdirSync(String(t.absolute)));
-      this[P2](n, t);
+      let [n2] = Se(() => u.rmdirSync(String(t.absolute)));
+      this[P2](n2, t);
     }
     let [r2] = t.absolute === this.cwd ? [] : Se(() => ho(String(t.absolute)));
     this[P2](r2, t);
@@ -69853,21 +70144,21 @@ var Te = class extends qt {
     let i = typeof t.mode == "number" ? t.mode & 4095 : this.fmode, r2 = (h2) => {
       let a3;
       try {
-        u.closeSync(n);
+        u.closeSync(n2);
       } catch (l2) {
         a3 = l2;
       }
       (h2 || a3) && this[O2](h2 || a3, t), e2();
-    }, n;
+    }, n2;
     try {
-      n = u.openSync(String(t.absolute), cs(t.size), i);
+      n2 = u.openSync(String(t.absolute), cs(t.size), i);
     } catch (h2) {
       return r2(h2);
     }
     let o2 = this.transform && this.transform(t) || t;
     o2 !== t && (o2.on("error", (h2) => this[O2](h2, t)), t.pipe(o2)), o2.on("data", (h2) => {
       try {
-        u.writeSync(n, h2, 0, h2.length);
+        u.writeSync(n2, h2, 0, h2.length);
       } catch (a3) {
         r2(a3);
       }
@@ -69876,7 +70167,7 @@ var Te = class extends qt {
       if (t.mtime && !this.noMtime) {
         let a3 = t.atime || new Date, l2 = t.mtime;
         try {
-          u.futimesSync(n, a3, l2);
+          u.futimesSync(n2, a3, l2);
         } catch (c2) {
           try {
             u.utimesSync(String(t.absolute), a3, l2);
@@ -69888,7 +70179,7 @@ var Te = class extends qt {
       if (this[Re](t)) {
         let a3 = this[be](t), l2 = this[_e](t);
         try {
-          u.fchownSync(n, Number(a3), Number(l2));
+          u.fchownSync(n2, Number(a3), Number(l2));
         } catch (c2) {
           try {
             u.chownSync(String(t.absolute), Number(a3), Number(l2));
@@ -69923,7 +70214,7 @@ var Te = class extends qt {
       return i;
     }
   }
-  [ye](t, e2, i, r2, n) {
+  [ye](t, e2, i, r2, n2) {
     if (this.preservePaths || i.length === 0)
       return r2();
     let o2 = e2;
@@ -69933,14 +70224,14 @@ var Te = class extends qt {
       if (a3)
         return r2();
       if (l2.isSymbolicLink())
-        return n(new wt(o2, R3.resolve(e2, i.join("/"))));
+        return n2(new wt(o2, R3.resolve(e2, i.join("/"))));
     }
     r2();
   }
   [Si](t, e2, i, r2) {
-    let n = `${i}Sync`;
+    let n2 = `${i}Sync`;
     try {
-      u[n](e2, String(t.absolute)), r2(), t.resume();
+      u[n2](e2, String(t.absolute)), r2(), t.resume();
     } catch (o2) {
       return this[O2](o2, t);
     }
@@ -69967,7 +70258,7 @@ var co = K3(ao, lo, (s3) => new Te(s3), (s3) => new qt(s3), (s3, t) => {
   t?.length && Ki(s3, t);
 });
 var fo = (s3, t) => {
-  let e2 = new kt(s3), i = true, r2, n;
+  let e2 = new kt(s3), i = true, r2, n2;
   try {
     try {
       r2 = v2.openSync(s3.file, "r+");
@@ -69979,9 +70270,9 @@ var fo = (s3, t) => {
     }
     let o2 = v2.fstatSync(r2), h2 = Buffer.alloc(512);
     t:
-      for (n = 0;n < o2.size; n += 512) {
+      for (n2 = 0;n2 < o2.size; n2 += 512) {
         for (let c2 = 0, d3 = 0;c2 < 512; c2 += d3) {
-          if (d3 = v2.readSync(r2, h2, c2, h2.length - c2, n + c2), n === 0 && h2[0] === 31 && h2[1] === 139)
+          if (d3 = v2.readSync(r2, h2, c2, h2.length - c2, n2 + c2), n2 === 0 && h2[0] === 31 && h2[1] === 139)
             throw new Error("cannot append to compressed archives");
           if (!d3)
             break t;
@@ -69990,11 +70281,11 @@ var fo = (s3, t) => {
         if (!a3.cksumValid)
           break;
         let l2 = 512 * Math.ceil((a3.size || 0) / 512);
-        if (n + l2 + 512 > o2.size)
+        if (n2 + l2 + 512 > o2.size)
           break;
-        n += l2, s3.mtimeCache && a3.mtime && s3.mtimeCache.set(String(a3.path), a3.mtime);
+        n2 += l2, s3.mtimeCache && a3.mtime && s3.mtimeCache.set(String(a3.path), a3.mtime);
       }
-    i = false, uo(s3, e2, n, r2, t);
+    i = false, uo(s3, e2, n2, r2, t);
   } finally {
     if (i)
       try {
@@ -70003,14 +70294,14 @@ var fo = (s3, t) => {
   }
 };
 var uo = (s3, t, e2, i, r2) => {
-  let n = new Wt(s3.file, { fd: i, start: e2 });
-  t.pipe(n), po(t, r2);
+  let n2 = new Wt(s3.file, { fd: i, start: e2 });
+  t.pipe(n2), po(t, r2);
 };
 var mo = (s3, t) => {
   t = Array.from(t);
-  let e2 = new Et(s3), i = (n, o2, h2) => {
+  let e2 = new Et(s3), i = (n2, o2, h2) => {
     let a3 = (T3, N2) => {
-      T3 ? v2.close(n, (E2) => h2(T3)) : h2(null, N2);
+      T3 ? v2.close(n2, (E2) => h2(T3)) : h2(null, N2);
     }, l2 = 0;
     if (o2 === 0)
       return a3(null, 0);
@@ -70018,7 +70309,7 @@ var mo = (s3, t) => {
       if (T3 || N2 === undefined)
         return a3(T3);
       if (c2 += N2, c2 < 512 && N2)
-        return v2.read(n, d3, c2, d3.length - c2, l2 + c2, S3);
+        return v2.read(n2, d3, c2, d3.length - c2, l2 + c2, S3);
       if (l2 === 0 && d3[0] === 31 && d3[1] === 139)
         return a3(new Error("cannot append to compressed archives"));
       if (c2 < 512)
@@ -70029,11 +70320,11 @@ var mo = (s3, t) => {
       let x3 = 512 * Math.ceil((E2.size ?? 0) / 512);
       if (l2 + x3 + 512 > o2 || (l2 += x3 + 512, l2 >= o2))
         return a3(null, l2);
-      s3.mtimeCache && E2.mtime && s3.mtimeCache.set(String(E2.path), E2.mtime), c2 = 0, v2.read(n, d3, 0, 512, l2, S3);
+      s3.mtimeCache && E2.mtime && s3.mtimeCache.set(String(E2.path), E2.mtime), c2 = 0, v2.read(n2, d3, 0, 512, l2, S3);
     };
-    v2.read(n, d3, 0, 512, l2, S3);
+    v2.read(n2, d3, 0, 512, l2, S3);
   };
-  return new Promise((n, o2) => {
+  return new Promise((n2, o2) => {
     e2.on("error", o2);
     let h2 = "r+", a3 = (l2, c2) => {
       if (l2 && l2.code === "ENOENT" && h2 === "r+")
@@ -70047,7 +70338,7 @@ var mo = (s3, t) => {
           if (T3)
             return o2(T3);
           let E2 = new tt(s3.file, { fd: c2, start: N2 });
-          e2.pipe(E2), E2.on("error", o2), E2.on("close", n), Eo(e2, t);
+          e2.pipe(E2), E2.on("error", o2), E2.on("close", n2), Eo(e2, t);
         });
       });
     };
@@ -70512,7 +70803,7 @@ function buildReleaseAllowlist(layout) {
 async function ensureLayoutSourceDir(projectRoot, layout, strict) {
   const sourceDir = path10.join(projectRoot, layout.sourceDir);
   try {
-    const stat11 = await fs29.promises.stat(sourceDir);
+    const stat11 = await fs30.promises.stat(sourceDir);
     if (!stat11.isDirectory()) {
       throw new Error(`Expected source directory "${layout.sourceDir}" exists but is not a directory.`);
     }
@@ -70537,8 +70828,8 @@ async function materializeRuntimeLayoutInPlace(projectRoot, layout) {
   }
   const sourceDir = path10.join(projectRoot, layout.sourceDir);
   const runtimeDir = path10.join(projectRoot, layout.runtimeDir);
-  await fs29.promises.rm(runtimeDir, { recursive: true, force: true });
-  await fs29.promises.rename(sourceDir, runtimeDir);
+  await fs30.promises.rm(runtimeDir, { recursive: true, force: true });
+  await fs30.promises.rename(sourceDir, runtimeDir);
 }
 async function stageLocalKitPathForRuntimeLayout(kitRoot, layout) {
   const sourceDir = await ensureLayoutSourceDir(kitRoot, layout, false);
@@ -70548,20 +70839,20 @@ async function stageLocalKitPathForRuntimeLayout(kitRoot, layout) {
   const downloadManager = new DownloadManager;
   const tempDir = await downloadManager.createTempDir();
   const extractDir = `${tempDir}/extracted`;
-  await fs29.promises.mkdir(extractDir, { recursive: true });
-  const entries = await fs29.promises.readdir(kitRoot);
+  await fs30.promises.mkdir(extractDir, { recursive: true });
+  const entries = await fs30.promises.readdir(kitRoot);
   const allowlist = buildReleaseAllowlist(layout);
   for (const entry of entries) {
     if (!allowlist.includes(entry) || entry === layout.sourceDir) {
       continue;
     }
-    await fs29.promises.cp(path10.join(kitRoot, entry), path10.join(extractDir, entry), {
+    await fs30.promises.cp(path10.join(kitRoot, entry), path10.join(extractDir, entry), {
       recursive: true
     });
   }
   const runtimeDir = path10.join(extractDir, layout.runtimeDir);
-  await fs29.promises.mkdir(path10.dirname(runtimeDir), { recursive: true });
-  await fs29.promises.cp(sourceDir, runtimeDir, { recursive: true });
+  await fs30.promises.mkdir(path10.dirname(runtimeDir), { recursive: true });
+  await fs30.promises.cp(sourceDir, runtimeDir, { recursive: true });
   logger.verbose("Staged local kit path with runtime layout", {
     kitRoot,
     extractDir,
@@ -70590,9 +70881,9 @@ function resolveRepoRootForKit(kitRoot) {
   try {
     const parent = path10.dirname(kitRoot);
     const parentPackageJson = path10.join(parent, "package.json");
-    if (!fs29.existsSync(parentPackageJson))
+    if (!fs30.existsSync(parentPackageJson))
       return kitRoot;
-    const pkg = JSON.parse(fs29.readFileSync(parentPackageJson, "utf-8"));
+    const pkg = JSON.parse(fs30.readFileSync(parentPackageJson, "utf-8"));
     const kitCfg = pkg.takumi;
     const sourceDir = kitCfg?.sourceDir;
     if (typeof sourceDir === "string" && path10.resolve(parent, sourceDir) === path10.resolve(kitRoot)) {
@@ -70606,9 +70897,9 @@ async function stageMonorepoForInstallation(kitRoot) {
   const tempDir = await downloadManager.createTempDir();
   const extractDir = `${tempDir}/extracted`;
   const claudeDir = path10.join(extractDir, ".claude");
-  await fs29.promises.mkdir(claudeDir, { recursive: true });
+  await fs30.promises.mkdir(claudeDir, { recursive: true });
   const repoRoot = resolveRepoRootForKit(kitRoot);
-  const kitEntries = await fs29.promises.readdir(kitRoot);
+  const kitEntries = await fs30.promises.readdir(kitRoot);
   const skipLegacyManifest = kitEntries.includes(MANIFEST_FILENAME) && kitEntries.includes(LEGACY_MANIFEST_FILENAME);
   for (const entry of kitEntries) {
     if (!MONOREPO_KIT_CONTENT.includes(entry))
@@ -70616,14 +70907,14 @@ async function stageMonorepoForInstallation(kitRoot) {
     if (skipLegacyManifest && entry === LEGACY_MANIFEST_FILENAME)
       continue;
     const srcPath = path10.join(kitRoot, entry);
-    await fs29.promises.cp(srcPath, path10.join(claudeDir, entry), { recursive: true });
+    await fs30.promises.cp(srcPath, path10.join(claudeDir, entry), { recursive: true });
   }
-  const repoEntries = repoRoot === kitRoot ? kitEntries : await fs29.promises.readdir(repoRoot);
+  const repoEntries = repoRoot === kitRoot ? kitEntries : await fs30.promises.readdir(repoRoot);
   for (const entry of repoEntries) {
     if (!RELEASE_ROOT_ALLOWLIST.includes(entry))
       continue;
     const srcPath = path10.join(repoRoot, entry);
-    await fs29.promises.cp(srcPath, path10.join(extractDir, entry), { recursive: true });
+    await fs30.promises.cp(srcPath, path10.join(extractDir, entry), { recursive: true });
   }
   logger.verbose("Staged monorepo for installation", {
     kitRoot,
@@ -70637,13 +70928,13 @@ async function stageMonorepoForInstallation(kitRoot) {
 async function normalizeFullRepoExtract(dir, strict) {
   const layout = resolveKitLayout(dir);
   await ensureLayoutSourceDir(dir, layout, strict);
-  const entries = await fs29.promises.readdir(dir);
+  const entries = await fs30.promises.readdir(dir);
   const releaseAllowlist = buildReleaseAllowlist(layout);
   let removedCount = 0;
   for (const entry of entries) {
     if (!releaseAllowlist.includes(entry)) {
       const fullPath = path10.join(dir, entry);
-      await fs29.promises.rm(fullPath, { recursive: true, force: true });
+      await fs30.promises.rm(fullPath, { recursive: true, force: true });
       removedCount++;
     }
   }
@@ -70758,7 +71049,7 @@ async function useLocalKitPath(kitPath, isMonorepo) {
   output.section("Using local kit");
   const absolutePath = path10.resolve(kitPath);
   try {
-    const stat11 = await fs29.promises.stat(absolutePath);
+    const stat11 = await fs30.promises.stat(absolutePath);
     if (!stat11.isDirectory()) {
       throw new Error(`--kit-path must point to a directory, not a file.
 
@@ -70797,7 +71088,7 @@ Please verify the path exists and is accessible.`);
   }
   const claudeDir = path10.join(absolutePath, DEFAULT_KIT_LAYOUT.runtimeDir);
   try {
-    const stat11 = await fs29.promises.stat(claudeDir);
+    const stat11 = await fs30.promises.stat(claudeDir);
     if (!stat11.isDirectory()) {
       logger.warning(`Warning: ${claudeDir} exists but is not a directory.
 This may not be a valid Takumi installation.`);
@@ -70832,7 +71123,7 @@ async function extractLocalArchive(archivePath, exclude) {
   const absolutePath = path10.resolve(archivePath);
   validateArchiveFormat(absolutePath);
   try {
-    const stat11 = await fs29.promises.stat(absolutePath);
+    const stat11 = await fs30.promises.stat(absolutePath);
     if (!stat11.isFile()) {
       throw new Error(`--archive must point to a file, not a directory.
 
@@ -70965,7 +71256,7 @@ async function downloadViaWorker(release, kit, isNonInteractive2) {
   const tempDir = await downloadManager.createTempDir();
   const archivePath = path10.join(tempDir, assetName);
   const buf = Buffer.from(await res.arrayBuffer());
-  await fs29.promises.writeFile(archivePath, buf);
+  await fs30.promises.writeFile(archivePath, buf);
   const extractDir = `${tempDir}/extracted`;
   logger.verbose("Extraction", { archivePath, extractDir });
   await downloadManager.extractArchive(archivePath, extractDir);
@@ -71327,7 +71618,7 @@ init_logger();
 init_safe_spinner();
 init_takumi_constants();
 var import_fs_extra32 = __toESM(require_lib(), 1);
-import { existsSync as existsSync55, readdirSync as readdirSync9, rmSync as rmSync7, rmdirSync as rmdirSync2, unlinkSync as unlinkSync6 } from "node:fs";
+import { existsSync as existsSync56, readdirSync as readdirSync9, rmSync as rmSync7, rmdirSync as rmdirSync2, unlinkSync as unlinkSync6 } from "node:fs";
 import { dirname as dirname34, join as join117, resolve as resolve27 } from "node:path";
 var TAKUMI_SUBDIRECTORIES = ["commands", "agents", "skills", "rules", "hooks"];
 async function analyzeFreshInstallation(claudeDir) {
@@ -71400,7 +71691,7 @@ async function removeFilesByOwnership(claudeDir, analysis, includeModified) {
   for (const file of filesToRemove) {
     const fullPath = join117(claudeDir, file.path);
     try {
-      if (existsSync55(fullPath)) {
+      if (existsSync56(fullPath)) {
         unlinkSync6(fullPath);
         removedFiles.push(file.path);
         logger.debug(`Removed: ${file.path}`);
@@ -73585,11 +73876,11 @@ async function initCommand(options2) {
 }
 // src/commands/plan/plan-command.ts
 init_output_manager();
-import { existsSync as existsSync60, statSync as statSync9 } from "node:fs";
+import { existsSync as existsSync61, statSync as statSync9 } from "node:fs";
 import { dirname as dirname41, join as join128, parse as parse4, resolve as resolve33 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
-import { existsSync as existsSync59, statSync as statSync8 } from "node:fs";
+import { existsSync as existsSync60, statSync as statSync8 } from "node:fs";
 import { basename as basename21, dirname as dirname40, join as join127, relative as relative20, resolve as resolve31 } from "node:path";
 
 // src/domains/plan-parser/index.ts
@@ -73970,20 +74261,20 @@ function parsePlanFile(planFilePath, options2) {
   return { frontmatter, phases };
 }
 // src/domains/plan-parser/plan-scanner.ts
-import { existsSync as existsSync56, readdirSync as readdirSync10 } from "node:fs";
+import { existsSync as existsSync57, readdirSync as readdirSync10 } from "node:fs";
 import { join as join125 } from "node:path";
 function scanPlanDir(dir) {
-  if (!existsSync56(dir))
+  if (!existsSync57(dir))
     return [];
   try {
-    return readdirSync10(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join125(dir, entry.name, "plan.md")).filter(existsSync56);
+    return readdirSync10(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join125(dir, entry.name, "plan.md")).filter(existsSync57);
   } catch {
     return [];
   }
 }
 // src/domains/plan-parser/plan-validator.ts
 var import_gray_matter6 = __toESM(require_gray_matter(), 1);
-import { existsSync as existsSync57, readFileSync as readFileSync24 } from "node:fs";
+import { existsSync as existsSync58, readFileSync as readFileSync24 } from "node:fs";
 import { basename as basename19, dirname as dirname37 } from "node:path";
 function validatePlanFile(filePath, strict = false) {
   const content = readFileSync24(filePath, "utf8");
@@ -74023,7 +74314,7 @@ function validatePlanFile(filePath, strict = false) {
     });
   }
   for (const phase of phases) {
-    if (phase.file && !existsSync57(phase.file)) {
+    if (phase.file && !existsSync58(phase.file)) {
       const fileBasename = basename19(phase.file);
       const refLine = lines.findIndex((l2) => l2.includes(fileBasename));
       issues.push({
@@ -74044,7 +74335,7 @@ function validatePlanFile(filePath, strict = false) {
 // src/domains/plan-parser/plan-writer.ts
 var import_gray_matter7 = __toESM(require_gray_matter(), 1);
 import { mkdirSync as mkdirSync9, readFileSync as readFileSync25, writeFileSync as writeFileSync12 } from "node:fs";
-import { existsSync as existsSync58 } from "node:fs";
+import { existsSync as existsSync59 } from "node:fs";
 import { basename as basename20, dirname as dirname38, join as join126 } from "node:path";
 function phaseNameToFilename(id, name) {
   const numMatch = /^(\d+)([a-z]*)$/i.exec(id);
@@ -74139,9 +74430,9 @@ function resolvePhaseIds(phases) {
     if (p2.id) {
       const numMatch = /^(\d+)/.exec(p2.id);
       if (numMatch) {
-        const n = Number.parseInt(numMatch[1], 10);
-        if (n >= nextNum)
-          nextNum = n + 1;
+        const n2 = Number.parseInt(numMatch[1], 10);
+        if (n2 >= nextNum)
+          nextNum = n2 + 1;
       }
       return { id: p2.id, name: p2.name };
     }
@@ -74226,7 +74517,7 @@ function updatePhaseStatus(planFile, phaseId, newStatus) {
   writeFileSync12(planFile, updatedContent, "utf8");
   const planDir = dirname38(planFile);
   const phaseFilename = phaseNameFilenameFromTableRow(updatedBody, phaseId, planDir);
-  if (phaseFilename && existsSync58(phaseFilename)) {
+  if (phaseFilename && existsSync59(phaseFilename)) {
     updatePhaseFileFrontmatter(phaseFilename, newStatus);
   }
 }
@@ -74266,8 +74557,8 @@ function addPhase(planFile, name, afterId) {
     phaseId = nextSubPhaseId(afterId, existingIds);
   } else {
     const maxNum = existingIds.reduce((max, id) => {
-      const n = Number.parseInt(id, 10);
-      return Number.isNaN(n) ? max : Math.max(max, n);
+      const n2 = Number.parseInt(id, 10);
+      return Number.isNaN(n2) ? max : Math.max(max, n2);
     }, 0);
     phaseId = String(maxNum + 1);
   }
@@ -74423,7 +74714,7 @@ async function handleValidate(target, options2) {
 }
 async function handleStatus(target, options2) {
   const t = target ? resolve31(target) : null;
-  const plansDir = t && existsSync59(t) && statSync8(t).isDirectory() && !existsSync59(join127(t, "plan.md")) ? t : null;
+  const plansDir = t && existsSync60(t) && statSync8(t).isDirectory() && !existsSync60(join127(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -74654,12 +74945,12 @@ async function handleAddPhase(target, options2) {
 // src/commands/plan/plan-command.ts
 function resolvePlanFile(target) {
   const t = target ? resolve33(target) : process.cwd();
-  if (existsSync60(t)) {
+  if (existsSync61(t)) {
     const stat13 = statSync9(t);
     if (stat13.isFile())
       return t;
     const candidate = join128(t, "plan.md");
-    if (existsSync60(candidate))
+    if (existsSync61(candidate))
       return candidate;
   }
   if (!target) {
@@ -74667,7 +74958,7 @@ function resolvePlanFile(target) {
     const root = parse4(dir).root;
     while (dir !== root) {
       const candidate = join128(dir, "plan.md");
-      if (existsSync60(candidate))
+      if (existsSync61(candidate))
         return candidate;
       dir = dirname41(dir);
     }
@@ -74691,7 +74982,7 @@ function renderPhasesTable(phases) {
   const maxId = Math.max(4, ...phases.map((p2) => p2.phaseId.length));
   const maxName = Math.max(4, ...phases.map((p2) => p2.name.length));
   const maxStatus = 11;
-  const pad = (s3, n) => s3.padEnd(n);
+  const pad = (s3, n2) => s3.padEnd(n2);
   const line = `${"-".repeat(maxId + 2)}+${"-".repeat(maxName + 2)}+${"-".repeat(maxStatus + 2)}`;
   console.log(`  ${pad("ID", maxId)}  | ${pad("Name", maxName)}  | Status`);
   console.log(`  ${line}`);
@@ -74717,7 +75008,7 @@ async function planCommand(action, target, options2) {
   let resolvedTarget = target;
   if (resolvedAction && !knownActions.has(resolvedAction)) {
     const looksLikePath = resolvedAction.includes("/") || resolvedAction.includes("\\") || resolvedAction.endsWith(".md") || resolvedAction === "." || resolvedAction === "..";
-    const existsOnDisk = !looksLikePath && existsSync60(resolve33(resolvedAction));
+    const existsOnDisk = !looksLikePath && existsSync61(resolve33(resolvedAction));
     if (looksLikePath || existsOnDisk) {
       resolvedTarget = resolvedAction;
       resolvedAction = undefined;
@@ -74761,7 +75052,7 @@ init_logger();
 init_logger();
 
 // src/commands/telemetry/shared.ts
-import { existsSync as existsSync61, readFileSync as readFileSync26, readdirSync as readdirSync11 } from "node:fs";
+import { existsSync as existsSync62, readFileSync as readFileSync26, readdirSync as readdirSync11 } from "node:fs";
 import { homedir as homedir29 } from "node:os";
 import { join as join129 } from "node:path";
 init_token_store();
@@ -74776,7 +75067,7 @@ var TELEMETRY_HOOK_FIELD = "hooks.telemetry";
 var TOKEN_PLACEHOLDER = "__INJECT_AT_RELEASE__";
 function readUserCache() {
   try {
-    if (!existsSync61(USER_CACHE_PATH))
+    if (!existsSync62(USER_CACHE_PATH))
       return null;
     const parsed = JSON.parse(readFileSync26(USER_CACHE_PATH, "utf8"));
     if (!parsed || typeof parsed !== "object")
@@ -74788,7 +75079,7 @@ function readUserCache() {
 }
 function countBufferFiles() {
   try {
-    if (!existsSync61(EVENT_BUFFER_DIR))
+    if (!existsSync62(EVENT_BUFFER_DIR))
       return 0;
     return readdirSync11(EVENT_BUFFER_DIR).filter((f4) => f4.endsWith(".jsonl")).length;
   } catch {
@@ -74826,8 +75117,8 @@ function collectRuntimeContext() {
     cacheSource: cache3?.source === "gh" || cache3?.source === "manual" ? cache3.source : null,
     bufferFileCount: countBufferFiles(),
     bufferDir: EVENT_BUFFER_DIR,
-    rateStateExists: existsSync61(RATE_STATE_PATH),
-    userCacheExists: existsSync61(USER_CACHE_PATH),
+    rateStateExists: existsSync62(RATE_STATE_PATH),
+    userCacheExists: existsSync62(USER_CACHE_PATH),
     endpoint,
     tokenConfigured: Boolean(token)
   };
@@ -74988,13 +75279,13 @@ init_logger();
 init_safe_prompts();
 init_takumi_constants();
 var import_picocolors27 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync62, readdirSync as readdirSync12, rmSync as rmSync8 } from "node:fs";
+import { existsSync as existsSync63, readdirSync as readdirSync12, rmSync as rmSync8 } from "node:fs";
 import { dirname as dirname42, join as join130 } from "node:path";
 function listPresentManifestNames(installPath) {
   const present = [];
-  if (existsSync62(getManifestPath(installPath)))
+  if (existsSync63(getManifestPath(installPath)))
     present.push(MANIFEST_FILENAME);
-  if (existsSync62(getLegacyManifestPath(installPath)))
+  if (existsSync63(getLegacyManifestPath(installPath)))
     present.push(LEGACY_MANIFEST_FILENAME);
   return present;
 }
@@ -75948,13 +76239,13 @@ function registerCommands(cli) {
   cli.command("console", "Start local bridge and open session console in browser").option("--port <port>", "Bridge port (default: 8765, auto-bump on conflict)").option("--no-open", "Don't open the browser; print URL only").action(async (options2) => {
     let port;
     if (options2.port !== undefined) {
-      const n = Number(options2.port);
-      if (!Number.isInteger(n) || n < 0 || n > 65535) {
+      const n2 = Number(options2.port);
+      if (!Number.isInteger(n2) || n2 < 0 || n2 > 65535) {
         console.error(`Invalid --port value: ${options2.port}. Expected integer 0-65535.`);
         process.exitCode = 1;
         return;
       }
-      port = n;
+      port = n2;
     }
     await consoleCommand({ port, noOpen: options2.open === false });
   });