terminal-pilot 0.0.20 → 0.0.21

package/dist/cli.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 };
 
 // src/cli.ts
-import { realpath as realpath2 } from "node:fs/promises";
+import { realpath as realpath3 } from "node:fs/promises";
 import path23 from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 
@@ -20,7 +20,7 @@ import {
   Option
 } from "commander";
 
-// ../design-system/src/internal/color-support.ts
+// ../toolcraft-design/src/internal/color-support.ts
 function supportsColor(env = process.env, stream = process.stdout) {
   if (env.FORCE_COLOR !== void 0 && env.FORCE_COLOR !== "0") {
     return true;
@@ -34,7 +34,7 @@ function supportsColor(env = process.env, stream = process.stdout) {
   return typeof env.TERM === "string" && env.TERM.length > 0 && env.TERM !== "dumb";
 }
 
-// ../design-system/src/components/color.ts
+// ../toolcraft-design/src/components/color.ts
 var reset = "\x1B[0m";
 var ansiStyles = {
   reset: { open: reset },
@@ -136,41 +136,135 @@ function createColor(styles = []) {
 }
 var color = createColor();
 
-// ../design-system/src/tokens/colors.ts
-var dark = {
-  header: (text5) => color.magentaBright.bold(text5),
-  divider: (text5) => color.dim(text5),
-  prompt: (text5) => color.cyan(text5),
-  number: (text5) => color.cyanBright(text5),
-  intro: (text5) => color.bgMagenta.white(` Poe - ${text5} `),
-  resolvedSymbol: color.magenta("\u25C7"),
-  errorSymbol: color.red("\u25A0"),
-  accent: (text5) => color.cyan(text5),
-  muted: (text5) => color.dim(text5),
-  success: (text5) => color.green(text5),
-  warning: (text5) => color.yellow(text5),
-  error: (text5) => color.red(text5),
-  info: (text5) => color.magenta(text5),
-  badge: (text5) => color.bgYellow.black(` ${text5} `)
+// ../toolcraft-design/src/tokens/brand.ts
+var brands = {
+  purple: { name: "purple", primary: "#a200ff" },
+  blue: { name: "blue", primary: "#2f6fed" },
+  green: { name: "green", primary: "#1f9d57" }
 };
-var light = {
-  header: (text5) => color.hex("#a200ff").bold(text5),
-  divider: (text5) => color.hex("#666666")(text5),
-  prompt: (text5) => color.hex("#006699").bold(text5),
-  number: (text5) => color.hex("#0077cc").bold(text5),
-  intro: (text5) => color.bgHex("#a200ff").white(` Poe - ${text5} `),
-  resolvedSymbol: color.hex("#a200ff")("\u25C7"),
-  errorSymbol: color.hex("#cc0000")("\u25A0"),
-  accent: (text5) => color.hex("#006699").bold(text5),
-  muted: (text5) => color.hex("#666666")(text5),
-  success: (text5) => color.hex("#008800")(text5),
-  warning: (text5) => color.hex("#cc6600")(text5),
-  error: (text5) => color.hex("#cc0000")(text5),
-  info: (text5) => color.hex("#a200ff")(text5),
-  badge: (text5) => color.bgHex("#cc6600").white(` ${text5} `)
+
+// ../toolcraft-design/src/internal/theme-state.ts
+var defaults = {
+  brand: "purple",
+  label: "Poe"
 };
+var config = { ...defaults };
+var revision = 0;
+var brandConfigured = false;
+function configureTheme(patch) {
+  if (patch.brand !== void 0 && !Object.hasOwn(brands, patch.brand)) {
+    throw new Error(`Unknown brand: ${patch.brand}`);
+  }
+  config = {
+    brand: patch.brand ?? config.brand,
+    label: patch.label ?? config.label
+  };
+  if (patch.brand !== void 0) {
+    brandConfigured = true;
+  }
+  revision += 1;
+}
+function getThemeConfig() {
+  return { ...config };
+}
+function getThemeRevision() {
+  return revision;
+}
+function isThemeBrandConfigured() {
+  return brandConfigured;
+}
+
+// ../toolcraft-design/src/tokens/colors.ts
+var brand = brands.purple.primary;
+function withStyles(palette, styles) {
+  return Object.defineProperty(palette, "styles", {
+    value: styles,
+    enumerable: false
+  });
+}
+function brandColor(activeBrand, purple) {
+  return activeBrand.name === "purple" ? purple : color.hex(activeBrand.primary);
+}
+function brandBackground(activeBrand, purple) {
+  return activeBrand.name === "purple" ? purple : color.bgHex(activeBrand.primary);
+}
+function createPalette(activeBrand, mode) {
+  const isPurple = activeBrand.name === "purple";
+  if (mode === "light") {
+    const active2 = color.hex(activeBrand.primary);
+    const prompt2 = isPurple ? color.hex("#006699") : active2;
+    const number2 = isPurple ? color.hex("#0077cc") : active2;
+    return withStyles(
+      {
+        header: (text5) => active2.bold(text5),
+        divider: (text5) => color.hex("#666666")(text5),
+        prompt: (text5) => prompt2.bold(text5),
+        number: (text5) => number2.bold(text5),
+        intro: (text5) => color.bgHex(activeBrand.primary).white(` ${getThemeConfig().label} - ${text5} `),
+        get resolvedSymbol() {
+          return active2("\u25C7");
+        },
+        get errorSymbol() {
+          return color.hex("#cc0000")("\u25A0");
+        },
+        accent: (text5) => prompt2.bold(text5),
+        muted: (text5) => color.hex("#666666")(text5),
+        success: (text5) => color.hex("#008800")(text5),
+        warning: (text5) => color.hex("#cc6600")(text5),
+        error: (text5) => color.hex("#cc0000")(text5),
+        info: (text5) => active2(text5),
+        badge: (text5) => color.bgHex("#cc6600").white(` ${text5} `)
+      },
+      {
+        accent: { fg: isPurple ? "#006699" : activeBrand.primary, bold: true },
+        muted: { fg: "#666666" },
+        success: { fg: "#008800" },
+        warning: { fg: "#cc6600" },
+        error: { fg: "#cc0000" },
+        info: { fg: activeBrand.primary }
+      }
+    );
+  }
+  const active = brandColor(activeBrand, color.magenta);
+  const activeBright = brandColor(activeBrand, color.magentaBright);
+  const activeBackground = brandBackground(activeBrand, color.bgMagenta);
+  const prompt = isPurple ? color.cyan : active;
+  const number = isPurple ? color.cyanBright : active;
+  return withStyles(
+    {
+      header: (text5) => activeBright.bold(text5),
+      divider: (text5) => color.dim(text5),
+      prompt: (text5) => prompt(text5),
+      number: (text5) => number(text5),
+      intro: (text5) => activeBackground.white(` ${getThemeConfig().label} - ${text5} `),
+      get resolvedSymbol() {
+        return active("\u25C7");
+      },
+      get errorSymbol() {
+        return color.red("\u25A0");
+      },
+      accent: (text5) => prompt(text5),
+      muted: (text5) => color.dim(text5),
+      success: (text5) => color.green(text5),
+      warning: (text5) => color.yellow(text5),
+      error: (text5) => color.red(text5),
+      info: (text5) => active(text5),
+      badge: (text5) => color.bgYellow.black(` ${text5} `)
+    },
+    {
+      accent: { fg: isPurple ? "cyan" : activeBrand.primary, bold: true },
+      muted: { dim: true },
+      success: { fg: "green" },
+      warning: { fg: "yellow" },
+      error: { fg: "red" },
+      info: { fg: isPurple ? "magenta" : activeBrand.primary }
+    }
+  );
+}
+var dark = createPalette(brands.purple, "dark");
+var light = createPalette(brands.purple, "light");
 
-// ../design-system/src/tokens/typography.ts
+// ../toolcraft-design/src/tokens/typography.ts
 var typography = {
   bold: (text5) => color.bold(text5),
   dim: (text5) => color.dim(text5),
@@ -179,14 +273,14 @@ var typography = {
   strikethrough: (text5) => color.strikethrough(text5)
 };
 
-// ../design-system/src/tokens/widths.ts
+// ../toolcraft-design/src/tokens/widths.ts
 var widths = {
   header: 60,
   helpColumn: 24,
   maxLine: 80
 };
 
-// ../design-system/src/internal/output-format.ts
+// ../toolcraft-design/src/internal/output-format.ts
 import { AsyncLocalStorage } from "node:async_hooks";
 var VALID_FORMATS = /* @__PURE__ */ new Set(["terminal", "markdown", "json"]);
 var formatStorage = new AsyncLocalStorage();
@@ -207,7 +301,7 @@ function resetOutputFormatCache() {
   cached = void 0;
 }
 
-// ../design-system/src/internal/theme-detect.ts
+// ../toolcraft-design/src/internal/theme-detect.ts
 function detectThemeFromEnv(env) {
   const apple = env.APPLE_INTERFACE_STYLE;
   if (typeof apple === "string") {
@@ -244,17 +338,30 @@ function resolveThemeName(env = process.env) {
   }
   return "dark";
 }
-var cachedTheme;
+var themeCache = /* @__PURE__ */ new Map();
+var cachedRevision = -1;
 function getTheme(env) {
+  const themeName = resolveThemeName(env);
+  const config2 = getThemeConfig();
+  const requestedBrand = env?.POE_BRAND?.toLowerCase();
+  const activeBrandName = !isThemeBrandConfigured() && requestedBrand && Object.hasOwn(brands, requestedBrand) ? requestedBrand : config2.brand;
+  const revision2 = getThemeRevision();
+  if (revision2 !== cachedRevision) {
+    themeCache.clear();
+    cachedRevision = revision2;
+  }
+  const cacheKey = `${activeBrandName}:${themeName}`;
+  const cachedTheme = themeCache.get(cacheKey);
   if (cachedTheme) {
     return cachedTheme;
   }
-  const themeName = resolveThemeName(env);
-  cachedTheme = themeName === "light" ? light : dark;
-  return cachedTheme;
+  const activeBrand = brands[activeBrandName];
+  const theme = activeBrandName === "purple" ? themeName === "light" ? light : dark : createPalette(activeBrand, themeName);
+  themeCache.set(cacheKey, theme);
+  return theme;
 }
 
-// ../design-system/src/components/text.ts
+// ../toolcraft-design/src/components/text.ts
 function renderMarkdownInline(content) {
   return content.replaceAll("\r\n", " ").replaceAll("\n", " ").replaceAll("\r", " ");
 }
@@ -370,7 +477,7 @@ var text = {
   }
 };
 
-// ../design-system/src/components/symbols.ts
+// ../toolcraft-design/src/components/symbols.ts
 var symbols = {
   get info() {
     const format = resolveOutputFormat();
@@ -424,12 +531,12 @@ var symbols = {
   }
 };
 
-// ../design-system/src/internal/strip-ansi.ts
+// ../toolcraft-design/src/internal/strip-ansi.ts
 function stripAnsi(value) {
   return value.replace(/\u001b\[[0-9;]*m/g, "");
 }
 
-// ../design-system/src/prompts/primitives/log.ts
+// ../toolcraft-design/src/prompts/primitives/log.ts
 function renderMarkdownInline2(value) {
   return stripAnsi(value).replaceAll("\r\n", " ").replaceAll("\n", " ").replaceAll("\r", " ");
 }
@@ -556,7 +663,7 @@ var log = {
   error
 };
 
-// ../design-system/src/components/logger.ts
+// ../toolcraft-design/src/components/logger.ts
 function createLogger(emitter) {
   const emit = (level, message2) => {
     if (emitter) {
@@ -617,7 +724,7 @@ function createLogger(emitter) {
 }
 var logger = createLogger();
 
-// ../design-system/src/components/help-formatter.ts
+// ../toolcraft-design/src/components/help-formatter.ts
 var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function normalizeInline(value) {
   return value.replaceAll("\r\n", " ").replaceAll("\n", " ").replaceAll("\r", " ");
@@ -793,7 +900,7 @@ function formatOptionList(options) {
   });
 }
 
-// ../design-system/src/components/help-formatter-plain.ts
+// ../toolcraft-design/src/components/help-formatter-plain.ts
 var help_formatter_plain_exports = {};
 __export(help_formatter_plain_exports, {
   formatColumns: () => formatColumns2,
@@ -930,7 +1037,7 @@ function formatOptionList2(options) {
   });
 }
 
-// ../design-system/src/components/table.ts
+// ../toolcraft-design/src/components/table.ts
 var reset2 = "\x1B[0m";
 var ellipsis = "\u2026";
 var graphemeSegmenter2 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
@@ -1214,7 +1321,7 @@ function renderTable(options) {
   }
 }
 
-// ../design-system/src/components/detail-card.ts
+// ../toolcraft-design/src/components/detail-card.ts
 function wrap(value, width) {
   const lines = [];
   for (const paragraph of value.split("\n")) {
@@ -1277,7 +1384,7 @@ ${options.theme.muted(options.badges.map((badge) => badge[0] + badge.slice(1).to
   return blocks.join("\n\n");
 }
 
-// ../design-system/src/components/template.ts
+// ../toolcraft-design/src/components/template.ts
 var MAX_PARTIAL_DEPTH = 100;
 var HTML_ESCAPE = {
   "&": "&",
@@ -1689,22 +1796,22 @@ function hasProperty(value, key2) {
   return Object.prototype.hasOwnProperty.call(value, key2);
 }
 
-// ../design-system/src/components/browser.ts
+// ../toolcraft-design/src/components/browser.ts
 import { spawn } from "node:child_process";
 import process2 from "node:process";
 
-// ../design-system/src/acp/writer.ts
+// ../toolcraft-design/src/acp/writer.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 var storage = new AsyncLocalStorage2();
 
-// ../design-system/src/dashboard/terminal-width.ts
+// ../toolcraft-design/src/dashboard/terminal-width.ts
 var graphemeSegmenter3 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 
-// ../design-system/src/dashboard/terminal.ts
+// ../toolcraft-design/src/dashboard/terminal.ts
 import readline from "node:readline";
 import { PassThrough } from "node:stream";
 
-// ../design-system/src/explorer/state.ts
+// ../toolcraft-design/src/explorer/state.ts
 var REGION_HEADER = 1 << 0;
 var REGION_LIST = 1 << 1;
 var REGION_DETAIL = 1 << 2;
@@ -1713,10 +1820,10 @@ var REGION_MODAL = 1 << 4;
 var REGION_TOAST = 1 << 5;
 var REGION_ALL = REGION_HEADER | REGION_LIST | REGION_DETAIL | REGION_FOOTER | REGION_MODAL | REGION_TOAST;
 
-// ../design-system/src/prompts/index.ts
+// ../toolcraft-design/src/prompts/index.ts
 import * as clack from "@clack/prompts";
 
-// ../design-system/src/prompts/primitives/cancel.ts
+// ../toolcraft-design/src/prompts/primitives/cancel.ts
 import { isCancel } from "@clack/prompts";
 function cancel(msg = "") {
   if (resolveOutputFormat() !== "terminal") {
@@ -1727,7 +1834,7 @@ function cancel(msg = "") {
 `);
 }
 
-// ../design-system/src/prompts/primitives/note.ts
+// ../toolcraft-design/src/prompts/primitives/note.ts
 function getVisibleWidth(value) {
   return stripAnsi(value).length;
 }
@@ -1776,10 +1883,10 @@ function note(message2, title) {
 `);
 }
 
-// ../design-system/src/static/spinner.ts
+// ../toolcraft-design/src/static/spinner.ts
 var SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
 
-// ../design-system/src/prompts/index.ts
+// ../toolcraft-design/src/prompts/index.ts
 async function select2(opts) {
   return clack.select(opts);
 }
@@ -1822,19 +1929,19 @@ var ApprovalDeclinedError = class extends UserError {
 };
 
 // ../toolcraft/src/human-in-loop/config.ts
-function validateHumanInLoopOnDefine(config) {
-  const label = Array.isArray(config.children) ? "group" : "command";
-  if (config.confirm === true && config.humanInLoop !== void 0 && config.humanInLoop !== null) {
-    throw new Error(`${label} '${config.name}': use either confirm or humanInLoop, not both`);
+function validateHumanInLoopOnDefine(config2) {
+  const label = Array.isArray(config2.children) ? "group" : "command";
+  if (config2.confirm === true && config2.humanInLoop !== void 0 && config2.humanInLoop !== null) {
+    throw new Error(`${label} '${config2.name}': use either confirm or humanInLoop, not both`);
   }
-  if (config.humanInLoop === void 0 || config.humanInLoop === null) {
+  if (config2.humanInLoop === void 0 || config2.humanInLoop === null) {
     return;
   }
-  if (config.humanInLoop.mode !== "sync" && config.humanInLoop.mode !== "async") {
-    throw new Error(`${label} '${config.name}': humanInLoop.mode must be "sync" or "async"`);
+  if (config2.humanInLoop.mode !== "sync" && config2.humanInLoop.mode !== "async") {
+    throw new Error(`${label} '${config2.name}': humanInLoop.mode must be "sync" or "async"`);
   }
-  if (typeof config.humanInLoop.message !== "function") {
-    throw new Error(`${label} '${config.name}': humanInLoop.message must be a function`);
+  if (typeof config2.humanInLoop.message !== "function") {
+    throw new Error(`${label} '${config2.name}': humanInLoop.message must be a function`);
   }
 }
 function mergeHumanInLoopFromGroup(groupHumanInLoop, childHumanInLoop) {
@@ -1910,12 +2017,12 @@ function assertValidBranches(branches, discriminator) {
     }
   }
 }
-function OneOf(config) {
-  assertValidBranches(config.branches, config.discriminator);
+function OneOf(config2) {
+  assertValidBranches(config2.branches, config2.discriminator);
   return {
     kind: "oneOf",
-    discriminator: config.discriminator,
-    branches: config.branches
+    discriminator: config2.discriminator,
+    branches: config2.branches
   };
 }
 
@@ -2165,22 +2272,22 @@ function cloneStringArray(values) {
 function cloneStringRecord(values) {
   return values === void 0 ? void 0 : { ...values };
 }
-function cloneMcpServerConfig(config) {
-  if (config === void 0) {
+function cloneMcpServerConfig(config2) {
+  if (config2 === void 0) {
     return void 0;
   }
-  if (config.transport === "stdio") {
+  if (config2.transport === "stdio") {
     return {
       transport: "stdio",
-      command: config.command,
-      args: cloneStringArray(config.args),
-      env: cloneStringRecord(config.env)
+      command: config2.command,
+      args: cloneStringArray(config2.args),
+      env: cloneStringRecord(config2.env)
     };
   }
   return {
     transport: "http",
-    url: config.url,
-    headers: cloneStringRecord(config.headers)
+    url: config2.url,
+    headers: cloneStringRecord(config2.headers)
   };
 }
 function cloneRenameMap(rename5) {
@@ -2421,57 +2528,57 @@ function resolveCommandScope(ownScope, inheritedScope) {
 function resolveGroupScope(ownScope, inheritedScope) {
   return cloneScope(ownScope ?? inheritedScope);
 }
-function createBaseCommand(config) {
+function createBaseCommand(config2) {
   const command = {
     kind: "command",
-    name: config.name,
-    description: config.description,
-    aliases: [...config.aliases ?? []],
-    positional: [...config.positional ?? []],
-    params: config.params,
-    secrets: cloneSecrets(config.secrets),
-    scope: resolveCommandScope(config.scope, void 0),
-    confirm: config.confirm ?? false,
-    humanInLoop: config.humanInLoop,
-    requires: cloneRequires(config.requires),
-    handler: config.handler,
-    render: config.render
+    name: config2.name,
+    description: config2.description,
+    aliases: [...config2.aliases ?? []],
+    positional: [...config2.positional ?? []],
+    params: config2.params,
+    secrets: cloneSecrets(config2.secrets),
+    scope: resolveCommandScope(config2.scope, void 0),
+    confirm: config2.confirm ?? false,
+    humanInLoop: config2.humanInLoop,
+    requires: cloneRequires(config2.requires),
+    handler: config2.handler,
+    render: config2.render
   };
   Object.defineProperty(command, commandConfigSymbol, {
     value: {
-      scope: cloneScope(config.scope),
-      humanInLoop: config.humanInLoop,
-      secrets: cloneSecrets(config.secrets),
-      requires: cloneRequires(config.requires),
+      scope: cloneScope(config2.scope),
+      humanInLoop: config2.humanInLoop,
+      secrets: cloneSecrets(config2.secrets),
+      requires: cloneRequires(config2.requires),
       sourcePath: inferCommandSourcePath()
     }
   });
   return command;
 }
-function createBaseGroup(config) {
+function createBaseGroup(config2) {
   const group = {
     kind: "group",
-    name: config.name,
-    description: config.description,
-    aliases: [...config.aliases ?? []],
-    scope: resolveGroupScope(config.scope, void 0),
-    humanInLoop: config.humanInLoop,
-    secrets: cloneSecrets(config.secrets),
-    requires: cloneRequires(config.requires),
+    name: config2.name,
+    description: config2.description,
+    aliases: [...config2.aliases ?? []],
+    scope: resolveGroupScope(config2.scope, void 0),
+    humanInLoop: config2.humanInLoop,
+    secrets: cloneSecrets(config2.secrets),
+    requires: cloneRequires(config2.requires),
     children: [],
     default: void 0
   };
   Object.defineProperty(group, groupConfigSymbol, {
     value: {
-      mcp: cloneMcpServerConfig(config.mcp),
-      scope: cloneScope(config.scope),
-      humanInLoop: config.humanInLoop,
-      secrets: cloneSecrets(config.secrets),
-      tools: cloneStringArray(config.tools),
-      rename: cloneRenameMap(config.rename),
-      requires: cloneRequires(config.requires),
-      children: [...config.children],
-      default: config.default
+      mcp: cloneMcpServerConfig(config2.mcp),
+      scope: cloneScope(config2.scope),
+      humanInLoop: config2.humanInLoop,
+      secrets: cloneSecrets(config2.secrets),
+      tools: cloneStringArray(config2.tools),
+      rename: cloneRenameMap(config2.rename),
+      requires: cloneRequires(config2.requires),
+      children: [...config2.children],
+      default: config2.default
     }
   });
   return group;
@@ -2574,10 +2681,10 @@ function materializeNode(node, inherited) {
   }
   return materializeGroup(node, inherited);
 }
-function defineCommand(config) {
-  validateHumanInLoopOnDefine(config);
+function defineCommand(config2) {
+  validateHumanInLoopOnDefine(config2);
   return materializeCommand(
-    createBaseCommand(config),
+    createBaseCommand(config2),
     {
       scope: void 0,
       humanInLoop: void 0,
@@ -2586,10 +2693,10 @@ function defineCommand(config) {
     }
   );
 }
-function defineGroup(config) {
-  validateRenameMap(config.rename);
-  validateHumanInLoopOnDefine(config);
-  return materializeGroup(createBaseGroup(config), {
+function defineGroup(config2) {
+  validateRenameMap(config2.rename);
+  validateHumanInLoopOnDefine(config2);
+  return materializeGroup(createBaseGroup(config2), {
     scope: void 0,
     humanInLoop: void 0,
     secrets: {},
@@ -2758,7 +2865,7 @@ import path3 from "node:path";
 // ../process-runner/src/docker/docker-execution-env.ts
 import { createHash as createHash2, randomBytes as randomBytes2 } from "node:crypto";
 import { mkdtempSync as mkdtempSync2, rmSync as rmSync2 } from "node:fs";
-import { readdir, readFile, writeFile } from "node:fs/promises";
+import { readdir, readFile, realpath, writeFile } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
 import path5 from "node:path";
 
@@ -4446,7 +4553,7 @@ async function readTaskAtLocation(fs4, rootPath, layout, list, id, validStates,
   }
   return readTaskFile(fs4, list, id, location.path, validStates, initialState, mode);
 }
-function createdFrontmatter(defaults, input, initialState, mode) {
+function createdFrontmatter(defaults2, input, initialState, mode) {
   const frontmatter = mode !== "passthrough" ? {
     $schema: TASK_SCHEMA_ID,
     kind: TASK_KIND,
@@ -4458,7 +4565,7 @@ function createdFrontmatter(defaults, input, initialState, mode) {
     state: initialState
   };
   const reservedKeys = reservedFrontmatterKeys(mode);
-  for (const [key2, value] of Object.entries(defaults.metadata)) {
+  for (const [key2, value] of Object.entries(defaults2.metadata)) {
     if (!reservedKeys.has(key2)) {
       setOwnValue(frontmatter, key2, value);
     }
@@ -5204,13 +5311,13 @@ function matchesFilter(task, filter) {
   }
   return true;
 }
-function createTaskRecord(defaults, input, initialState) {
+function createTaskRecord(defaults2, input, initialState) {
   const taskRecord = Object.assign(/* @__PURE__ */ Object.create(null), {
     name: input.name,
     state: initialState,
     description: input.description ?? ""
   });
-  for (const [key2, value] of Object.entries(defaults.metadata)) {
+  for (const [key2, value] of Object.entries(defaults2.metadata)) {
     if (!RESERVED_TASK_KEYS.has(key2)) {
       taskRecord[key2] = value;
     }
@@ -6584,7 +6691,7 @@ function isMissingStateError(error3) {
 }
 
 // ../toolcraft/src/error-report.ts
-import { mkdir as mkdir2, realpath, writeFile as writeFile4 } from "node:fs/promises";
+import { mkdir as mkdir2, realpath as realpath2, writeFile as writeFile4 } from "node:fs/promises";
 import { randomUUID as randomUUID3 } from "node:crypto";
 import os from "node:os";
 import path13 from "node:path";
@@ -7103,19 +7210,24 @@ function createAuthStoreClientStore(options) {
     }
   };
 }
-function createNamedSecretStore(key2, options, defaults) {
+function createNamedSecretStore(key2, options, defaults2) {
   const hash = crypto.createHash("sha256").update(key2).digest("hex");
-  const parsedFilePath = options.fileStore?.filePath === void 0 ? null : path11.parse(options.fileStore.filePath);
+  const configuredFilePath = options.fileStore?.filePath;
+  const parsedFilePath = configuredFilePath === void 0 ? null : path11.parse(configuredFilePath);
   const fileStore = {
     ...options.fileStore,
-    salt: options.fileStore?.salt ?? defaults.salt,
-    defaultDirectory: parsedFilePath?.dir || options.fileStore?.defaultDirectory || defaults.directory,
+    filePath: parsedFilePath === null ? void 0 : path11.join(
+      parsedFilePath.dir,
+      `${parsedFilePath.name}-${hash}${parsedFilePath.ext || ".enc"}`
+    ),
+    salt: options.fileStore?.salt ?? defaults2.salt,
+    defaultDirectory: options.fileStore?.defaultDirectory || defaults2.directory,
     defaultFileName: parsedFilePath === null ? `${hash}.enc` : `${parsedFilePath.name}-${hash}${parsedFilePath.ext || ".enc"}`
   };
   const keychainStore = {
     ...options.keychainStore,
-    service: options.keychainStore?.service ?? defaults.service,
-    account: `${options.keychainStore?.account ?? defaults.accountPrefix}:${hash}`
+    service: options.keychainStore?.service ?? defaults2.service,
+    account: `${options.keychainStore?.account ?? defaults2.accountPrefix}:${hash}`
   };
   return createSecretStore({ ...options, fileStore, keychainStore }).store;
 }
@@ -8715,6 +8827,9 @@ var McpClient = class {
       const abortPromise = new Promise((_, reject) => {
         const rejectWithAbortReason = () => {
           sendCancellationNotification();
+          if (requestId !== void 0) {
+            messageLayer.cancelRequest(requestId, signal.reason);
+          }
           reject(signal.reason);
         };
         abortListener = rejectWithAbortReason;
@@ -8889,11 +9004,13 @@ var StdioTransport = class _StdioTransport {
     const child = this.child;
     this.readable = child.stdout;
     this.writable = child.stdin;
+    const stderrDecoder = new TextDecoder();
     child.stderr.on("data", (chunk) => {
-      this.stderrOutput += chunkToString(chunk);
-      if (this.stderrOutput.length > _StdioTransport.STDERR_MAX_LENGTH) {
-        this.stderrOutput = this.stderrOutput.slice(-_StdioTransport.STDERR_MAX_LENGTH);
-      }
+      const decoded = chunk instanceof Uint8Array ? stderrDecoder.decode(chunk, { stream: true }) : `${stderrDecoder.decode()}${String(chunk)}`;
+      this.appendStderrOutput(decoded);
+    });
+    child.stderr.once("end", () => {
+      this.appendStderrOutput(stderrDecoder.decode());
     });
     this.closed = new Promise((resolve) => {
       let settled = false;
@@ -8933,6 +9050,15 @@ var StdioTransport = class _StdioTransport {
   getStderrOutput() {
     return this.stderrOutput;
   }
+  appendStderrOutput(chunk) {
+    if (chunk.length === 0) {
+      return;
+    }
+    this.stderrOutput += chunk;
+    if (this.stderrOutput.length > _StdioTransport.STDERR_MAX_LENGTH) {
+      this.stderrOutput = this.stderrOutput.slice(-_StdioTransport.STDERR_MAX_LENGTH);
+    }
+  }
   dispose(reason = new Error("Stdio transport disposed")) {
     void reason;
     if (this.disposed) {
@@ -9340,15 +9466,6 @@ function serializeJsonRpcMessage(message2) {
   return `${JSON.stringify(message2)}
 `;
 }
-function chunkToString(chunk) {
-  if (typeof chunk === "string") {
-    return chunk;
-  }
-  if (chunk instanceof Uint8Array) {
-    return Buffer.from(chunk).toString("utf8");
-  }
-  return String(chunk);
-}
 function normalizeLine(line) {
   return line.endsWith("\r") ? line.slice(0, -1) : line;
 }
@@ -9538,6 +9655,16 @@ var JsonRpcMessageLayer = class {
       }
     });
   }
+  cancelRequest(requestId, reason) {
+    const pending = this.pendingRequests.get(requestId);
+    if (pending === void 0) {
+      return false;
+    }
+    this.pendingRequests.delete(requestId);
+    clearTimeout(pending.timeout);
+    pending.reject(reason);
+    return true;
+  }
   dispose(reason = new Error("JSON-RPC message layer disposed")) {
     if (this.disposedError !== void 0) {
       return;
@@ -10606,10 +10733,10 @@ function validateRenameMap2(name, tools, rename5) {
     }
   }
 }
-function createConnection(name, config) {
+function createConnection(name, config2) {
   const connection = {
     name,
-    config,
+    config: config2,
     async dispose() {
       shutdownDisposers.delete(connection.dispose);
       connection.connecting = void 0;
@@ -10676,13 +10803,13 @@ async function writeCache(cachePath, cache) {
   await assertCachePathHasNoSymlinks(cachePath);
   await rename2(tempPath, cachePath);
 }
-async function fetchCache(name, config) {
+async function fetchCache(name, config2) {
   const logger2 = createLogger((message2) => {
     process.stderr.write(`${message2}
 `);
   });
   logger2.info(`MCP ${name}: connecting`);
-  const client = await dialUpstream(name, config);
+  const client = await dialUpstream(name, config2);
   try {
     logger2.info(`MCP ${name}: listing tools`);
     const tools = [];
@@ -10701,7 +10828,7 @@ async function fetchCache(name, config) {
       $schema: MCP_PROXY_SCHEMA_URL,
       version: 1,
       upstream,
-      configFingerprint: fingerprintMcpServerConfig(config),
+      configFingerprint: fingerprintMcpServerConfig(config2),
       fetchedAt: (/* @__PURE__ */ new Date()).toISOString(),
       tools
     };
@@ -10771,8 +10898,8 @@ function isRefreshRequested(name, refresh) {
 }
 async function resolveSingleProxy(group, options) {
   const internal = getInternalGroupConfig2(group);
-  const config = internal.mcp;
-  if (config === void 0) {
+  const config2 = internal.mcp;
+  if (config2 === void 0) {
     return;
   }
   const name = group.name;
@@ -10782,21 +10909,21 @@ async function resolveSingleProxy(group, options) {
     let cache;
     let shouldWriteCache = false;
     if (isRefreshRequested(name, refresh)) {
-      cache = await fetchCache(name, config);
+      cache = await fetchCache(name, config2);
       shouldWriteCache = true;
     } else {
       const storedCache = await readCache(cachePath);
-      if (storedCache && cacheMatchesConfig(storedCache, config)) {
+      if (storedCache && cacheMatchesConfig(storedCache, config2)) {
         cache = storedCache;
       } else {
-        cache = await fetchCache(name, config);
+        cache = await fetchCache(name, config2);
         shouldWriteCache = true;
       }
     }
     const tools = filterAllowlistedTools(cache.tools, internal.tools);
     validateRenameMap2(name, tools, internal.rename);
     const previousConnection = getProxyConnection(group);
-    const nextConnection = createConnection(name, config);
+    const nextConnection = createConnection(name, config2);
     try {
       replaceProxyChildrenSafely(group, tools, internal.rename, nextConnection);
       if (shouldWriteCache) {
@@ -10821,11 +10948,11 @@ async function resolveSingleProxy(group, options) {
     );
   }
 }
-function cacheMatchesConfig(cache, config) {
-  return cache.configFingerprint === fingerprintMcpServerConfig(config);
+function cacheMatchesConfig(cache, config2) {
+  return cache.configFingerprint === fingerprintMcpServerConfig(config2);
 }
-function fingerprintMcpServerConfig(config) {
-  return createHash3("sha256").update(JSON.stringify(config)).digest("hex");
+function fingerprintMcpServerConfig(config2) {
+  return createHash3("sha256").update(JSON.stringify(config2)).digest("hex");
 }
 function collectProxyGroups(root) {
   const groups = [];
@@ -10903,20 +11030,20 @@ function parseRefreshEnv(value) {
   const names = trimmed.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
   return names.length === 0 ? void 0 : new Set(names);
 }
-async function dialUpstream(name, config) {
+async function dialUpstream(name, config2) {
   const client = new McpClient({
     clientInfo: {
       name: `${DEFAULT_CLIENT_INFO.name}-${name}`,
       version: DEFAULT_CLIENT_INFO.version
     }
   });
-  const transport = config.transport === "stdio" ? new StdioTransport({
-    command: config.command,
-    ...config.args === void 0 ? {} : { args: config.args },
-    ...config.env === void 0 ? {} : { env: config.env }
+  const transport = config2.transport === "stdio" ? new StdioTransport({
+    command: config2.command,
+    ...config2.args === void 0 ? {} : { args: config2.args },
+    ...config2.env === void 0 ? {} : { env: config2.env }
   }) : new HttpTransport({
-    url: config.url,
-    ...config.headers === void 0 ? {} : { headers: config.headers }
+    url: config2.url,
+    ...config2.headers === void 0 ? {} : { headers: config2.headers }
   });
   await client.connect(transport);
   return client;
@@ -10926,10 +11053,82 @@ async function resolveMcpProxies(root, options = {}) {
   await Promise.all(groups.map((group) => resolveSingleProxy(group, options)));
 }
 
+// ../toolcraft/src/redaction.ts
+var REDACTED_VALUE = "<redacted>";
+var SENSITIVE_NAME_PARTS = ["password", "token", "apikey", "secret"];
+var AUTHORIZATION_HEADER_NAMES = /* @__PURE__ */ new Set(["authorization", "proxyauthorization"]);
+var SECRET_HEADER_NAMES = /* @__PURE__ */ new Set(["cookie", "setcookie"]);
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeName(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]/g, "");
+}
+function isSensitiveName(name) {
+  const normalized = normalizeName(name);
+  return SENSITIVE_NAME_PARTS.some((candidate) => normalized.includes(candidate));
+}
+function redactSecretLikeFieldsValue(value, name, seen) {
+  if (name.length > 0 && isSensitiveName(name)) {
+    return REDACTED_VALUE;
+  }
+  if (Array.isArray(value)) {
+    if (seen.has(value)) {
+      return "[Circular]";
+    }
+    seen.add(value);
+    return value.map((entry) => redactSecretLikeFieldsValue(entry, name, seen));
+  }
+  if (isPlainObject2(value)) {
+    if (seen.has(value)) {
+      return "[Circular]";
+    }
+    seen.add(value);
+    return Object.fromEntries(
+      Object.entries(value).map(([key2, entry]) => [
+        key2,
+        redactSecretLikeFieldsValue(entry, key2, seen)
+      ])
+    );
+  }
+  return value;
+}
+function redactSecretLikeFields(value, name = "") {
+  return redactSecretLikeFieldsValue(value, name, /* @__PURE__ */ new WeakSet());
+}
+function parseJsonObjectOrArray(value) {
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(trimmed);
+    return isPlainObject2(parsed) || Array.isArray(parsed) ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function redactHttpBody(body) {
+  if (typeof body === "string") {
+    const parsed = parseJsonObjectOrArray(body);
+    return parsed === void 0 ? body : redactSecretLikeFields(parsed);
+  }
+  return redactSecretLikeFields(body);
+}
+function redactHttpHeaderValue(name, value) {
+  const normalized = normalizeName(name);
+  if (AUTHORIZATION_HEADER_NAMES.has(normalized)) {
+    return "Bearer ****";
+  }
+  if (SECRET_HEADER_NAMES.has(normalized) || isSensitiveName(name)) {
+    return REDACTED_VALUE;
+  }
+  return value;
+}
+
 // ../toolcraft/src/error-report.ts
 var ERROR_REPORTS_ENV = "TOOLCRAFT_ERROR_REPORTS";
-var DEFAULT_SENSITIVE_NAMES = ["password", "token", "apikey", "secret"];
-function isPlainObject2(value) {
+function isPlainObject3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function unwrapOptional(schema) {
@@ -10939,7 +11138,7 @@ function unwrapOptional(schema) {
   return schema;
 }
 function hasHttpContext(error3) {
-  return error3 instanceof Error && error3.name === "HttpError" && isPlainObject2(error3.request) && isPlainObject2(error3.response);
+  return error3 instanceof Error && error3.name === "HttpError" && isPlainObject3(error3.request) && isPlainObject3(error3.response);
 }
 function isSkippedError(error3) {
   if (error3 instanceof ApprovalDeclinedError) {
@@ -10976,8 +11175,8 @@ async function assertReportDirWithinProject(projectRoot, reportDir) {
     throw new Error("Error report directory resolves outside project root.");
   }
   const [canonicalProjectRoot, canonicalReportDir] = await Promise.all([
-    realpath(projectRoot),
-    realpath(reportDir)
+    realpath2(projectRoot),
+    realpath2(reportDir)
   ]);
   if (!isWithinDirectory(canonicalProjectRoot, canonicalReportDir)) {
     throw new Error("Error report directory resolves outside project root.");
@@ -11032,9 +11231,24 @@ function redactValue(value) {
   }
   return `<set, ${value.length} chars>`;
 }
-function isSensitiveName(name) {
-  const normalized = name.toLowerCase();
-  return DEFAULT_SENSITIVE_NAMES.some((candidate) => normalized.includes(candidate));
+function collectStringLeaves(value, output) {
+  if (typeof value === "string") {
+    if (value.length > 0) {
+      output.add(value);
+    }
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const entry of value) {
+      collectStringLeaves(entry, output);
+    }
+    return;
+  }
+  if (isPlainObject3(value)) {
+    for (const entry of Object.values(value)) {
+      collectStringLeaves(entry, output);
+    }
+  }
 }
 function schemaSecretValue(schema) {
   const unwrapped = unwrapOptional(schema);
@@ -11055,7 +11269,7 @@ function redactParamsValue(value, schema, name) {
     return "<redacted>";
   }
   const unwrapped = unwrapOptional(schema);
-  if (unwrapped.kind === "object" && isPlainObject2(value)) {
+  if (unwrapped.kind === "object" && isPlainObject3(value)) {
     return Object.fromEntries(
       Object.entries(value).map(([key2, childValue]) => {
         const childSchema = unwrapped.shape[key2];
@@ -11077,6 +11291,52 @@ function redactParams(params17, command) {
   }
   return redactParamsValue(params17, command.params, "");
 }
+function collectSensitiveParamValues(value, schema, name, output) {
+  if (shouldRedactParam(name, schema)) {
+    collectStringLeaves(value, output);
+    return;
+  }
+  const unwrapped = unwrapOptional(schema);
+  if (unwrapped.kind === "object" && isPlainObject3(value)) {
+    for (const [key2, childValue] of Object.entries(value)) {
+      const childSchema = unwrapped.shape[key2];
+      if (childSchema !== void 0) {
+        collectSensitiveParamValues(childValue, childSchema, key2, output);
+      }
+    }
+    return;
+  }
+  if (unwrapped.kind === "array" && Array.isArray(value)) {
+    for (const entry of value) {
+      collectSensitiveParamValues(entry, unwrapped.item, name, output);
+    }
+  }
+}
+function createReportStringRedactor(context, env) {
+  const values = /* @__PURE__ */ new Set();
+  for (const value of Object.values(context.secrets ?? {})) {
+    if (value !== void 0 && value.length > 0) {
+      values.add(value);
+    }
+  }
+  for (const [name, secret] of Object.entries(context.command?.secrets ?? {})) {
+    const value = context.secrets?.[name] ?? env[secret.env];
+    if (value !== void 0 && value.length > 0) {
+      values.add(value);
+    }
+  }
+  if (context.command !== void 0) {
+    collectSensitiveParamValues(context.params, context.command.params, "", values);
+  }
+  const orderedValues = [...values].sort((left, right) => right.length - left.length);
+  return (value) => {
+    let redacted = value;
+    for (const secretValue of orderedValues) {
+      redacted = redacted.split(secretValue).join("<redacted>");
+    }
+    return redacted;
+  };
+}
 function commandSecretEnvNames(secrets) {
   if (secrets === void 0) {
     return [];
@@ -11130,28 +11390,42 @@ function redactArgv(argv, options) {
 function stableJson(value) {
   return JSON.stringify(value, null, 2) ?? "undefined";
 }
-function redactStructuredErrorField(name, value) {
-  if (typeof value === "string" && name.toLowerCase() === "authorization") {
-    return "Bearer ****";
+function redactStructuredErrorField(name, value, redactString) {
+  if (typeof value === "string") {
+    const redactedHeaderValue = redactHttpHeaderValue(name, value);
+    if (redactedHeaderValue !== value) {
+      return redactedHeaderValue;
+    }
+    if (isSensitiveName(name)) {
+      return "<redacted>";
+    }
+    return redactString(value);
   }
   if (Array.isArray(value)) {
-    return value.map((entry) => redactStructuredErrorField(name, entry));
+    return value.map((entry) => redactStructuredErrorField(name, entry, redactString));
   }
-  if (isPlainObject2(value)) {
+  if (isPlainObject3(value)) {
     return Object.fromEntries(
-      Object.entries(value).map(([key2, entry]) => [key2, redactStructuredErrorField(key2, entry)])
+      Object.entries(value).map(([key2, entry]) => [
+        key2,
+        redactStructuredErrorField(key2, entry, redactString)
+      ])
     );
   }
   return value;
 }
-function ownStructuredFields(error3) {
+function ownStructuredFields(error3, redactString) {
   const fields = {};
   for (const key2 of Object.keys(error3)) {
     if (key2 === "name" || key2 === "message" || key2 === "stack" || key2 === "cause") {
       continue;
     }
     Object.defineProperty(fields, key2, {
-      value: redactStructuredErrorField(key2, error3[key2]),
+      value: redactStructuredErrorField(
+        key2,
+        error3[key2],
+        redactString
+      ),
       enumerable: true,
       configurable: true,
       writable: true
@@ -11159,43 +11433,44 @@ function ownStructuredFields(error3) {
   }
   return fields;
 }
-function formatStackChain(error3) {
+function formatStackChain(error3, redactString) {
   const lines = [];
   let current = error3;
   let index = 0;
   while (current !== void 0) {
     if (current instanceof Error) {
-      lines.push(
-        index === 0 ? current.stack ?? String(current) : `Caused by: ${current.stack ?? String(current)}`
-      );
+      const stack = current.stack ?? String(current);
+      lines.push(redactString(index === 0 ? stack : `Caused by: ${stack}`));
       current = current.cause;
     } else {
-      lines.push(index === 0 ? String(current) : `Caused by: ${String(current)}`);
+      const message2 = String(current);
+      lines.push(redactString(index === 0 ? message2 : `Caused by: ${message2}`));
       current = void 0;
     }
     index += 1;
   }
   return lines.join("\n");
 }
-function formatHeaderValue(name, value) {
-  return name.toLowerCase() === "authorization" ? "Bearer ****" : value;
+function formatHeaderValue(name, value, redactString) {
+  return redactString(redactHttpHeaderValue(name, value));
 }
-function formatHeaders(headers) {
-  return Object.entries(headers).map(([name, value]) => `${name}: ${formatHeaderValue(name, value)}`).join("\n");
+function formatHeaders(headers, redactString) {
+  return Object.entries(headers).map(([name, value]) => `${name}: ${formatHeaderValue(name, value, redactString)}`).join("\n");
 }
-function formatBody(body) {
-  if (typeof body === "string") {
-    return body;
+function formatBody(body, redactString) {
+  const redactedBody = redactHttpBody(body);
+  if (typeof redactedBody === "string") {
+    return redactString(redactedBody);
   }
-  return stableJson(body);
+  return redactString(stableJson(redactedBody));
 }
-function formatHttpTranscript(error3) {
+function formatHttpTranscript(error3, redactString) {
   const requestLines = [
     `${error3.request.method} ${error3.request.url}`,
-    formatHeaders(error3.request.headers)
+    formatHeaders(error3.request.headers, redactString)
   ].filter((line) => line.length > 0);
   if (error3.request.body !== void 0) {
-    requestLines.push("", formatBody(error3.request.body));
+    requestLines.push("", formatBody(error3.request.body, redactString));
   }
   return [
     "Request:",
@@ -11203,9 +11478,9 @@ function formatHttpTranscript(error3) {
     "",
     "Response:",
     `${error3.response.status} ${error3.response.statusText}`,
-    formatHeaders(error3.response.headers),
+    formatHeaders(error3.response.headers, redactString),
     "",
-    formatBody(error3.response.body)
+    formatBody(error3.response.body, redactString)
   ].join("\n");
 }
 function resolveToolcraftVersion(version) {
@@ -11214,9 +11489,10 @@ function resolveToolcraftVersion(version) {
 function buildReport(context) {
   const env = context.env ?? process.env;
   const error3 = context.error;
+  const redactString = createReportStringRedactor(context, env);
   const errorName = error3 instanceof Error ? error3.name : typeof error3;
-  const errorMessage = error3 instanceof Error ? error3.message : String(error3);
-  const structuredFields = error3 instanceof Error ? ownStructuredFields(error3) : {};
+  const errorMessage = redactString(error3 instanceof Error ? error3.message : String(error3));
+  const structuredFields = error3 instanceof Error ? ownStructuredFields(error3, redactString) : {};
   const secretLines = Object.entries(context.command?.secrets ?? {}).map(([name, secret]) => {
     const value = context.secrets?.[name] ?? env[secret.env];
     return `${secret.env}=${redactValue(value)}`;
@@ -11230,7 +11506,9 @@ function buildReport(context) {
     `platform: ${process.platform} ${process.arch}`,
     "",
     "Argv",
-    stableJson(redactArgv(context.argv, { command: context.command, secrets: context.secrets })),
+    redactString(
+      stableJson(redactArgv(context.argv, { command: context.command, secrets: context.secrets }))
+    ),
     "",
     "Resolved Secrets",
     ...secretLines.length === 0 ? ["<none>"] : secretLines,
@@ -11239,19 +11517,19 @@ function buildReport(context) {
     context.commandPath === void 0 || context.commandPath.length === 0 ? "root" : context.commandPath,
     "",
     "Parsed Params",
-    stableJson(redactParams(context.params, context.command)),
+    redactString(stableJson(redactParams(context.params, context.command))),
     "",
     "Error",
     `name: ${errorName}`,
     `message: ${errorMessage}`,
     "structured fields:",
-    stableJson(structuredFields),
+    redactString(stableJson(structuredFields)),
     "",
     "Stack",
-    formatStackChain(error3)
+    formatStackChain(error3, redactString)
   ];
   if (hasHttpContext(error3)) {
-    lines.push("", "HTTP Transcript", formatHttpTranscript(error3));
+    lines.push("", "HTTP Transcript", formatHttpTranscript(error3, redactString));
   }
   return `${lines.join("\n")}
 `;
@@ -11711,6 +11989,7 @@ ${rendered.join("\n")}`);
 }
 
 // ../toolcraft/src/cli.ts
+configureTheme({ brand: "blue", label: "Toolcraft" });
 var RESERVED_SERVICE_NAMES = /* @__PURE__ */ new Set([
   "params",
   "secrets",
@@ -13144,7 +13423,7 @@ function createEnv2(values = process.env) {
     }
   };
 }
-function isPlainObject3(value) {
+function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function hasFieldValue(value) {
@@ -13253,7 +13532,7 @@ async function loadPresetValues(fields, presetPath) {
       { cause: error3 }
     );
   }
-  if (!isPlainObject3(parsedPreset)) {
+  if (!isPlainObject4(parsedPreset)) {
     throw new UserError(`Preset file "${presetPath}" must contain a JSON object.`);
   }
   const fieldByPath = new Map(fields.map((field) => [field.displayPath, field]));
@@ -13272,7 +13551,7 @@ async function loadPresetValues(fields, presetPath) {
           `Preset file "${presetPath}" contains unknown parameter "${displayPath}".`
         );
       }
-      if (!isPlainObject3(value)) {
+      if (!isPlainObject4(value)) {
         throw new UserError(
           `Preset file "${presetPath}" has an invalid value for "${displayPath}". Expected an object, got ${describeReceived(value)}.`
         );
@@ -13315,8 +13594,8 @@ function matchesFixtureValue(expected, actual) {
     }
     return expected.every((item, index) => matchesFixtureValue(item, actual[index]));
   }
-  if (isPlainObject3(expected)) {
-    if (!isPlainObject3(actual)) {
+  if (isPlainObject4(expected)) {
+    if (!isPlainObject4(actual)) {
       return false;
     }
     return Object.entries(expected).every(
@@ -13379,9 +13658,9 @@ function createFixtureFetch(entries) {
   };
 }
 function createFixtureFs(definition) {
-  const fsDefinition = isPlainObject3(definition) ? definition : {};
-  const readFileEntries = isPlainObject3(fsDefinition.readFile) ? fsDefinition.readFile : {};
-  const existsEntries = isPlainObject3(fsDefinition.exists) ? fsDefinition.exists : {};
+  const fsDefinition = isPlainObject4(definition) ? definition : {};
+  const readFileEntries = isPlainObject4(fsDefinition.readFile) ? fsDefinition.readFile : {};
+  const existsEntries = isPlainObject4(fsDefinition.exists) ? fsDefinition.exists : {};
   return {
     readFile: async (filePath) => {
       if (Object.prototype.hasOwnProperty.call(readFileEntries, filePath)) {
@@ -13404,10 +13683,10 @@ function createFixtureFs(definition) {
 function resolveFixtureMethodResult(methodName, definition, args) {
   if (Array.isArray(definition)) {
     for (const entry of definition) {
-      if (!isPlainObject3(entry)) {
+      if (!isPlainObject4(entry)) {
         continue;
       }
-      const explicitMatcher = isPlainObject3(entry.request) ? entry.request : void 0;
+      const explicitMatcher = isPlainObject4(entry.request) ? entry.request : void 0;
       const matcher = explicitMatcher ?? Object.fromEntries(
         Object.entries(entry).filter(
           ([key2]) => key2 !== "result" && key2 !== "response" && key2 !== "error"
@@ -13419,7 +13698,7 @@ function resolveFixtureMethodResult(methodName, definition, args) {
         matched = matchesFixtureValue(matcher.args, args);
       } else if (Object.keys(matcher).length === 0) {
         matched = true;
-      } else if (isPlainObject3(firstArg)) {
+      } else if (isPlainObject4(firstArg)) {
         matched = matchesFixtureValue(matcher, firstArg);
       } else if (args.length === 1 && Object.keys(matcher).length === 1) {
         const [[, expectedValue]] = Object.entries(matcher);
@@ -13440,7 +13719,7 @@ function resolveFixtureMethodResult(methodName, definition, args) {
       return Promise.resolve(null);
     }
   }
-  if (isPlainObject3(definition)) {
+  if (isPlainObject4(definition)) {
     const firstArg = args[0];
     if (typeof firstArg === "string" && Object.prototype.hasOwnProperty.call(definition, firstArg)) {
       return Promise.resolve(definition[firstArg]);
@@ -13452,7 +13731,7 @@ function resolveFixtureMethodResult(methodName, definition, args) {
   return Promise.resolve(null);
 }
 function createFixtureService(definition) {
-  const methods = isPlainObject3(definition) ? definition : {};
+  const methods = isPlainObject4(definition) ? definition : {};
   return new Proxy(
     {},
     {
@@ -13550,7 +13829,7 @@ async function resolveFixtureRuntime(command, services, requirementOptions) {
     };
   }
   const scenario = await loadFixtureScenario(command, selector);
-  const scenarioServices = isPlainObject3(scenario.services) ? scenario.services : {};
+  const scenarioServices = isPlainObject4(scenario.services) ? scenario.services : {};
   const customServiceNames = /* @__PURE__ */ new Set([
     ...Object.keys(services),
     ...Object.keys(scenarioServices).filter((name) => !RESERVED_SERVICE_NAMES.has(name))
@@ -13832,7 +14111,7 @@ function finalizeDynamicValue(schema, value, displayPath, errors2) {
       if (itemSchema.kind !== "object") {
         return value;
       }
-      if (!isPlainObject3(value)) {
+      if (!isPlainObject4(value)) {
         errors2.push({
           path: displayPath,
           message: `Invalid value for "${displayPath}". Expected indexed object entries, got ${describeReceived(value)}.`
@@ -13867,7 +14146,7 @@ function finalizeDynamicValue(schema, value, displayPath, errors2) {
       );
     }
     case "object": {
-      if (!isPlainObject3(value)) {
+      if (!isPlainObject4(value)) {
         errors2.push({
           path: displayPath,
           message: `Invalid value for "${displayPath}". Expected an object, got ${describeReceived(value)}.`
@@ -13898,7 +14177,7 @@ function finalizeDynamicValue(schema, value, displayPath, errors2) {
       return result;
     }
     case "record": {
-      if (!isPlainObject3(value)) {
+      if (!isPlainObject4(value)) {
         errors2.push({
           path: displayPath,
           message: `Invalid value for "${displayPath}". Expected an object, got ${describeReceived(value)}.`
@@ -14324,10 +14603,10 @@ async function executeCommand(state, services, requirementOptions, runtimeOption
   }
 }
 function isStringRecord(value) {
-  return isPlainObject3(value) && Object.values(value).every((entry) => typeof entry === "string");
+  return isPlainObject4(value) && Object.values(value).every((entry) => typeof entry === "string");
 }
 function isHttpErrorLike(error3) {
-  if (!isPlainObject3(error3)) {
+  if (!isPlainObject4(error3)) {
     return false;
   }
   if (error3.name !== "HttpError" || typeof error3.message !== "string") {
@@ -14335,7 +14614,7 @@ function isHttpErrorLike(error3) {
   }
   const request = error3.request;
   const response = error3.response;
-  return isPlainObject3(request) && typeof request.method === "string" && typeof request.url === "string" && isStringRecord(request.headers) && isPlainObject3(response) && typeof response.status === "number" && typeof response.statusText === "string" && isStringRecord(response.headers) && "body" in response;
+  return isPlainObject4(request) && typeof request.method === "string" && typeof request.url === "string" && isStringRecord(request.headers) && isPlainObject4(response) && typeof response.status === "number" && typeof response.statusText === "string" && isStringRecord(response.headers) && "body" in response;
 }
 function hasTypedOptionalField(value, field, type2) {
   return !(field in value) || typeof value[field] === type2;
@@ -14344,7 +14623,7 @@ function isNonEmptyString(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
 function isProblemDetailsLike(body) {
-  if (!isPlainObject3(body)) {
+  if (!isPlainObject4(body)) {
     return false;
   }
   if (!hasTypedOptionalField(body, "type", "string")) {
@@ -14365,11 +14644,11 @@ function isProblemDetailsLike(body) {
   return isNonEmptyString(body.title) || isNonEmptyString(body.detail);
 }
 function isGraphQLErrorEnvelopeLike(body) {
-  if (!isPlainObject3(body) || !Array.isArray(body.errors) || body.errors.length === 0) {
+  if (!isPlainObject4(body) || !Array.isArray(body.errors) || body.errors.length === 0) {
     return false;
   }
   return body.errors.every((error3) => {
-    if (!isPlainObject3(error3) || typeof error3.message !== "string") {
+    if (!isPlainObject4(error3) || typeof error3.message !== "string") {
       return false;
     }
     if ("path" in error3) {
@@ -14379,7 +14658,7 @@ function isGraphQLErrorEnvelopeLike(body) {
       }
     }
     if ("extensions" in error3) {
-      if (!isPlainObject3(error3.extensions)) {
+      if (!isPlainObject4(error3.extensions)) {
         return false;
       }
       if ("code" in error3.extensions && typeof error3.extensions.code !== "string") {
@@ -14427,23 +14706,24 @@ function formatGraphQLErrorEnvelopeBody(body) {
   }).join("\n\n");
 }
 function formatHttpErrorBody(body) {
-  if (typeof body === "string") {
-    return body;
+  const redactedBody = redactHttpBody(body);
+  if (typeof redactedBody === "string") {
+    return redactedBody;
   }
-  if (isProblemDetailsLike(body)) {
-    return formatProblemDetailsBody(body);
+  if (isProblemDetailsLike(redactedBody)) {
+    return formatProblemDetailsBody(redactedBody);
   }
-  if (isGraphQLErrorEnvelopeLike(body)) {
-    return formatGraphQLErrorEnvelopeBody(body);
+  if (isGraphQLErrorEnvelopeLike(redactedBody)) {
+    return formatGraphQLErrorEnvelopeBody(redactedBody);
   }
-  const serialized = JSON.stringify(body, null, 2);
-  return serialized === void 0 ? String(body) : serialized;
+  const serialized = JSON.stringify(redactedBody, null, 2);
+  return serialized === void 0 ? String(redactedBody) : serialized;
 }
 function indentHttpErrorBlock(value) {
   return value.split("\n").map((line) => `  ${line}`).join("\n");
 }
 function formatHttpHeaderValue(name, value) {
-  return name.toLowerCase() === "authorization" ? "Bearer ****" : value;
+  return redactHttpHeaderValue(name, value);
 }
 function formatHttpErrorHeaders(headers) {
   return Object.entries(headers).map(
@@ -14461,7 +14741,11 @@ function renderHttpError(error3, options) {
   if (detailed) {
     lines.push("", "Request headers:", ...formatHttpErrorHeaders(error3.request.headers), "");
     if (error3.request.body !== void 0) {
-      lines.push("Request body:", indentHttpErrorBlock(formatHttpErrorBody(error3.request.body)), "");
+      lines.push(
+        "Request body:",
+        indentHttpErrorBlock(formatHttpErrorBody(error3.request.body)),
+        ""
+      );
     }
   }
   lines.push(
@@ -16616,11 +16900,11 @@ function resolveAgentSupport(input, registry = agentSkillConfigs) {
   if (!resolvedId) {
     return { status: "unknown", input };
   }
-  const config = registry[resolvedId];
-  if (!config) {
+  const config2 = registry[resolvedId];
+  if (!config2) {
     return { status: "unsupported", input, id: resolvedId };
   }
-  return { status: "supported", input, id: resolvedId, config: { ...config } };
+  return { status: "supported", input, id: resolvedId, config: { ...config2 } };
 }
 function getAgentConfig(agentId) {
   const support = resolveAgentSupport(agentId);
@@ -17952,14 +18236,14 @@ async function installSkill(agentId, skill, options) {
     throw new UnsupportedAgentError(agentId);
   }
   const scope = options.scope ?? "local";
-  const config = support.config;
+  const config2 = support.config;
   if (skill.name.length === 0 || skill.name === "." || skill.name === ".." || skill.name.includes("/") || skill.name.includes("\\") || skill.name.includes("\n") || skill.name.includes("\r")) {
     throw new Error(`Invalid skill name: ${skill.name}`);
   }
-  const skillDir = scope === "global" ? config.globalSkillDir : toHomeRelative(config.localSkillDir);
+  const skillDir = scope === "global" ? config2.globalSkillDir : toHomeRelative(config2.localSkillDir);
   const skillFolderPath = `${skillDir}/${skill.name}`;
   const skillFilePath = `${skillFolderPath}/SKILL.md`;
-  const displayPath = `${scope === "global" ? config.globalSkillDir : config.localSkillDir}/${skill.name}/SKILL.md`;
+  const displayPath = `${scope === "global" ? config2.globalSkillDir : config2.localSkillDir}/${skill.name}/SKILL.md`;
   const absoluteSkillPath = `${scope === "global" ? options.homeDir : options.cwd}/${skillFilePath.slice(2)}`;
   if (await pathExists2(options.fs, absoluteSkillPath)) {
     throw new Error(`Skill already exists: ${displayPath}`);
@@ -18080,17 +18364,17 @@ function resolveHomeRelativePath(targetPath, homeDir) {
   return targetPath;
 }
 function getSkillFolderWithHome(agent, scope, cwd, homeDir) {
-  const config = getAgentConfig(agent);
-  if (!config) {
+  const config2 = getAgentConfig(agent);
+  if (!config2) {
     throwUnsupportedAgent(agent);
   }
   return {
     displayPath: path22.join(
-      scope === "global" ? config.globalSkillDir : config.localSkillDir,
+      scope === "global" ? config2.globalSkillDir : config2.localSkillDir,
       TERMINAL_PILOT_SKILL_NAME
     ),
     fullPath: path22.join(
-      scope === "global" ? resolveHomeRelativePath(config.globalSkillDir, homeDir) : path22.resolve(cwd, config.localSkillDir),
+      scope === "global" ? resolveHomeRelativePath(config2.globalSkillDir, homeDir) : path22.resolve(cwd, config2.localSkillDir),
       TERMINAL_PILOT_SKILL_NAME
     )
   };
@@ -19407,6 +19691,7 @@ function createTerminalPilotGroup() {
 var terminalPilotGroup = Object.freeze(createTerminalPilotGroup());
 
 // src/cli.ts
+configureTheme({ brand: "green", label: "Terminal Pilot" });
 function normalizeArgv(argv) {
   if (argv.includes("--json") && !argv.some((argument) => argument === "--output" || argument.startsWith("--output="))) {
     return argv.flatMap((argument) => argument === "--json" ? ["--output", "json"] : [argument]);
@@ -19430,8 +19715,8 @@ async function isDirectExecution(argv) {
   try {
     const modulePath = fileURLToPath5(import.meta.url);
     const [resolvedEntryPoint, resolvedModulePath] = await Promise.all([
-      realpath2(path23.resolve(entryPoint)),
-      realpath2(modulePath)
+      realpath3(path23.resolve(entryPoint)),
+      realpath3(modulePath)
     ]);
     return resolvedEntryPoint === resolvedModulePath;
   } catch {