terminal-pilot 0.0.19 → 0.0.21

package/dist/commands/index.js

@@ -16,19 +16,19 @@ var ToolcraftBugError = class extends Error {
 };
 
 // ../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) {
@@ -58,12 +58,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
   };
 }
 
@@ -262,22 +262,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(rename2) {
@@ -399,57 +399,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;
@@ -552,10 +552,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,
@@ -564,10 +564,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: {},
@@ -2325,11 +2325,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);
@@ -2430,7 +2430,7 @@ var templateMutation = {
 // ../config-mutations/src/execution/apply-mutation.ts
 import path4 from "node:path";
 
-// ../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;
@@ -2444,7 +2444,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 },
@@ -2546,41 +2546,122 @@ function createColor(styles = []) {
 }
 var color = createColor();
 
-// ../design-system/src/tokens/colors.ts
-var dark = {
-  header: (text4) => color.magentaBright.bold(text4),
-  divider: (text4) => color.dim(text4),
-  prompt: (text4) => color.cyan(text4),
-  number: (text4) => color.cyanBright(text4),
-  intro: (text4) => color.bgMagenta.white(` Poe - ${text4} `),
-  resolvedSymbol: color.magenta("\u25C7"),
-  errorSymbol: color.red("\u25A0"),
-  accent: (text4) => color.cyan(text4),
-  muted: (text4) => color.dim(text4),
-  success: (text4) => color.green(text4),
-  warning: (text4) => color.yellow(text4),
-  error: (text4) => color.red(text4),
-  info: (text4) => color.magenta(text4),
-  badge: (text4) => color.bgYellow.black(` ${text4} `)
+// ../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: (text4) => color.hex("#a200ff").bold(text4),
-  divider: (text4) => color.hex("#666666")(text4),
-  prompt: (text4) => color.hex("#006699").bold(text4),
-  number: (text4) => color.hex("#0077cc").bold(text4),
-  intro: (text4) => color.bgHex("#a200ff").white(` Poe - ${text4} `),
-  resolvedSymbol: color.hex("#a200ff")("\u25C7"),
-  errorSymbol: color.hex("#cc0000")("\u25A0"),
-  accent: (text4) => color.hex("#006699").bold(text4),
-  muted: (text4) => color.hex("#666666")(text4),
-  success: (text4) => color.hex("#008800")(text4),
-  warning: (text4) => color.hex("#cc6600")(text4),
-  error: (text4) => color.hex("#cc0000")(text4),
-  info: (text4) => color.hex("#a200ff")(text4),
-  badge: (text4) => color.bgHex("#cc6600").white(` ${text4} `)
+
+// ../toolcraft-design/src/internal/theme-state.ts
+var defaults = {
+  brand: "purple",
+  label: "Poe"
 };
+var config = { ...defaults };
+var revision = 0;
+var brandConfigured = false;
+function getThemeConfig() {
+  return { ...config };
+}
+function getThemeRevision() {
+  return revision;
+}
+function isThemeBrandConfigured() {
+  return brandConfigured;
+}
 
-// ../design-system/src/internal/output-format.ts
+// ../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: (text4) => active2.bold(text4),
+        divider: (text4) => color.hex("#666666")(text4),
+        prompt: (text4) => prompt2.bold(text4),
+        number: (text4) => number2.bold(text4),
+        intro: (text4) => color.bgHex(activeBrand.primary).white(` ${getThemeConfig().label} - ${text4} `),
+        get resolvedSymbol() {
+          return active2("\u25C7");
+        },
+        get errorSymbol() {
+          return color.hex("#cc0000")("\u25A0");
+        },
+        accent: (text4) => prompt2.bold(text4),
+        muted: (text4) => color.hex("#666666")(text4),
+        success: (text4) => color.hex("#008800")(text4),
+        warning: (text4) => color.hex("#cc6600")(text4),
+        error: (text4) => color.hex("#cc0000")(text4),
+        info: (text4) => active2(text4),
+        badge: (text4) => color.bgHex("#cc6600").white(` ${text4} `)
+      },
+      {
+        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: (text4) => activeBright.bold(text4),
+      divider: (text4) => color.dim(text4),
+      prompt: (text4) => prompt(text4),
+      number: (text4) => number(text4),
+      intro: (text4) => activeBackground.white(` ${getThemeConfig().label} - ${text4} `),
+      get resolvedSymbol() {
+        return active("\u25C7");
+      },
+      get errorSymbol() {
+        return color.red("\u25A0");
+      },
+      accent: (text4) => prompt(text4),
+      muted: (text4) => color.dim(text4),
+      success: (text4) => color.green(text4),
+      warning: (text4) => color.yellow(text4),
+      error: (text4) => color.red(text4),
+      info: (text4) => active(text4),
+      badge: (text4) => color.bgYellow.black(` ${text4} `)
+    },
+    {
+      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");
+
+// ../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();
@@ -2598,7 +2679,7 @@ function resolveOutputFormat(env = process.env) {
   return cached;
 }
 
-// ../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") {
@@ -2635,17 +2716,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/symbols.ts
+// ../toolcraft-design/src/components/symbols.ts
 var symbols = {
   get info() {
     const format = resolveOutputFormat();
@@ -2699,12 +2793,12 @@ var symbols = {
   }
 };
 
-// ../design-system/src/internal/strip-ansi.ts
+// ../toolcraft-design/src/internal/strip-ansi.ts
 function stripAnsi2(value) {
   return value.replace(/\u001b\[[0-9;]*m/g, "");
 }
 
-// ../design-system/src/prompts/primitives/log.ts
+// ../toolcraft-design/src/prompts/primitives/log.ts
 function renderMarkdownInline(value) {
   return stripAnsi2(value).replaceAll("\r\n", " ").replaceAll("\n", " ").replaceAll("\r", " ");
 }
@@ -2831,7 +2925,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) {
@@ -2892,13 +2986,14 @@ 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" });
 
-// ../design-system/src/components/table.ts
+// ../toolcraft-design/src/components/table.ts
 var graphemeSegmenter2 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 
-// ../design-system/src/components/template.ts
+// ../toolcraft-design/src/components/template.ts
+var MAX_PARTIAL_DEPTH = 100;
 var HTML_ESCAPE = {
   "&": "&",
   "<": "&lt;",
@@ -2910,14 +3005,27 @@ var HTML_ESCAPE = {
   "=": "&#x3D;"
 };
 function renderTemplate(template, view, options = {}) {
-  const prepared = options.yield === void 0 ? template : template.split("{{yield}}").join(options.yield);
+  const prepared = options.yield === void 0 ? template : resolveTemplatePartials(template, options.partials ?? {}).split("{{yield}}").join(options.yield);
   const tokens = parseTemplate(prepared);
-  const escape = options.escape === "none" ? String : escapeHtml;
-  const preserveMissing = options.yield !== void 0 && options.escape === "none";
-  return renderTokens(tokens, { view }, prepared, escape, preserveMissing);
+  validatePartialReferences(tokens, options.partials ?? {}, []);
+  if (options.validate === true) {
+    const expanded = resolveTemplatePartials(prepared, options.partials ?? {});
+    validateVariables(parseTemplate(expanded), { view });
+  }
+  const state = {
+    escape: options.escape === "none" ? String : escapeHtml,
+    partials: options.partials ?? {},
+    partialStack: [],
+    preserveMissing: options.yield !== void 0 && options.escape === "none",
+    validate: options.validate === true
+  };
+  return renderTokens(tokens, { view }, prepared, state);
+}
+function resolveTemplatePartials(template, partials) {
+  return expandTemplatePartials(template, partials, []);
 }
-function renderTemplateInContext(template, context, escape, preserveMissing) {
-  return renderTokens(parseTemplate(template), context, template, escape, preserveMissing);
+function renderTemplateInContext(template, context, state) {
+  return renderTokens(parseTemplate(template), context, template, state);
 }
 function parseTemplate(template) {
   const root = [];
@@ -2940,9 +3048,6 @@ function parseTemplate(template) {
       index = standalone?.nextIndex ?? parsed.end;
       continue;
     }
-    if (parsed.kind === "partial") {
-      throw new Error(`Partials are not supported: "${parsed.name}"`);
-    }
     if (parsed.kind === "delimiter") {
       throw new Error("Custom delimiters are not supported");
     }
@@ -2960,6 +3065,15 @@ function parseTemplate(template) {
       index = standalone?.nextIndex ?? parsed.end;
       continue;
     }
+    if (parsed.kind === "partial") {
+      tokens.push({
+        type: "partial",
+        name: parsed.name,
+        indent: standalone === void 0 ? "" : template.slice(standalone.lineStart, open)
+      });
+      index = standalone?.nextIndex ?? parsed.end;
+      continue;
+    }
     if (parsed.kind === "close") {
       const frame2 = stack.pop();
       if (frame2 === void 0) {
@@ -3030,7 +3144,7 @@ function getStandalone(template, tagStart, tagEnd, kind) {
   }
   return void 0;
 }
-function renderTokens(tokens, context, template, escape, preserveMissing) {
+function renderTokens(tokens, context, template, state) {
   let output = "";
   for (const token of tokens) {
     switch (token.type) {
@@ -3039,32 +3153,62 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
         continue;
       case "name":
       case "unescaped": {
-        const value = lookup2(context, token.name);
-        if (value == null) {
-          if (preserveMissing) {
+        const result = lookup2(context, token.name);
+        if (!result.hit || result.value == null) {
+          if (state.validate) {
+            throw new Error(`Template variable "${token.name}" not found.`);
+          }
+          if (state.preserveMissing) {
             output += token.raw;
           }
           continue;
         }
-        const rendered = String(value);
-        output += token.type === "name" ? escape(rendered) : rendered;
+        const rendered = String(result.value);
+        output += token.type === "name" ? state.escape(rendered) : rendered;
+        continue;
+      }
+      case "partial": {
+        if (!Object.hasOwn(state.partials, token.name)) {
+          throw new Error(`Partial "${token.name}" not found.`);
+        }
+        if (state.partialStack.includes(token.name)) {
+          throw new Error(
+            `Circular partial reference detected: ${[...state.partialStack, token.name].join(" -> ")}.`
+          );
+        }
+        if (state.partialStack.length >= MAX_PARTIAL_DEPTH) {
+          throw new Error(`Maximum partial depth exceeded (${MAX_PARTIAL_DEPTH}).`);
+        }
+        const partial = indentPartial(state.partials[token.name], token.indent);
+        output += renderTokens(parseTemplate(partial), context, partial, {
+          ...state,
+          partialStack: [...state.partialStack, token.name]
+        });
         continue;
       }
       case "inverted": {
-        const value = lookup2(context, token.name);
+        const result = lookup2(context, token.name);
+        if (!result.hit && state.validate) {
+          throw new Error(`Template variable "${token.name}" not found.`);
+        }
+        const value = result.value;
         if (!value || Array.isArray(value) && value.length === 0) {
-          output += renderTokens(token.children, context, template, escape, preserveMissing);
+          output += renderTokens(token.children, context, template, state);
         }
         continue;
       }
       case "section": {
-        const value = lookup2(context, token.name);
+        const result = lookup2(context, token.name);
+        if (!result.hit && state.validate) {
+          throw new Error(`Template variable "${token.name}" not found.`);
+        }
+        const value = result.value;
         if (!value) {
           continue;
         }
         if (Array.isArray(value)) {
           for (const item of value) {
-            output += renderTokens(token.children, pushContext(context, item), template, escape, preserveMissing);
+            output += renderTokens(token.children, pushContext(context, item), template, state);
           }
           continue;
         }
@@ -3073,7 +3217,7 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
           const rendered = value.call(
             context.view,
             raw,
-            (nextTemplate) => renderTemplateInContext(nextTemplate, context, escape, preserveMissing)
+            (nextTemplate) => renderTemplateInContext(nextTemplate, context, state)
           );
           if (rendered != null) {
             output += String(rendered);
@@ -3081,10 +3225,10 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
           continue;
         }
         if (typeof value === "object" || typeof value === "string" || typeof value === "number") {
-          output += renderTokens(token.children, pushContext(context, value), template, escape, preserveMissing);
+          output += renderTokens(token.children, pushContext(context, value), template, state);
           continue;
         }
-        output += renderTokens(token.children, context, template, escape, preserveMissing);
+        output += renderTokens(token.children, context, template, state);
       }
     }
   }
@@ -3092,17 +3236,115 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
 }
 function lookup2(context, name) {
   if (name === ".") {
-    return callLambda(context.view, context.view);
+    return { hit: true, value: callLambda(context.view, context.view) };
   }
   let cursor = context;
   while (cursor !== void 0) {
     const result = name.includes(".") ? lookupDotted(cursor.view, name) : lookupName(cursor.view, name);
     if (result.hit) {
-      return callLambda(result.value, cursor.view);
+      return { hit: true, value: callLambda(result.value, cursor.view) };
     }
     cursor = cursor.parent;
   }
-  return void 0;
+  return { hit: false, value: void 0 };
+}
+function validateVariables(tokens, context) {
+  for (const token of tokens) {
+    if (token.type === "text" || token.type === "partial") {
+      continue;
+    }
+    if (token.type === "name" || token.type === "unescaped") {
+      if (!lookup2(context, token.name).hit) {
+        throw new Error(`Template variable "${token.name}" not found.`);
+      }
+      continue;
+    }
+    if (token.type !== "section" && token.type !== "inverted") {
+      continue;
+    }
+    const result = lookup2(context, token.name);
+    if (!result.hit) {
+      throw new Error(`Template variable "${token.name}" not found.`);
+    }
+    if (Array.isArray(result.value) && result.value.length > 0) {
+      for (const item of result.value) {
+        validateVariables(token.children, pushContext(context, item));
+      }
+      continue;
+    }
+    if (typeof result.value === "object" && result.value !== null || typeof result.value === "string" || typeof result.value === "number") {
+      validateVariables(token.children, pushContext(context, result.value));
+      continue;
+    }
+    validateVariables(token.children, context);
+  }
+}
+function validatePartialReferences(tokens, partials, partialStack) {
+  for (const token of tokens) {
+    if (token.type === "section" || token.type === "inverted") {
+      validatePartialReferences(token.children, partials, partialStack);
+      continue;
+    }
+    if (token.type !== "partial") {
+      continue;
+    }
+    if (!Object.hasOwn(partials, token.name)) {
+      throw new Error(`Partial "${token.name}" not found.`);
+    }
+    if (partialStack.includes(token.name)) {
+      throw new Error(
+        `Circular partial reference detected: ${[...partialStack, token.name].join(" -> ")}.`
+      );
+    }
+    if (partialStack.length >= MAX_PARTIAL_DEPTH) {
+      throw new Error(`Maximum partial depth exceeded (${MAX_PARTIAL_DEPTH}).`);
+    }
+    validatePartialReferences(parseTemplate(partials[token.name]), partials, [
+      ...partialStack,
+      token.name
+    ]);
+  }
+}
+function indentPartial(partial, indent) {
+  if (indent === "") {
+    return partial;
+  }
+  return partial.split("\n").map((line) => line === "" ? "" : `${indent}${line}`).join("\n");
+}
+function expandTemplatePartials(template, partials, partialStack) {
+  let output = "";
+  let index = 0;
+  while (index < template.length) {
+    const open = template.indexOf("{{", index);
+    if (open === -1) {
+      output += template.slice(index);
+      break;
+    }
+    const parsed = parseTag(template, open);
+    if (parsed.kind !== "partial") {
+      output += template.slice(index, parsed.end);
+      index = parsed.end;
+      continue;
+    }
+    if (!Object.hasOwn(partials, parsed.name)) {
+      throw new Error(`Partial "${parsed.name}" not found.`);
+    }
+    if (partialStack.includes(parsed.name)) {
+      throw new Error(
+        `Circular partial reference detected: ${[...partialStack, parsed.name].join(" -> ")}.`
+      );
+    }
+    if (partialStack.length >= MAX_PARTIAL_DEPTH) {
+      throw new Error(`Maximum partial depth exceeded (${MAX_PARTIAL_DEPTH}).`);
+    }
+    const standalone = getStandalone(template, open, parsed.end, parsed.kind);
+    const beforePartial = standalone === void 0 ? template.slice(index, open) : template.slice(index, standalone.lineStart);
+    const indent = standalone === void 0 ? "" : template.slice(standalone.lineStart, open);
+    const partial = indentPartial(partials[parsed.name], indent);
+    output += beforePartial + expandTemplatePartials(partial, partials, [...partialStack, parsed.name]);
+    index = standalone?.nextIndex ?? parsed.end;
+  }
+  return output;
 }
 function lookupName(view, name) {
   if (!isPropertyContainer(view) || !hasProperty(view, name)) {
@@ -3162,22 +3404,22 @@ function hasProperty(value, key) {
   return Object.prototype.hasOwnProperty.call(value, key);
 }
 
-// ../design-system/src/components/browser.ts
+// ../toolcraft-design/src/components/browser.ts
 import { spawn as spawn2 } 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;
@@ -3186,13 +3428,13 @@ 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";
 
-// ../design-system/src/static/spinner.ts
+// ../toolcraft-design/src/static/spinner.ts
 var SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
 
 // ../config-mutations/src/formats/json.ts
@@ -3231,6 +3473,13 @@ function cloneConfigValue(value) {
 function isConfigObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function detectIndent(content) {
+  const match = content.match(/^[\t ]+/m);
+  if (match) {
+    return match[0];
+  }
+  return "  ";
+}
 function parse3(content) {
   if (!content || content.trim() === "") {
     return {};
@@ -3270,6 +3519,9 @@ function merge(base, patch) {
   }
   return result;
 }
+function configValuesEqual(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
 function prune(obj, shape) {
   let changed = false;
   const result = cloneConfigObject(obj);
@@ -3306,9 +3558,56 @@ function prune(obj, shape) {
   }
   return { changed, result };
 }
+function modifyAtPath(content, path10, value) {
+  const indent = detectIndent(content);
+  const formattingOptions = {
+    tabSize: indent === "	" ? 1 : indent.length,
+    insertSpaces: indent !== "	",
+    eol: "\n"
+  };
+  const edits = jsonc.modify(content, path10, value, { formattingOptions });
+  let result = jsonc.applyEdits(content, edits);
+  if (!result.endsWith("\n")) {
+    result += "\n";
+  }
+  return result;
+}
+function removeAtPath(content, path10) {
+  return modifyAtPath(content, path10, void 0);
+}
+function serializeUpdate(content, current, next) {
+  let result = content || "{}";
+  result = applyObjectUpdate(result, [], current, next);
+  if (!result.endsWith("\n")) {
+    result += "\n";
+  }
+  return result;
+}
+function applyObjectUpdate(content, path10, current, next) {
+  let result = content;
+  for (const key of Object.keys(current)) {
+    if (!hasConfigEntry(next, key)) {
+      result = removeAtPath(result, [...path10, key]);
+    }
+  }
+  for (const [key, nextValue] of Object.entries(next)) {
+    const nextPath = [...path10, key];
+    const hasCurrent = hasConfigEntry(current, key);
+    const currentValue = hasCurrent ? current[key] : void 0;
+    if (hasCurrent && isConfigObject(currentValue) && isConfigObject(nextValue)) {
+      result = applyObjectUpdate(result, nextPath, currentValue, nextValue);
+      continue;
+    }
+    if (!hasCurrent || !configValuesEqual(currentValue, nextValue)) {
+      result = modifyAtPath(result, nextPath, nextValue);
+    }
+  }
+  return result;
+}
 var jsonFormat = {
   parse: parse3,
   serialize,
+  serializeUpdate,
   merge,
   prune
 };
@@ -3690,7 +3989,7 @@ function pruneKeysByPrefix(table, prefix) {
   const result = {};
   for (const [key, value] of Object.entries(table)) {
     if (!key.startsWith(prefix)) {
-      result[key] = value;
+      setConfigEntry(result, key, value);
     }
   }
   return result;
@@ -3699,28 +3998,43 @@ function isConfigObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function mergeWithPruneByPrefix(base, patch, pruneByPrefix) {
-  const result = { ...base };
+  const result = cloneConfigObject(base);
   const prefixMap = pruneByPrefix ?? {};
   for (const [key, value] of Object.entries(patch)) {
+    if (value === void 0) {
+      continue;
+    }
     const current = result[key];
     const prefix = prefixMap[key];
     if (isConfigObject4(current) && isConfigObject4(value)) {
       if (prefix) {
         const pruned = pruneKeysByPrefix(current, prefix);
-        result[key] = { ...pruned, ...value };
+        setConfigEntry(result, key, mergePrunedConfigObject(pruned, value));
       } else {
-        result[key] = mergeWithPruneByPrefix(
-          current,
-          value,
-          prefixMap
-        );
+        setConfigEntry(result, key, mergeWithPruneByPrefix(current, value, prefixMap));
       }
       continue;
     }
-    result[key] = value;
+    setConfigEntry(result, key, value);
+  }
+  return result;
+}
+function mergePrunedConfigObject(base, patch) {
+  const result = cloneConfigObject(base);
+  for (const [key, value] of Object.entries(patch)) {
+    if (value === void 0) {
+      continue;
+    }
+    setConfigEntry(result, key, value);
   }
   return result;
 }
+function serializeConfigUpdate(format, rawContent, current, next) {
+  if (rawContent !== null && format.serializeUpdate) {
+    return format.serializeUpdate(rawContent, current, next);
+  }
+  return format.serialize(next);
+}
 async function applyMutation(mutation, context, options) {
   switch (mutation.kind) {
     case "ensureDirectory":
@@ -4033,6 +4347,7 @@ async function applyConfigMerge(mutation, context, options) {
   }
   const format = getConfigFormat(formatName);
   const rawContent = await readFileIfExists(context.fs, targetPath);
+  let preserveContent = rawContent;
   let current;
   try {
     current = rawContent === null ? {} : format.parse(rawContent);
@@ -4041,6 +4356,7 @@ async function applyConfigMerge(mutation, context, options) {
       await backupInvalidDocument(context, targetPath, rawContent);
     }
     current = {};
+    preserveContent = null;
   }
   const value = resolveValue(mutation.value, options);
   let merged;
@@ -4049,7 +4365,7 @@ async function applyConfigMerge(mutation, context, options) {
   } else {
     merged = format.merge(current, value);
   }
-  const serialized = format.serialize(merged);
+  const serialized = serializeConfigUpdate(format, preserveContent, current, merged);
   const changed = serialized !== rawContent;
   if (changed && !context.dryRun) {
     await writeAtomically(context, targetPath, serialized);
@@ -4117,7 +4433,7 @@ async function applyConfigPrune(mutation, context, options) {
       details
     };
   }
-  const serialized = format.serialize(result);
+  const serialized = serializeConfigUpdate(format, rawContent, current, result);
   if (!context.dryRun) {
     await writeAtomically(context, targetPath, serialized);
   }
@@ -4142,6 +4458,7 @@ async function applyConfigTransform(mutation, context, options) {
   }
   const format = getConfigFormat(formatName);
   const rawContent = await readFileIfExists(context.fs, targetPath);
+  let preserveContent = rawContent;
   let current;
   try {
     current = rawContent === null ? {} : format.parse(rawContent);
@@ -4150,6 +4467,7 @@ async function applyConfigTransform(mutation, context, options) {
       await backupInvalidDocument(context, targetPath, rawContent);
     }
     current = {};
+    preserveContent = null;
   }
   const { content: transformed, changed } = mutation.transform(current, options);
   if (!changed) {
@@ -4173,7 +4491,7 @@ async function applyConfigTransform(mutation, context, options) {
       details
     };
   }
-  const serialized = format.serialize(transformed);
+  const serialized = serializeConfigUpdate(format, preserveContent, current, transformed);
   if (!context.dryRun) {
     await writeAtomically(context, targetPath, serialized);
   }
@@ -4350,14 +4668,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}`);
@@ -4478,17 +4796,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: path9.join(
-      scope === "global" ? config.globalSkillDir : config.localSkillDir,
+      scope === "global" ? config2.globalSkillDir : config2.localSkillDir,
       TERMINAL_PILOT_SKILL_NAME
     ),
     fullPath: path9.join(
-      scope === "global" ? resolveHomeRelativePath(config.globalSkillDir, homeDir) : path9.resolve(cwd, config.localSkillDir),
+      scope === "global" ? resolveHomeRelativePath(config2.globalSkillDir, homeDir) : path9.resolve(cwd, config2.localSkillDir),
       TERMINAL_PILOT_SKILL_NAME
     )
   };