@quikcommit/cli 10.0.0 → 11.0.0

package/dist/index.js

@@ -585,13 +585,13 @@ var require_identity = __commonJS({
 var require_visit = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/visit.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var BREAK = /* @__PURE__ */ Symbol("break visit");
     var SKIP = /* @__PURE__ */ Symbol("skip children");
     var REMOVE = /* @__PURE__ */ Symbol("remove node");
     function visit(node, visitor) {
       const visitor_ = initVisitor(visitor);
-      if (identity.isDocument(node)) {
+      if (identity2.isDocument(node)) {
         const cd = visit_(null, node.contents, visitor_, Object.freeze([node]));
         if (cd === REMOVE)
           node.contents = null;
@@ -603,12 +603,12 @@ var require_visit = __commonJS({
     visit.REMOVE = REMOVE;
     function visit_(key, node, visitor, path) {
       const ctrl = callVisitor(key, node, visitor, path);
-      if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
+      if (identity2.isNode(ctrl) || identity2.isPair(ctrl)) {
         replaceNode(key, path, ctrl);
         return visit_(key, ctrl, visitor, path);
       }
       if (typeof ctrl !== "symbol") {
-        if (identity.isCollection(node)) {
+        if (identity2.isCollection(node)) {
           path = Object.freeze(path.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
             const ci = visit_(i, node.items[i], visitor, path);
@@ -621,7 +621,7 @@ var require_visit = __commonJS({
               i -= 1;
             }
           }
-        } else if (identity.isPair(node)) {
+        } else if (identity2.isPair(node)) {
           path = Object.freeze(path.concat(node));
           const ck = visit_("key", node.key, visitor, path);
           if (ck === BREAK)
@@ -639,7 +639,7 @@ var require_visit = __commonJS({
     }
     async function visitAsync(node, visitor) {
       const visitor_ = initVisitor(visitor);
-      if (identity.isDocument(node)) {
+      if (identity2.isDocument(node)) {
         const cd = await visitAsync_(null, node.contents, visitor_, Object.freeze([node]));
         if (cd === REMOVE)
           node.contents = null;
@@ -651,12 +651,12 @@ var require_visit = __commonJS({
     visitAsync.REMOVE = REMOVE;
     async function visitAsync_(key, node, visitor, path) {
       const ctrl = await callVisitor(key, node, visitor, path);
-      if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
+      if (identity2.isNode(ctrl) || identity2.isPair(ctrl)) {
         replaceNode(key, path, ctrl);
         return visitAsync_(key, ctrl, visitor, path);
       }
       if (typeof ctrl !== "symbol") {
-        if (identity.isCollection(node)) {
+        if (identity2.isCollection(node)) {
           path = Object.freeze(path.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
             const ci = await visitAsync_(i, node.items[i], visitor, path);
@@ -669,7 +669,7 @@ var require_visit = __commonJS({
               i -= 1;
             }
           }
-        } else if (identity.isPair(node)) {
+        } else if (identity2.isPair(node)) {
           path = Object.freeze(path.concat(node));
           const ck = await visitAsync_("key", node.key, visitor, path);
           if (ck === BREAK)
@@ -706,31 +706,31 @@ var require_visit = __commonJS({
     function callVisitor(key, node, visitor, path) {
       if (typeof visitor === "function")
         return visitor(key, node, path);
-      if (identity.isMap(node))
+      if (identity2.isMap(node))
         return visitor.Map?.(key, node, path);
-      if (identity.isSeq(node))
+      if (identity2.isSeq(node))
         return visitor.Seq?.(key, node, path);
-      if (identity.isPair(node))
+      if (identity2.isPair(node))
         return visitor.Pair?.(key, node, path);
-      if (identity.isScalar(node))
+      if (identity2.isScalar(node))
         return visitor.Scalar?.(key, node, path);
-      if (identity.isAlias(node))
+      if (identity2.isAlias(node))
         return visitor.Alias?.(key, node, path);
       return void 0;
     }
     function replaceNode(key, path, node) {
       const parent = path[path.length - 1];
-      if (identity.isCollection(parent)) {
+      if (identity2.isCollection(parent)) {
         parent.items[key] = node;
-      } else if (identity.isPair(parent)) {
+      } else if (identity2.isPair(parent)) {
         if (key === "key")
           parent.key = node;
         else
           parent.value = node;
-      } else if (identity.isDocument(parent)) {
+      } else if (identity2.isDocument(parent)) {
         parent.contents = node;
       } else {
-        const pt = identity.isAlias(parent) ? "alias" : "scalar";
+        const pt = identity2.isAlias(parent) ? "alias" : "scalar";
         throw new Error(`Cannot replace node with ${pt} parent`);
       }
     }
@@ -743,7 +743,7 @@ var require_visit = __commonJS({
 var require_directives = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/doc/directives.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var visit = require_visit();
     var escapeChars = {
       "!": "%21",
@@ -886,10 +886,10 @@ var require_directives = __commonJS({
         const lines = this.yaml.explicit ? [`%YAML ${this.yaml.version || "1.2"}`] : [];
         const tagEntries = Object.entries(this.tags);
         let tagNames;
-        if (doc && tagEntries.length > 0 && identity.isNode(doc.contents)) {
+        if (doc && tagEntries.length > 0 && identity2.isNode(doc.contents)) {
           const tags = {};
           visit.visit(doc.contents, (_key, node) => {
-            if (identity.isNode(node) && node.tag)
+            if (identity2.isNode(node) && node.tag)
               tags[node.tag] = true;
           });
           tagNames = Object.keys(tags);
@@ -914,7 +914,7 @@ var require_directives = __commonJS({
 var require_anchors = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/doc/anchors.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var visit = require_visit();
     function anchorIsValid(anchor) {
       if (/[\x00-\x19\s,[\]{}]/.test(anchor)) {
@@ -961,7 +961,7 @@ var require_anchors = __commonJS({
         setAnchors: () => {
           for (const source of aliasObjects) {
             const ref = sourceObjects.get(source);
-            if (typeof ref === "object" && ref.anchor && (identity.isScalar(ref.node) || identity.isCollection(ref.node))) {
+            if (typeof ref === "object" && ref.anchor && (identity2.isScalar(ref.node) || identity2.isCollection(ref.node))) {
               ref.node.anchor = ref.anchor;
             } else {
               const error = new Error("Failed to resolve repeated object (this should not happen)");
@@ -1034,12 +1034,12 @@ var require_applyReviver = __commonJS({
 var require_toJS = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/nodes/toJS.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     function toJS(value, arg, ctx) {
       if (Array.isArray(value))
         return value.map((v, i) => toJS(v, String(i), ctx));
       if (value && typeof value.toJSON === "function") {
-        if (!ctx || !identity.hasAnchor(value))
+        if (!ctx || !identity2.hasAnchor(value))
           return value.toJSON(arg, ctx);
         const data = { aliasCount: 0, count: 1, res: void 0 };
         ctx.anchors.set(value, data);
@@ -1065,11 +1065,11 @@ var require_Node = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/nodes/Node.js"(exports2) {
     "use strict";
     var applyReviver = require_applyReviver();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var toJS = require_toJS();
     var NodeBase = class {
       constructor(type) {
-        Object.defineProperty(this, identity.NODE_TYPE, { value: type });
+        Object.defineProperty(this, identity2.NODE_TYPE, { value: type });
       }
       /** Create a copy of this node.  */
       clone() {
@@ -1080,7 +1080,7 @@ var require_Node = __commonJS({
       }
       /** A plain JavaScript representation of this node. */
       toJS(doc, { mapAsMap, maxAliasCount, onAnchor, reviver } = {}) {
-        if (!identity.isDocument(doc))
+        if (!identity2.isDocument(doc))
           throw new TypeError("A document argument is required");
         const ctx = {
           anchors: /* @__PURE__ */ new Map(),
@@ -1107,12 +1107,12 @@ var require_Alias = __commonJS({
     "use strict";
     var anchors = require_anchors();
     var visit = require_visit();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Node = require_Node();
     var toJS = require_toJS();
     var Alias = class extends Node.NodeBase {
       constructor(source) {
-        super(identity.ALIAS);
+        super(identity2.ALIAS);
         this.source = source;
         Object.defineProperty(this, "tag", {
           set() {
@@ -1134,7 +1134,7 @@ var require_Alias = __commonJS({
           nodes = [];
           visit.visit(doc, {
             Node: (_key, node) => {
-              if (identity.isAlias(node) || identity.hasAnchor(node))
+              if (identity2.isAlias(node) || identity2.hasAnchor(node))
                 nodes.push(node);
             }
           });
@@ -1194,11 +1194,11 @@ var require_Alias = __commonJS({
       }
     };
     function getAliasCount(doc, node, anchors2) {
-      if (identity.isAlias(node)) {
+      if (identity2.isAlias(node)) {
         const source = node.resolve(doc);
         const anchor = anchors2 && source && anchors2.get(source);
         return anchor ? anchor.count * anchor.aliasCount : 0;
-      } else if (identity.isCollection(node)) {
+      } else if (identity2.isCollection(node)) {
         let count = 0;
         for (const item of node.items) {
           const c = getAliasCount(doc, item, anchors2);
@@ -1206,7 +1206,7 @@ var require_Alias = __commonJS({
             count = c;
         }
         return count;
-      } else if (identity.isPair(node)) {
+      } else if (identity2.isPair(node)) {
         const kc = getAliasCount(doc, node.key, anchors2);
         const vc = getAliasCount(doc, node.value, anchors2);
         return Math.max(kc, vc);
@@ -1221,13 +1221,13 @@ var require_Alias = __commonJS({
 var require_Scalar = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/nodes/Scalar.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Node = require_Node();
     var toJS = require_toJS();
     var isScalarValue = (value) => !value || typeof value !== "function" && typeof value !== "object";
     var Scalar = class extends Node.NodeBase {
       constructor(value) {
-        super(identity.SCALAR);
+        super(identity2.SCALAR);
         this.value = value;
       }
       toJSON(arg, ctx) {
@@ -1252,7 +1252,7 @@ var require_createNode = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/doc/createNode.js"(exports2) {
     "use strict";
     var Alias = require_Alias();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Scalar = require_Scalar();
     var defaultTagPrefix = "tag:yaml.org,2002:";
     function findTagObject(value, tagName, tags) {
@@ -1266,12 +1266,12 @@ var require_createNode = __commonJS({
       return tags.find((t) => t.identify?.(value) && !t.format);
     }
     function createNode(value, tagName, ctx) {
-      if (identity.isDocument(value))
+      if (identity2.isDocument(value))
         value = value.contents;
-      if (identity.isNode(value))
+      if (identity2.isNode(value))
         return value;
-      if (identity.isPair(value)) {
-        const map = ctx.schema[identity.MAP].createNode?.(ctx.schema, null, ctx);
+      if (identity2.isPair(value)) {
+        const map = ctx.schema[identity2.MAP].createNode?.(ctx.schema, null, ctx);
         map.items.push(value);
         return map;
       }
@@ -1303,7 +1303,7 @@ var require_createNode = __commonJS({
             ref.node = node2;
           return node2;
         }
-        tagObj = value instanceof Map ? schema[identity.MAP] : Symbol.iterator in Object(value) ? schema[identity.SEQ] : schema[identity.MAP];
+        tagObj = value instanceof Map ? schema[identity2.MAP] : Symbol.iterator in Object(value) ? schema[identity2.SEQ] : schema[identity2.MAP];
       }
       if (onTagObj) {
         onTagObj(tagObj);
@@ -1327,7 +1327,7 @@ var require_Collection = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/nodes/Collection.js"(exports2) {
     "use strict";
     var createNode = require_createNode();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Node = require_Node();
     function collectionFromPath(schema, path, value) {
       let v = value;
@@ -1371,7 +1371,7 @@ var require_Collection = __commonJS({
         const copy = Object.create(Object.getPrototypeOf(this), Object.getOwnPropertyDescriptors(this));
         if (schema)
           copy.schema = schema;
-        copy.items = copy.items.map((it) => identity.isNode(it) || identity.isPair(it) ? it.clone(schema) : it);
+        copy.items = copy.items.map((it) => identity2.isNode(it) || identity2.isPair(it) ? it.clone(schema) : it);
         if (this.range)
           copy.range = this.range.slice();
         return copy;
@@ -1387,7 +1387,7 @@ var require_Collection = __commonJS({
         else {
           const [key, ...rest] = path;
           const node = this.get(key, true);
-          if (identity.isCollection(node))
+          if (identity2.isCollection(node))
             node.addIn(rest, value);
           else if (node === void 0 && this.schema)
             this.set(key, collectionFromPath(this.schema, rest, value));
@@ -1404,7 +1404,7 @@ var require_Collection = __commonJS({
         if (rest.length === 0)
           return this.delete(key);
         const node = this.get(key, true);
-        if (identity.isCollection(node))
+        if (identity2.isCollection(node))
           return node.deleteIn(rest);
         else
           throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
@@ -1418,16 +1418,16 @@ var require_Collection = __commonJS({
         const [key, ...rest] = path;
         const node = this.get(key, true);
         if (rest.length === 0)
-          return !keepScalar && identity.isScalar(node) ? node.value : node;
+          return !keepScalar && identity2.isScalar(node) ? node.value : node;
         else
-          return identity.isCollection(node) ? node.getIn(rest, keepScalar) : void 0;
+          return identity2.isCollection(node) ? node.getIn(rest, keepScalar) : void 0;
       }
       hasAllNullValues(allowScalar) {
         return this.items.every((node) => {
-          if (!identity.isPair(node))
+          if (!identity2.isPair(node))
             return false;
           const n = node.value;
-          return n == null || allowScalar && identity.isScalar(n) && n.value == null && !n.commentBefore && !n.comment && !n.tag;
+          return n == null || allowScalar && identity2.isScalar(n) && n.value == null && !n.commentBefore && !n.comment && !n.tag;
         });
       }
       /**
@@ -1438,7 +1438,7 @@ var require_Collection = __commonJS({
         if (rest.length === 0)
           return this.has(key);
         const node = this.get(key, true);
-        return identity.isCollection(node) ? node.hasIn(rest) : false;
+        return identity2.isCollection(node) ? node.hasIn(rest) : false;
       }
       /**
        * Sets a value in this collection. For `!!set`, `value` needs to be a
@@ -1450,7 +1450,7 @@ var require_Collection = __commonJS({
           this.set(key, value);
         } else {
           const node = this.get(key, true);
-          if (identity.isCollection(node))
+          if (identity2.isCollection(node))
             node.setIn(rest, value);
           else if (node === void 0 && this.schema)
             this.set(key, collectionFromPath(this.schema, rest, value));
@@ -1906,7 +1906,7 @@ var require_stringify = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/stringify/stringify.js"(exports2) {
     "use strict";
     var anchors = require_anchors();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var stringifyComment = require_stringifyComment();
     var stringifyString = require_stringifyString();
     function createStringifyContext(doc, options) {
@@ -1959,7 +1959,7 @@ var require_stringify = __commonJS({
       }
       let tagObj = void 0;
       let obj;
-      if (identity.isScalar(item)) {
+      if (identity2.isScalar(item)) {
         obj = item.value;
         let match = tags.filter((t) => t.identify?.(obj));
         if (match.length > 1) {
@@ -1982,7 +1982,7 @@ var require_stringify = __commonJS({
       if (!doc.directives)
         return "";
       const props = [];
-      const anchor = (identity.isScalar(node) || identity.isCollection(node)) && node.anchor;
+      const anchor = (identity2.isScalar(node) || identity2.isCollection(node)) && node.anchor;
       if (anchor && anchors.anchorIsValid(anchor)) {
         anchors$1.add(anchor);
         props.push(`&${anchor}`);
@@ -1993,9 +1993,9 @@ var require_stringify = __commonJS({
       return props.join(" ");
     }
     function stringify(item, ctx, onComment, onChompKeep) {
-      if (identity.isPair(item))
+      if (identity2.isPair(item))
         return item.toString(ctx, onComment, onChompKeep);
-      if (identity.isAlias(item)) {
+      if (identity2.isAlias(item)) {
         if (ctx.doc.directives)
           return item.toString(ctx);
         if (ctx.resolvedAliases?.has(item)) {
@@ -2009,15 +2009,15 @@ var require_stringify = __commonJS({
         }
       }
       let tagObj = void 0;
-      const node = identity.isNode(item) ? item : ctx.doc.createNode(item, { onTagObj: (o) => tagObj = o });
+      const node = identity2.isNode(item) ? item : ctx.doc.createNode(item, { onTagObj: (o) => tagObj = o });
       tagObj ?? (tagObj = getTagObject(ctx.doc.schema.tags, node));
       const props = stringifyProps(node, tagObj, ctx);
       if (props.length > 0)
         ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;
-      const str = typeof tagObj.stringify === "function" ? tagObj.stringify(node, ctx, onComment, onChompKeep) : identity.isScalar(node) ? stringifyString.stringifyString(node, ctx, onComment, onChompKeep) : node.toString(ctx, onComment, onChompKeep);
+      const str = typeof tagObj.stringify === "function" ? tagObj.stringify(node, ctx, onComment, onChompKeep) : identity2.isScalar(node) ? stringifyString.stringifyString(node, ctx, onComment, onChompKeep) : node.toString(ctx, onComment, onChompKeep);
       if (!props)
         return str;
-      return identity.isScalar(node) || str[0] === "{" || str[0] === "[" ? `${props} ${str}` : `${props}
+      return identity2.isScalar(node) || str[0] === "{" || str[0] === "[" ? `${props} ${str}` : `${props}
 ${ctx.indent}${str}`;
     }
     exports2.createStringifyContext = createStringifyContext;
@@ -2029,23 +2029,23 @@ ${ctx.indent}${str}`;
 var require_stringifyPair = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/stringify/stringifyPair.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Scalar = require_Scalar();
     var stringify = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
       const { allNullValues, doc, indent, indentStep, options: { commentString, indentSeq, simpleKeys } } = ctx;
-      let keyComment = identity.isNode(key) && key.comment || null;
+      let keyComment = identity2.isNode(key) && key.comment || null;
       if (simpleKeys) {
         if (keyComment) {
           throw new Error("With simple keys, key nodes cannot have comments");
         }
-        if (identity.isCollection(key) || !identity.isNode(key) && typeof key === "object") {
+        if (identity2.isCollection(key) || !identity2.isNode(key) && typeof key === "object") {
           const msg = "With simple keys, collection cannot be used as a key value";
           throw new Error(msg);
         }
       }
-      let explicitKey = !simpleKeys && (!key || keyComment && value == null && !ctx.inFlow || identity.isCollection(key) || (identity.isScalar(key) ? key.type === Scalar.Scalar.BLOCK_FOLDED || key.type === Scalar.Scalar.BLOCK_LITERAL : typeof key === "object"));
+      let explicitKey = !simpleKeys && (!key || keyComment && value == null && !ctx.inFlow || identity2.isCollection(key) || (identity2.isScalar(key) ? key.type === Scalar.Scalar.BLOCK_FOLDED || key.type === Scalar.Scalar.BLOCK_LITERAL : typeof key === "object"));
       ctx = Object.assign({}, ctx, {
         allNullValues: false,
         implicitKey: !explicitKey && (simpleKeys || !allNullValues),
@@ -2086,7 +2086,7 @@ ${indent}:`;
           str += stringifyComment.lineComment(str, ctx.indent, commentString(keyComment));
       }
       let vsb, vcb, valueComment;
-      if (identity.isNode(value)) {
+      if (identity2.isNode(value)) {
         vsb = !!value.spaceBefore;
         vcb = value.commentBefore;
         valueComment = value.comment;
@@ -2098,10 +2098,10 @@ ${indent}:`;
           value = doc.createNode(value);
       }
       ctx.implicitKey = false;
-      if (!explicitKey && !keyComment && identity.isScalar(value))
+      if (!explicitKey && !keyComment && identity2.isScalar(value))
         ctx.indentAtStart = str.length + 1;
       chompKeep = false;
-      if (!indentSeq && indentStep.length >= 2 && !ctx.inFlow && !explicitKey && identity.isSeq(value) && !value.flow && !value.tag && !value.anchor) {
+      if (!indentSeq && indentStep.length >= 2 && !ctx.inFlow && !explicitKey && identity2.isSeq(value) && !value.flow && !value.tag && !value.anchor) {
         ctx.indent = ctx.indent.substring(2);
       }
       let valueCommentDone = false;
@@ -2121,7 +2121,7 @@ ${stringifyComment.indentComment(cs, ctx.indent)}`;
           ws += `
 ${ctx.indent}`;
         }
-      } else if (!explicitKey && identity.isCollection(value)) {
+      } else if (!explicitKey && identity2.isCollection(value)) {
         const vs0 = valueStr[0];
         const nl0 = valueStr.indexOf("\n");
         const hasNewline = nl0 !== -1;
@@ -2184,7 +2184,7 @@ var require_log = __commonJS({
 var require_merge = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/yaml-1.1/merge.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Scalar = require_Scalar();
     var MERGE_KEY = "<<";
     var merge = {
@@ -2197,10 +2197,10 @@ var require_merge = __commonJS({
       }),
       stringify: () => MERGE_KEY
     };
-    var isMergeKey = (ctx, key) => (merge.identify(key) || identity.isScalar(key) && (!key.type || key.type === Scalar.Scalar.PLAIN) && merge.identify(key.value)) && ctx?.doc.schema.tags.some((tag) => tag.tag === merge.tag && tag.default);
+    var isMergeKey = (ctx, key) => (merge.identify(key) || identity2.isScalar(key) && (!key.type || key.type === Scalar.Scalar.PLAIN) && merge.identify(key.value)) && ctx?.doc.schema.tags.some((tag) => tag.tag === merge.tag && tag.default);
     function addMergeToJSMap(ctx, map, value) {
       const source = resolveAliasValue(ctx, value);
-      if (identity.isSeq(source))
+      if (identity2.isSeq(source))
         for (const it of source.items)
           mergeValue(ctx, map, it);
       else if (Array.isArray(source))
@@ -2211,7 +2211,7 @@ var require_merge = __commonJS({
     }
     function mergeValue(ctx, map, value) {
       const source = resolveAliasValue(ctx, value);
-      if (!identity.isMap(source))
+      if (!identity2.isMap(source))
         throw new Error("Merge sources must be maps or map aliases");
       const srcMap = source.toJSON(null, ctx, Map);
       for (const [key, value2] of srcMap) {
@@ -2232,7 +2232,7 @@ var require_merge = __commonJS({
       return map;
     }
     function resolveAliasValue(ctx, value) {
-      return ctx && identity.isAlias(value) ? value.resolve(ctx.doc, ctx) : value;
+      return ctx && identity2.isAlias(value) ? value.resolve(ctx.doc, ctx) : value;
     }
     exports2.addMergeToJSMap = addMergeToJSMap;
     exports2.isMergeKey = isMergeKey;
@@ -2247,10 +2247,10 @@ var require_addPairToJSMap = __commonJS({
     var log = require_log();
     var merge = require_merge();
     var stringify = require_stringify();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var toJS = require_toJS();
     function addPairToJSMap(ctx, map, { key, value }) {
-      if (identity.isNode(key) && key.addToJSMap)
+      if (identity2.isNode(key) && key.addToJSMap)
         key.addToJSMap(ctx, map, value);
       else if (merge.isMergeKey(ctx, key))
         merge.addMergeToJSMap(ctx, map, value);
@@ -2281,7 +2281,7 @@ var require_addPairToJSMap = __commonJS({
         return "";
       if (typeof jsKey !== "object")
         return String(jsKey);
-      if (identity.isNode(key) && ctx?.doc) {
+      if (identity2.isNode(key) && ctx?.doc) {
         const strCtx = stringify.createStringifyContext(ctx.doc, {});
         strCtx.anchors = /* @__PURE__ */ new Set();
         for (const node of ctx.anchors.keys())
@@ -2311,7 +2311,7 @@ var require_Pair = __commonJS({
     var createNode = require_createNode();
     var stringifyPair = require_stringifyPair();
     var addPairToJSMap = require_addPairToJSMap();
-    var identity = require_identity();
+    var identity2 = require_identity();
     function createPair(key, value, ctx) {
       const k = createNode.createNode(key, void 0, ctx);
       const v = createNode.createNode(value, void 0, ctx);
@@ -2319,15 +2319,15 @@ var require_Pair = __commonJS({
     }
     var Pair = class _Pair {
       constructor(key, value = null) {
-        Object.defineProperty(this, identity.NODE_TYPE, { value: identity.PAIR });
+        Object.defineProperty(this, identity2.NODE_TYPE, { value: identity2.PAIR });
         this.key = key;
         this.value = value;
       }
       clone(schema) {
         let { key, value } = this;
-        if (identity.isNode(key))
+        if (identity2.isNode(key))
           key = key.clone(schema);
-        if (identity.isNode(value))
+        if (identity2.isNode(value))
           value = value.clone(schema);
         return new _Pair(key, value);
       }
@@ -2348,7 +2348,7 @@ var require_Pair = __commonJS({
 var require_stringifyCollection = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/stringify/stringifyCollection.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var stringify = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyCollection(collection, ctx, options) {
@@ -2364,14 +2364,14 @@ var require_stringifyCollection = __commonJS({
       for (let i = 0; i < items.length; ++i) {
         const item = items[i];
         let comment2 = null;
-        if (identity.isNode(item)) {
+        if (identity2.isNode(item)) {
           if (!chompKeep && item.spaceBefore)
             lines.push("");
           addCommentBefore(ctx, lines, item.commentBefore, chompKeep);
           if (item.comment)
             comment2 = item.comment;
-        } else if (identity.isPair(item)) {
-          const ik = identity.isNode(item.key) ? item.key : null;
+        } else if (identity2.isPair(item)) {
+          const ik = identity2.isNode(item.key) ? item.key : null;
           if (ik) {
             if (!chompKeep && ik.spaceBefore)
               lines.push("");
@@ -2419,14 +2419,14 @@ ${indent}${line}` : "\n";
       for (let i = 0; i < items.length; ++i) {
         const item = items[i];
         let comment = null;
-        if (identity.isNode(item)) {
+        if (identity2.isNode(item)) {
           if (item.spaceBefore)
             lines.push("");
           addCommentBefore(ctx, lines, item.commentBefore, false);
           if (item.comment)
             comment = item.comment;
-        } else if (identity.isPair(item)) {
-          const ik = identity.isNode(item.key) ? item.key : null;
+        } else if (identity2.isPair(item)) {
+          const ik = identity2.isNode(item.key) ? item.key : null;
           if (ik) {
             if (ik.spaceBefore)
               lines.push("");
@@ -2434,7 +2434,7 @@ ${indent}${line}` : "\n";
             if (ik.comment)
               reqNewline = true;
           }
-          const iv = identity.isNode(item.value) ? item.value : null;
+          const iv = identity2.isNode(item.value) ? item.value : null;
           if (iv) {
             if (iv.comment)
               comment = iv.comment;
@@ -2502,16 +2502,16 @@ var require_YAMLMap = __commonJS({
     var stringifyCollection = require_stringifyCollection();
     var addPairToJSMap = require_addPairToJSMap();
     var Collection = require_Collection();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Pair = require_Pair();
     var Scalar = require_Scalar();
     function findPair(items, key) {
-      const k = identity.isScalar(key) ? key.value : key;
+      const k = identity2.isScalar(key) ? key.value : key;
       for (const it of items) {
-        if (identity.isPair(it)) {
+        if (identity2.isPair(it)) {
           if (it.key === key || it.key === k)
             return it;
-          if (identity.isScalar(it.key) && it.key.value === k)
+          if (identity2.isScalar(it.key) && it.key.value === k)
             return it;
         }
       }
@@ -2522,7 +2522,7 @@ var require_YAMLMap = __commonJS({
         return "tag:yaml.org,2002:map";
       }
       constructor(schema) {
-        super(identity.MAP, schema);
+        super(identity2.MAP, schema);
         this.items = [];
       }
       /**
@@ -2560,7 +2560,7 @@ var require_YAMLMap = __commonJS({
        */
       add(pair, overwrite) {
         let _pair;
-        if (identity.isPair(pair))
+        if (identity2.isPair(pair))
           _pair = pair;
         else if (!pair || typeof pair !== "object" || !("key" in pair)) {
           _pair = new Pair.Pair(pair, pair?.value);
@@ -2571,7 +2571,7 @@ var require_YAMLMap = __commonJS({
         if (prev) {
           if (!overwrite)
             throw new Error(`Key ${_pair.key} already set`);
-          if (identity.isScalar(prev.value) && Scalar.isScalarValue(_pair.value))
+          if (identity2.isScalar(prev.value) && Scalar.isScalarValue(_pair.value))
             prev.value.value = _pair.value;
           else
             prev.value = _pair.value;
@@ -2595,7 +2595,7 @@ var require_YAMLMap = __commonJS({
       get(key, keepScalar) {
         const it = findPair(this.items, key);
         const node = it?.value;
-        return (!keepScalar && identity.isScalar(node) ? node.value : node) ?? void 0;
+        return (!keepScalar && identity2.isScalar(node) ? node.value : node) ?? void 0;
       }
       has(key) {
         return !!findPair(this.items, key);
@@ -2620,7 +2620,7 @@ var require_YAMLMap = __commonJS({
         if (!ctx)
           return JSON.stringify(this);
         for (const item of this.items) {
-          if (!identity.isPair(item))
+          if (!identity2.isPair(item))
             throw new Error(`Map items must all be pairs; found ${JSON.stringify(item)} instead`);
         }
         if (!ctx.allNullValues && this.hasAllNullValues(false))
@@ -2643,7 +2643,7 @@ var require_YAMLMap = __commonJS({
 var require_map = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/common/map.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var YAMLMap = require_YAMLMap();
     var map = {
       collection: "map",
@@ -2651,7 +2651,7 @@ var require_map = __commonJS({
       nodeClass: YAMLMap.YAMLMap,
       tag: "tag:yaml.org,2002:map",
       resolve(map2, onError) {
-        if (!identity.isMap(map2))
+        if (!identity2.isMap(map2))
           onError("Expected a mapping for this tag");
         return map2;
       },
@@ -2668,7 +2668,7 @@ var require_YAMLSeq = __commonJS({
     var createNode = require_createNode();
     var stringifyCollection = require_stringifyCollection();
     var Collection = require_Collection();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Scalar = require_Scalar();
     var toJS = require_toJS();
     var YAMLSeq = class extends Collection.Collection {
@@ -2676,7 +2676,7 @@ var require_YAMLSeq = __commonJS({
         return "tag:yaml.org,2002:seq";
       }
       constructor(schema) {
-        super(identity.SEQ, schema);
+        super(identity2.SEQ, schema);
         this.items = [];
       }
       add(value) {
@@ -2702,7 +2702,7 @@ var require_YAMLSeq = __commonJS({
         if (typeof idx !== "number")
           return void 0;
         const it = this.items[idx];
-        return !keepScalar && identity.isScalar(it) ? it.value : it;
+        return !keepScalar && identity2.isScalar(it) ? it.value : it;
       }
       /**
        * Checks if the collection includes a value with the key `key`.
@@ -2726,7 +2726,7 @@ var require_YAMLSeq = __commonJS({
         if (typeof idx !== "number")
           throw new Error(`Expected a valid index, not ${key}.`);
         const prev = this.items[idx];
-        if (identity.isScalar(prev) && Scalar.isScalarValue(value))
+        if (identity2.isScalar(prev) && Scalar.isScalarValue(value))
           prev.value = value;
         else
           this.items[idx] = value;
@@ -2768,7 +2768,7 @@ var require_YAMLSeq = __commonJS({
       }
     };
     function asItemIndex(key) {
-      let idx = identity.isScalar(key) ? key.value : key;
+      let idx = identity2.isScalar(key) ? key.value : key;
       if (idx && typeof idx === "string")
         idx = Number(idx);
       return typeof idx === "number" && Number.isInteger(idx) && idx >= 0 ? idx : null;
@@ -2781,7 +2781,7 @@ var require_YAMLSeq = __commonJS({
 var require_seq = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/common/seq.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var YAMLSeq = require_YAMLSeq();
     var seq = {
       collection: "seq",
@@ -2789,7 +2789,7 @@ var require_seq = __commonJS({
       nodeClass: YAMLSeq.YAMLSeq,
       tag: "tag:yaml.org,2002:seq",
       resolve(seq2, onError) {
-        if (!identity.isSeq(seq2))
+        if (!identity2.isSeq(seq2))
           onError("Expected a sequence for this tag");
         return seq2;
       },
@@ -3143,17 +3143,17 @@ var require_binary = __commonJS({
 var require_pairs = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/yaml-1.1/pairs.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Pair = require_Pair();
     var Scalar = require_Scalar();
     var YAMLSeq = require_YAMLSeq();
     function resolvePairs(seq, onError) {
-      if (identity.isSeq(seq)) {
+      if (identity2.isSeq(seq)) {
         for (let i = 0; i < seq.items.length; ++i) {
           let item = seq.items[i];
-          if (identity.isPair(item))
+          if (identity2.isPair(item))
             continue;
-          else if (identity.isMap(item)) {
+          else if (identity2.isMap(item)) {
             if (item.items.length > 1)
               onError("Each pair must have its own sequence indicator");
             const pair = item.items[0] || new Pair.Pair(new Scalar.Scalar(null));
@@ -3167,7 +3167,7 @@ ${cn.comment}` : item.comment;
             }
             item = pair;
           }
-          seq.items[i] = identity.isPair(item) ? item : new Pair.Pair(item);
+          seq.items[i] = identity2.isPair(item) ? item : new Pair.Pair(item);
         }
       } else
         onError("Expected a sequence for this tag");
@@ -3221,7 +3221,7 @@ ${cn.comment}` : item.comment;
 var require_omap = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/yaml-1.1/omap.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var toJS = require_toJS();
     var YAMLMap = require_YAMLMap();
     var YAMLSeq = require_YAMLSeq();
@@ -3248,7 +3248,7 @@ var require_omap = __commonJS({
           ctx.onCreate(map);
         for (const pair of this.items) {
           let key, value;
-          if (identity.isPair(pair)) {
+          if (identity2.isPair(pair)) {
             key = toJS.toJS(pair.key, "", ctx);
             value = toJS.toJS(pair.value, key, ctx);
           } else {
@@ -3278,7 +3278,7 @@ var require_omap = __commonJS({
         const pairs$1 = pairs.resolvePairs(seq, onError);
         const seenKeys = [];
         for (const { key } of pairs$1.items) {
-          if (identity.isScalar(key)) {
+          if (identity2.isScalar(key)) {
             if (seenKeys.includes(key.value)) {
               onError(`Ordered maps must not include duplicate keys: ${key.value}`);
             } else {
@@ -3459,7 +3459,7 @@ var require_int2 = __commonJS({
 var require_set = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/yaml-1.1/set.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Pair = require_Pair();
     var YAMLMap = require_YAMLMap();
     var YAMLSet = class _YAMLSet extends YAMLMap.YAMLMap {
@@ -3469,7 +3469,7 @@ var require_set = __commonJS({
       }
       add(key) {
         let pair;
-        if (identity.isPair(key))
+        if (identity2.isPair(key))
           pair = key;
         else if (key && typeof key === "object" && "key" in key && "value" in key && key.value === null)
           pair = new Pair.Pair(key.key, null);
@@ -3485,7 +3485,7 @@ var require_set = __commonJS({
        */
       get(key, keepPair) {
         const pair = YAMLMap.findPair(this.items, key);
-        return !keepPair && identity.isPair(pair) ? identity.isScalar(pair.key) ? pair.key.value : pair.key : pair;
+        return !keepPair && identity2.isPair(pair) ? identity2.isScalar(pair.key) ? pair.key.value : pair.key : pair;
       }
       set(key, value) {
         if (typeof value !== "boolean")
@@ -3529,7 +3529,7 @@ var require_set = __commonJS({
       tag: "tag:yaml.org,2002:set",
       createNode: (schema, iterable, ctx) => YAMLSet.from(schema, iterable, ctx),
       resolve(map, onError) {
-        if (identity.isMap(map)) {
+        if (identity2.isMap(map)) {
           if (map.hasAllNullValues(true))
             return Object.assign(new YAMLSet(), map);
           else
@@ -3774,7 +3774,7 @@ var require_tags = __commonJS({
 var require_Schema = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/schema/Schema.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var map = require_map();
     var seq = require_seq();
     var string = require_string();
@@ -3787,9 +3787,9 @@ var require_Schema = __commonJS({
         this.knownTags = resolveKnownTags ? tags.coreKnownTags : {};
         this.tags = tags.getTags(customTags, this.name, merge);
         this.toStringOptions = toStringDefaults ?? null;
-        Object.defineProperty(this, identity.MAP, { value: map.map });
-        Object.defineProperty(this, identity.SCALAR, { value: string.string });
-        Object.defineProperty(this, identity.SEQ, { value: seq.seq });
+        Object.defineProperty(this, identity2.MAP, { value: map.map });
+        Object.defineProperty(this, identity2.SCALAR, { value: string.string });
+        Object.defineProperty(this, identity2.SEQ, { value: seq.seq });
         this.sortMapEntries = typeof sortMapEntries === "function" ? sortMapEntries : sortMapEntries === true ? sortMapEntriesByKey : null;
       }
       clone() {
@@ -3806,7 +3806,7 @@ var require_Schema = __commonJS({
 var require_stringifyDocument = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/stringify/stringifyDocument.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var stringify = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyDocument(doc, options) {
@@ -3833,7 +3833,7 @@ var require_stringifyDocument = __commonJS({
       let chompKeep = false;
       let contentComment = null;
       if (doc.contents) {
-        if (identity.isNode(doc.contents)) {
+        if (identity2.isNode(doc.contents)) {
           if (doc.contents.spaceBefore && hasDirectives)
             lines.push("");
           if (doc.contents.commentBefore) {
@@ -3888,7 +3888,7 @@ var require_Document = __commonJS({
     "use strict";
     var Alias = require_Alias();
     var Collection = require_Collection();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Pair = require_Pair();
     var toJS = require_toJS();
     var Schema = require_Schema();
@@ -3903,7 +3903,7 @@ var require_Document = __commonJS({
         this.comment = null;
         this.errors = [];
         this.warnings = [];
-        Object.defineProperty(this, identity.NODE_TYPE, { value: identity.DOC });
+        Object.defineProperty(this, identity2.NODE_TYPE, { value: identity2.DOC });
         let _replacer = null;
         if (typeof replacer === "function" || Array.isArray(replacer)) {
           _replacer = replacer;
@@ -3939,7 +3939,7 @@ var require_Document = __commonJS({
        */
       clone() {
         const copy = Object.create(_Document.prototype, {
-          [identity.NODE_TYPE]: { value: identity.DOC }
+          [identity2.NODE_TYPE]: { value: identity2.DOC }
         });
         copy.commentBefore = this.commentBefore;
         copy.comment = this.comment;
@@ -3949,7 +3949,7 @@ var require_Document = __commonJS({
         if (this.directives)
           copy.directives = this.directives.clone();
         copy.schema = this.schema.clone();
-        copy.contents = identity.isNode(this.contents) ? this.contents.clone(copy.schema) : this.contents;
+        copy.contents = identity2.isNode(this.contents) ? this.contents.clone(copy.schema) : this.contents;
         if (this.range)
           copy.range = this.range.slice();
         return copy;
@@ -4012,7 +4012,7 @@ var require_Document = __commonJS({
           sourceObjects
         };
         const node = createNode.createNode(value, tag, ctx);
-        if (flow && identity.isCollection(node))
+        if (flow && identity2.isCollection(node))
           node.flow = true;
         setAnchors();
         return node;
@@ -4052,7 +4052,7 @@ var require_Document = __commonJS({
        * `true` (collections are always returned intact).
        */
       get(key, keepScalar) {
-        return identity.isCollection(this.contents) ? this.contents.get(key, keepScalar) : void 0;
+        return identity2.isCollection(this.contents) ? this.contents.get(key, keepScalar) : void 0;
       }
       /**
        * Returns item at `path`, or `undefined` if not found. By default unwraps
@@ -4061,14 +4061,14 @@ var require_Document = __commonJS({
        */
       getIn(path, keepScalar) {
         if (Collection.isEmptyPath(path))
-          return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-        return identity.isCollection(this.contents) ? this.contents.getIn(path, keepScalar) : void 0;
+          return !keepScalar && identity2.isScalar(this.contents) ? this.contents.value : this.contents;
+        return identity2.isCollection(this.contents) ? this.contents.getIn(path, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
        */
       has(key) {
-        return identity.isCollection(this.contents) ? this.contents.has(key) : false;
+        return identity2.isCollection(this.contents) ? this.contents.has(key) : false;
       }
       /**
        * Checks if the document includes a value at `path`.
@@ -4076,7 +4076,7 @@ var require_Document = __commonJS({
       hasIn(path) {
         if (Collection.isEmptyPath(path))
           return this.contents !== void 0;
-        return identity.isCollection(this.contents) ? this.contents.hasIn(path) : false;
+        return identity2.isCollection(this.contents) ? this.contents.hasIn(path) : false;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -4183,7 +4183,7 @@ var require_Document = __commonJS({
       }
     };
     function assertCollection(contents) {
-      if (identity.isCollection(contents))
+      if (identity2.isCollection(contents))
         return true;
       throw new Error("Expected a YAML collection as document contents");
     }
@@ -4454,12 +4454,12 @@ var require_util_flow_indent_check = __commonJS({
 var require_util_map_includes = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/compose/util-map-includes.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     function mapIncludes(ctx, items, search) {
       const { uniqueKeys } = ctx.options;
       if (uniqueKeys === false)
         return false;
-      const isEqual = typeof uniqueKeys === "function" ? uniqueKeys : (a, b) => a === b || identity.isScalar(a) && identity.isScalar(b) && a.value === b.value;
+      const isEqual = typeof uniqueKeys === "function" ? uniqueKeys : (a, b) => a === b || identity2.isScalar(a) && identity2.isScalar(b) && a.value === b.value;
       return items.some((pair) => isEqual(pair.key, search));
     }
     exports2.mapIncludes = mapIncludes;
@@ -4672,7 +4672,7 @@ var require_resolve_end = __commonJS({
 var require_resolve_flow_collection = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/compose/resolve-flow-collection.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Pair = require_Pair();
     var YAMLMap = require_YAMLMap();
     var YAMLSeq = require_YAMLSeq();
@@ -4751,7 +4751,7 @@ var require_resolve_flow_collection = __commonJS({
             }
             if (prevItemComment) {
               let prev = coll.items[coll.items.length - 1];
-              if (identity.isPair(prev))
+              if (identity2.isPair(prev))
                 prev = prev.value ?? prev.key;
               if (prev.comment)
                 prev.comment += "\n" + prevItemComment;
@@ -4866,7 +4866,7 @@ var require_resolve_flow_collection = __commonJS({
 var require_compose_collection = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/compose/compose-collection.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Scalar = require_Scalar();
     var YAMLMap = require_YAMLMap();
     var YAMLSeq = require_YAMLSeq();
@@ -4916,7 +4916,7 @@ var require_compose_collection = __commonJS({
       }
       const coll = resolveCollection(CN, ctx, token, onError, tagName, tag);
       const res = tag.resolve?.(coll, (msg) => onError(tagToken, "TAG_RESOLVE_FAILED", msg), ctx.options) ?? coll;
-      const node = identity.isNode(res) ? res : new Scalar.Scalar(res);
+      const node = identity2.isNode(res) ? res : new Scalar.Scalar(res);
       node.range = coll.range;
       node.tag = tagName;
       if (tag?.format)
@@ -5334,7 +5334,7 @@ var require_resolve_flow_scalar = __commonJS({
 var require_compose_scalar = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/compose/compose-scalar.js"(exports2) {
     "use strict";
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Scalar = require_Scalar();
     var resolveBlockScalar = require_resolve_block_scalar();
     var resolveFlowScalar = require_resolve_flow_scalar();
@@ -5343,17 +5343,17 @@ var require_compose_scalar = __commonJS({
       const tagName = tagToken ? ctx.directives.tagName(tagToken.source, (msg) => onError(tagToken, "TAG_RESOLVE_FAILED", msg)) : null;
       let tag;
       if (ctx.options.stringKeys && ctx.atKey) {
-        tag = ctx.schema[identity.SCALAR];
+        tag = ctx.schema[identity2.SCALAR];
       } else if (tagName)
         tag = findScalarTagByName(ctx.schema, value, tagName, tagToken, onError);
       else if (token.type === "scalar")
         tag = findScalarTagByTest(ctx, value, token, onError);
       else
-        tag = ctx.schema[identity.SCALAR];
+        tag = ctx.schema[identity2.SCALAR];
       let scalar;
       try {
         const res = tag.resolve(value, (msg) => onError(tagToken ?? token, "TAG_RESOLVE_FAILED", msg), ctx.options);
-        scalar = identity.isScalar(res) ? res : new Scalar.Scalar(res);
+        scalar = identity2.isScalar(res) ? res : new Scalar.Scalar(res);
       } catch (error) {
         const msg = error instanceof Error ? error.message : String(error);
         onError(tagToken ?? token, "TAG_RESOLVE_FAILED", msg);
@@ -5373,7 +5373,7 @@ var require_compose_scalar = __commonJS({
     }
     function findScalarTagByName(schema, value, tagName, tagToken, onError) {
       if (tagName === "!")
-        return schema[identity.SCALAR];
+        return schema[identity2.SCALAR];
       const matchWithTest = [];
       for (const tag of schema.tags) {
         if (!tag.collection && tag.tag === tagName) {
@@ -5392,12 +5392,12 @@ var require_compose_scalar = __commonJS({
         return kt;
       }
       onError(tagToken, "TAG_RESOLVE_FAILED", `Unresolved tag: ${tagName}`, tagName !== "tag:yaml.org,2002:str");
-      return schema[identity.SCALAR];
+      return schema[identity2.SCALAR];
     }
     function findScalarTagByTest({ atKey, directives, schema }, value, token, onError) {
-      const tag = schema.tags.find((tag2) => (tag2.default === true || atKey && tag2.default === "key") && tag2.test?.test(value)) || schema[identity.SCALAR];
+      const tag = schema.tags.find((tag2) => (tag2.default === true || atKey && tag2.default === "key") && tag2.test?.test(value)) || schema[identity2.SCALAR];
       if (schema.compat) {
-        const compat = schema.compat.find((tag2) => tag2.default && tag2.test?.test(value)) ?? schema[identity.SCALAR];
+        const compat = schema.compat.find((tag2) => tag2.default && tag2.test?.test(value)) ?? schema[identity2.SCALAR];
         if (tag.tag !== compat.tag) {
           const ts = directives.tagString(tag.tag);
           const cs = directives.tagString(compat.tag);
@@ -5446,7 +5446,7 @@ var require_compose_node = __commonJS({
   "../../node_modules/.pnpm/yaml@2.8.4/node_modules/yaml/dist/compose/compose-node.js"(exports2) {
     "use strict";
     var Alias = require_Alias();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var composeCollection = require_compose_collection();
     var composeScalar = require_compose_scalar();
     var resolveEnd = require_resolve_end();
@@ -5492,7 +5492,7 @@ var require_compose_node = __commonJS({
       node ?? (node = composeEmptyNode(ctx, token.offset, void 0, null, props, onError));
       if (anchor && node.anchor === "")
         onError(anchor, "BAD_ALIAS", "Anchor cannot be an empty string");
-      if (atKey && ctx.options.stringKeys && (!identity.isScalar(node) || typeof node.value !== "string" || node.tag && node.tag !== "tag:yaml.org,2002:str")) {
+      if (atKey && ctx.options.stringKeys && (!identity2.isScalar(node) || typeof node.value !== "string" || node.tag && node.tag !== "tag:yaml.org,2002:str")) {
         const msg = "With stringKeys, all keys must be strings";
         onError(tag ?? token, "NON_STRING_KEY", msg);
       }
@@ -5598,7 +5598,7 @@ var require_composer = __commonJS({
     var directives = require_directives();
     var Document = require_Document();
     var errors = require_errors();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var composeDoc = require_compose_doc();
     var resolveEnd = require_resolve_end();
     function getErrorPos(src) {
@@ -5660,9 +5660,9 @@ var require_composer = __commonJS({
 ${comment}` : comment;
           } else if (afterEmptyLine || doc.directives.docStart || !dc) {
             doc.commentBefore = comment;
-          } else if (identity.isCollection(dc) && !dc.flow && dc.items.length > 0) {
+          } else if (identity2.isCollection(dc) && !dc.flow && dc.items.length > 0) {
             let it = dc.items[0];
-            if (identity.isPair(it))
+            if (identity2.isPair(it))
               it = it.key;
             const cb = it.commentBefore;
             it.commentBefore = cb ? `${comment}
@@ -7691,7 +7691,7 @@ var require_public_api = __commonJS({
     var Document = require_Document();
     var errors = require_errors();
     var log = require_log();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var lineCounter = require_line_counter();
     var parser = require_parser();
     function parseOptions(options) {
@@ -7769,7 +7769,7 @@ var require_public_api = __commonJS({
         if (!keepUndefined)
           return void 0;
       }
-      if (identity.isDocument(value) && !_replacer)
+      if (identity2.isDocument(value) && !_replacer)
         return value.toString(options);
       return new Document.Document(value, _replacer, options).toString(options);
     }
@@ -7789,7 +7789,7 @@ var require_dist = __commonJS({
     var Schema = require_Schema();
     var errors = require_errors();
     var Alias = require_Alias();
-    var identity = require_identity();
+    var identity2 = require_identity();
     var Pair = require_Pair();
     var Scalar = require_Scalar();
     var YAMLMap = require_YAMLMap();
@@ -7807,14 +7807,14 @@ var require_dist = __commonJS({
     exports2.YAMLParseError = errors.YAMLParseError;
     exports2.YAMLWarning = errors.YAMLWarning;
     exports2.Alias = Alias.Alias;
-    exports2.isAlias = identity.isAlias;
-    exports2.isCollection = identity.isCollection;
-    exports2.isDocument = identity.isDocument;
-    exports2.isMap = identity.isMap;
-    exports2.isNode = identity.isNode;
-    exports2.isPair = identity.isPair;
-    exports2.isScalar = identity.isScalar;
-    exports2.isSeq = identity.isSeq;
+    exports2.isAlias = identity2.isAlias;
+    exports2.isCollection = identity2.isCollection;
+    exports2.isDocument = identity2.isDocument;
+    exports2.isMap = identity2.isMap;
+    exports2.isNode = identity2.isNode;
+    exports2.isPair = identity2.isPair;
+    exports2.isScalar = identity2.isScalar;
+    exports2.isSeq = identity2.isSeq;
     exports2.Pair = Pair.Pair;
     exports2.Scalar = Scalar.Scalar;
     exports2.YAMLMap = YAMLMap.YAMLMap;
@@ -7833,6 +7833,48 @@ var require_dist = __commonJS({
 });
 
 // src/git.ts
+var git_exports = {};
+__export(git_exports, {
+  branchExists: () => branchExists,
+  checkoutBranch: () => checkoutBranch,
+  createAndCheckoutBranch: () => createAndCheckoutBranch,
+  createBranch: () => createBranch,
+  deleteBranch: () => deleteBranch,
+  getAllChangedFiles: () => getAllChangedFiles,
+  getBranchCommits: () => getBranchCommits,
+  getChangedFilesSince: () => getChangedFilesSince,
+  getCommitHash: () => getCommitHash,
+  getCommitsAheadOfUpstream: () => getCommitsAheadOfUpstream,
+  getCommitsSince: () => getCommitsSince,
+  getCurrentBranch: () => getCurrentBranch,
+  getDefaultBranch: () => getDefaultBranch,
+  getDiffStat: () => getDiffStat,
+  getFullDiff: () => getFullDiff,
+  getGitRoot: () => getGitRoot,
+  getHeadSha: () => getHeadSha,
+  getLatestTag: () => getLatestTag,
+  getOnlineLog: () => getOnlineLog,
+  getPushStats: () => getPushStats,
+  getRecentBranchCommits: () => getRecentBranchCommits,
+  getShortStagedFiles: () => getShortStagedFiles,
+  getStagedDiff: () => getStagedDiff,
+  getStagedDiffShortstat: () => getStagedDiffShortstat,
+  getStagedFileCount: () => getStagedFileCount,
+  getStagedFiles: () => getStagedFiles,
+  getUnstagedFiles: () => getUnstagedFiles,
+  getUpstreamRef: () => getUpstreamRef,
+  getWorkingTreeDiff: () => getWorkingTreeDiff,
+  gitCommit: () => gitCommit,
+  gitPush: () => gitPush,
+  gitPushSetUpstream: () => gitPushSetUpstream,
+  hasStagedChanges: () => hasStagedChanges,
+  isGitRepo: () => isGitRepo,
+  resetHard: () => resetHard,
+  stageAll: () => stageAll,
+  stashPop: () => stashPop,
+  stashPushIfDirty: () => stashPushIfDirty,
+  validateRef: () => validateRef
+});
 function validateRef(ref, name = "ref") {
   if (ref.startsWith("-")) {
     throw new Error(`Invalid git ref ${name}: starts with hyphen: "${ref}"`);
@@ -8032,6 +8074,13 @@ function getStagedDiffShortstat() {
     return { additions: 0, deletions: 0 };
   }
 }
+function getShortStagedFiles(max = 3) {
+  const output = (0, import_child_process2.execFileSync)("git", ["diff", "--cached", "--name-only"], {
+    encoding: "utf-8"
+  });
+  const all = output.trim().split("\n").filter(Boolean);
+  return { files: all.slice(0, max), total: all.length };
+}
 function getCommitHash() {
   return (0, import_child_process2.execFileSync)("git", ["rev-parse", "--short", "HEAD"], {
     encoding: "utf-8"
@@ -8693,6 +8742,266 @@ var init_monorepo = __esm({
   }
 });
 
+// src/smart-diff.ts
+var smart_diff_exports = {};
+__export(smart_diff_exports, {
+  classifyFile: () => classifyFile,
+  preprocessDiff: () => preprocessDiff,
+  preprocessDiffWithSizeBudget: () => preprocessDiffWithSizeBudget
+});
+function sanitizeFilepath(path) {
+  return path.replace(/[\x00-\x1F\x7F[\]`]/g, "_").slice(0, 200);
+}
+function classifyFile(filepath) {
+  const basename = filepath.split("/").pop() ?? filepath;
+  if (LOCK_FILES.has(basename)) return "lock";
+  if (filepath.endsWith(".map")) return "sourcemap";
+  if (VENDORED_PREFIXES.some((p) => filepath.startsWith(p))) return "vendored";
+  if (GENERATED_PATTERNS.some((p) => p.test(filepath))) return "generated";
+  return "code";
+}
+function parseDiffIntoFiles(diff) {
+  const files = [];
+  const parts = diff.split(/^(diff --git .+)$/m);
+  for (let i = 1; i < parts.length; i += 2) {
+    const header = parts[i];
+    const content = parts[i + 1] ?? "";
+    const match = header.match(/diff --git a\/(.+?) b\/(.+)/);
+    const filepath = match?.[2] ?? "unknown";
+    const lines = content.split("\n");
+    let additions = 0;
+    let deletions = 0;
+    for (const line of lines) {
+      if (line.startsWith("+") && !line.startsWith("+++")) additions++;
+      else if (line.startsWith("-") && !line.startsWith("---")) deletions++;
+    }
+    files.push({ filepath, content: header + content, additions, deletions });
+  }
+  return files;
+}
+function isMinified(content) {
+  const lines = content.split("\n").filter(
+    (l) => (l.startsWith("+") || l.startsWith("-")) && !l.startsWith("+++") && !l.startsWith("---")
+  );
+  if (lines.length === 0) return false;
+  return lines.some((l) => l.length > 500);
+}
+function preprocessDiff(diff) {
+  const files = parseDiffIntoFiles(diff);
+  if (files.length === 0) return { processedDiff: diff, summarized: [], aggressivelySummarized: [], tokensSaved: 0 };
+  const kept = [];
+  const summarized = [];
+  let tokensSaved = 0;
+  for (const file of files) {
+    const classification = classifyFile(file.filepath);
+    switch (classification) {
+      case "sourcemap":
+        tokensSaved += estimateTokens(file.content);
+        summarized.push(file.filepath);
+        break;
+      case "lock":
+        tokensSaved += estimateTokens(file.content);
+        kept.push(`[lock file updated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions} lines)]
+`);
+        summarized.push(file.filepath);
+        break;
+      case "generated":
+        tokensSaved += estimateTokens(file.content);
+        kept.push(`[generated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions})]
+`);
+        summarized.push(file.filepath);
+        break;
+      case "vendored":
+        tokensSaved += estimateTokens(file.content);
+        kept.push(`[vendored: ${sanitizeFilepath(file.filepath)} updated]
+`);
+        summarized.push(file.filepath);
+        break;
+      case "code":
+        if (isMinified(file.content)) {
+          tokensSaved += estimateTokens(file.content);
+          const sizeKB = Math.round(file.content.length / 1024);
+          kept.push(`[minified asset: ${sanitizeFilepath(file.filepath)} (${sizeKB} KB)]
+`);
+          summarized.push(file.filepath);
+        } else {
+          kept.push(file.content);
+        }
+        break;
+    }
+  }
+  return {
+    processedDiff: kept.join(""),
+    summarized,
+    aggressivelySummarized: [],
+    tokensSaved
+  };
+}
+function buildFileSummary(file) {
+  const sizeKB = Math.round(file.content.length / 1024);
+  return `[modified: ${sanitizeFilepath(file.filepath)} \u2014 +${file.additions} \u2212${file.deletions} lines, ~${sizeKB}KB]
+`;
+}
+function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
+  const files = parseDiffIntoFiles(diff);
+  if (files.length === 0) {
+    return { processedDiff: diff, summarized: [], aggressivelySummarized: [], tokensSaved: 0 };
+  }
+  const entries = [];
+  const summarized = [];
+  let tokensSaved = 0;
+  for (const file of files) {
+    const classification = classifyFile(file.filepath);
+    switch (classification) {
+      case "sourcemap":
+        tokensSaved += estimateTokens(file.content);
+        summarized.push(file.filepath);
+        entries.push({ file, isNoise: true, summaryLine: null });
+        break;
+      case "lock":
+        tokensSaved += estimateTokens(file.content);
+        summarized.push(file.filepath);
+        entries.push({
+          file,
+          isNoise: true,
+          summaryLine: `[lock file updated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions} lines)]
+`
+        });
+        break;
+      case "generated":
+        tokensSaved += estimateTokens(file.content);
+        summarized.push(file.filepath);
+        entries.push({
+          file,
+          isNoise: true,
+          summaryLine: `[generated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions})]
+`
+        });
+        break;
+      case "vendored":
+        tokensSaved += estimateTokens(file.content);
+        summarized.push(file.filepath);
+        entries.push({
+          file,
+          isNoise: true,
+          summaryLine: `[vendored: ${sanitizeFilepath(file.filepath)} updated]
+`
+        });
+        break;
+      case "code":
+        if (isMinified(file.content)) {
+          tokensSaved += estimateTokens(file.content);
+          const sizeKB = Math.round(file.content.length / 1024);
+          summarized.push(file.filepath);
+          entries.push({
+            file,
+            isNoise: true,
+            summaryLine: `[minified asset: ${sanitizeFilepath(file.filepath)} (${sizeKB} KB)]
+`
+          });
+        } else {
+          entries.push({ file, isNoise: false, summaryLine: null });
+        }
+        break;
+    }
+  }
+  const aggressiveMap = /* @__PURE__ */ new Map();
+  function buildOutput() {
+    const parts = [];
+    for (const entry of entries) {
+      if (entry.isNoise) {
+        if (entry.summaryLine !== null) parts.push(entry.summaryLine);
+      } else if (aggressiveMap.has(entry.file.filepath)) {
+        parts.push(aggressiveMap.get(entry.file.filepath));
+      } else {
+        parts.push(entry.file.content);
+      }
+    }
+    return parts.join("");
+  }
+  const codeEntries = entries.filter((e) => !e.isNoise);
+  let output = buildOutput();
+  if (output.length <= maxBytes) {
+    return {
+      processedDiff: output,
+      summarized,
+      aggressivelySummarized: [],
+      tokensSaved
+    };
+  }
+  const TIER1_THRESHOLD = 5 * 1024;
+  for (const entry of codeEntries) {
+    if (entry.file.content.length > TIER1_THRESHOLD && !aggressiveMap.has(entry.file.filepath)) {
+      tokensSaved += estimateTokens(entry.file.content);
+      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+    }
+  }
+  output = buildOutput();
+  if (output.length <= maxBytes) {
+    return {
+      processedDiff: output,
+      summarized,
+      aggressivelySummarized: [...aggressiveMap.keys()],
+      tokensSaved
+    };
+  }
+  const TIER2_THRESHOLD = 2 * 1024;
+  for (const entry of codeEntries) {
+    if (entry.file.content.length > TIER2_THRESHOLD && !aggressiveMap.has(entry.file.filepath)) {
+      tokensSaved += estimateTokens(entry.file.content);
+      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+    }
+  }
+  output = buildOutput();
+  if (output.length <= maxBytes) {
+    return {
+      processedDiff: output,
+      summarized,
+      aggressivelySummarized: [...aggressiveMap.keys()],
+      tokensSaved
+    };
+  }
+  for (const entry of codeEntries) {
+    if (!aggressiveMap.has(entry.file.filepath)) {
+      tokensSaved += estimateTokens(entry.file.content);
+      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+    }
+  }
+  return {
+    processedDiff: buildOutput(),
+    summarized,
+    aggressivelySummarized: [...aggressiveMap.keys()],
+    tokensSaved
+  };
+}
+var LOCK_FILES, GENERATED_PATTERNS, VENDORED_PREFIXES;
+var init_smart_diff = __esm({
+  "src/smart-diff.ts"() {
+    "use strict";
+    init_dist();
+    LOCK_FILES = /* @__PURE__ */ new Set([
+      "pnpm-lock.yaml",
+      "package-lock.json",
+      "yarn.lock",
+      "Cargo.lock",
+      "Gemfile.lock",
+      "poetry.lock",
+      "composer.lock",
+      "bun.lockb",
+      "shrinkwrap.json"
+    ]);
+    GENERATED_PATTERNS = [
+      /\.generated\.\w+$/,
+      /\.g\.dart$/,
+      /\.pb\.go$/,
+      /\.pb\.ts$/,
+      /(^|\/)\.prisma\/client\//,
+      /\/generated\//
+    ];
+    VENDORED_PREFIXES = ["vendor/", "third_party/", "node_modules/"];
+  }
+});
+
 // src/commands/changeset.ts
 var changeset_exports = {};
 __export(changeset_exports, {
@@ -8756,7 +9065,9 @@ async function changeset(options) {
   }
   const changedFiles = getChangedFilesSince(base);
   if (changedFiles.length === 0) {
-    console.error(`No changes detected vs ${base}.`);
+    console.error(`No commits with file changes detected on this branch vs ${base}.`);
+    console.error(`Tip: \`qc changeset\` requires committed changes (not just staged files).`);
+    console.error(`     Commit first with \`qc\`, then run \`qc changeset\`.`);
     process.exit(1);
   }
   const packageMap = mapFilesToPackages(changedFiles, workspace);
@@ -8766,8 +9077,17 @@ async function changeset(options) {
     process.exit(1);
   }
   const commits = getOnlineLog(base);
-  const diff = getFullDiff(base);
   const commitCount = commits.split("\n").filter(Boolean).length;
+  const { preprocessDiffWithSizeBudget: preprocessDiffWithSizeBudget2 } = await Promise.resolve().then(() => (init_smart_diff(), smart_diff_exports));
+  const { getDiffStat: getDiffStat2, getFullDiff: getFullDiff2 } = await Promise.resolve().then(() => (init_git(), git_exports));
+  const diffStat = getDiffStat2(base);
+  const rawDiff = getFullDiff2(base);
+  const { processedDiff } = preprocessDiffWithSizeBudget2(rawDiff, 6e4);
+  const diff = `DIFF STAT:
+${diffStat}
+
+DETAILED DIFF (may be summarized for large changes):
+${processedDiff}`;
   console.error(
     `Analyzing changes vs ${base}... ${commitCount} commit(s), ${packageNames.length} package(s) changed`
   );
@@ -9261,12 +9581,199 @@ var require_picocolors = __commonJS({
   }
 });
 
-// src/ui.ts
-function hasCliNoColor() {
-  try {
-    return process.argv.slice(2).includes("--no-color");
-  } catch {
-    return false;
+// src/ui-theme.ts
+function overlayTypeColors(base, custom) {
+  if (!custom || Object.keys(custom).length === 0) return { ...base };
+  const next = { ...base };
+  const pmap = import_picocolors.default;
+  for (const [key, raw] of Object.entries(custom)) {
+    const name = typeof raw === "string" ? raw.trim().toLowerCase() : "";
+    if (!name) continue;
+    const fn = pmap[name];
+    if (typeof fn === "function") {
+      next[key] = fn;
+    }
+  }
+  return next;
+}
+function buildVibrant() {
+  return {
+    step: import_picocolors.default.dim,
+    success: import_picocolors.default.greenBright,
+    error: import_picocolors.default.redBright,
+    dim: import_picocolors.default.dim,
+    bullet: import_picocolors.default.greenBright,
+    inlineCode: import_picocolors.default.magentaBright,
+    scope: (s) => import_picocolors.default.bold(import_picocolors.default.yellow(s)),
+    strong: import_picocolors.default.bold,
+    additions: import_picocolors.default.greenBright,
+    deletions: import_picocolors.default.redBright,
+    branchName: (s) => import_picocolors.default.bold(import_picocolors.default.magenta(s)),
+    commitHash: import_picocolors.default.dim,
+    boxBorder: import_picocolors.default.dim,
+    boxBorderAccent: import_picocolors.default.cyanBright,
+    spinner: {
+      aiGenerate: import_picocolors.default.cyanBright,
+      branchGen: import_picocolors.default.cyanBright,
+      gitOp: import_picocolors.default.blueBright,
+      localProvider: import_picocolors.default.magentaBright,
+      smartDiff: import_picocolors.default.dim
+    },
+    type: {
+      feat: (s) => import_picocolors.default.bold(import_picocolors.default.cyanBright(s)),
+      fix: (s) => import_picocolors.default.bold(import_picocolors.default.redBright(s)),
+      perf: (s) => import_picocolors.default.bold(import_picocolors.default.magentaBright(s)),
+      refactor: (s) => import_picocolors.default.bold(import_picocolors.default.yellow(s)),
+      docs: (s) => import_picocolors.default.bold(import_picocolors.default.blue(s)),
+      test: (s) => import_picocolors.default.bold(import_picocolors.default.green(s)),
+      chore: (s) => import_picocolors.default.dim(import_picocolors.default.bold(import_picocolors.default.white(s))),
+      ci: (s) => import_picocolors.default.dim(import_picocolors.default.bold(import_picocolors.default.cyan(s))),
+      style: (s) => import_picocolors.default.dim(import_picocolors.default.bold(import_picocolors.default.magenta(s)))
+    }
+  };
+}
+function buildMuted() {
+  return {
+    step: import_picocolors.default.dim,
+    success: import_picocolors.default.green,
+    error: import_picocolors.default.red,
+    dim: import_picocolors.default.dim,
+    bullet: import_picocolors.default.green,
+    inlineCode: import_picocolors.default.magenta,
+    scope: (s) => import_picocolors.default.bold(import_picocolors.default.yellow(s)),
+    strong: import_picocolors.default.bold,
+    additions: import_picocolors.default.green,
+    deletions: import_picocolors.default.red,
+    branchName: (s) => import_picocolors.default.bold(import_picocolors.default.magenta(s)),
+    commitHash: import_picocolors.default.dim,
+    boxBorder: import_picocolors.default.dim,
+    boxBorderAccent: import_picocolors.default.cyan,
+    spinner: {
+      aiGenerate: import_picocolors.default.cyan,
+      branchGen: import_picocolors.default.cyan,
+      gitOp: import_picocolors.default.blue,
+      localProvider: import_picocolors.default.magenta,
+      smartDiff: import_picocolors.default.dim
+    },
+    type: {
+      feat: (s) => import_picocolors.default.bold(import_picocolors.default.cyan(s)),
+      fix: (s) => import_picocolors.default.bold(import_picocolors.default.red(s)),
+      perf: (s) => import_picocolors.default.bold(import_picocolors.default.magenta(s)),
+      refactor: (s) => import_picocolors.default.bold(import_picocolors.default.yellow(s)),
+      docs: (s) => import_picocolors.default.bold(import_picocolors.default.blue(s)),
+      test: (s) => import_picocolors.default.bold(import_picocolors.default.green(s)),
+      chore: (s) => import_picocolors.default.dim(import_picocolors.default.bold(import_picocolors.default.white(s))),
+      ci: (s) => import_picocolors.default.dim(import_picocolors.default.bold(import_picocolors.default.cyan(s))),
+      style: (s) => import_picocolors.default.dim(import_picocolors.default.bold(import_picocolors.default.magenta(s)))
+    }
+  };
+}
+function buildMono() {
+  const bold = import_picocolors.default.bold;
+  const dim = import_picocolors.default.dim;
+  return {
+    step: dim,
+    success: bold,
+    error: bold,
+    dim,
+    bullet: bold,
+    inlineCode: bold,
+    scope: bold,
+    strong: bold,
+    additions: bold,
+    deletions: bold,
+    branchName: bold,
+    commitHash: dim,
+    boxBorder: dim,
+    boxBorderAccent: bold,
+    spinner: {
+      aiGenerate: identity,
+      branchGen: identity,
+      gitOp: identity,
+      localProvider: identity,
+      smartDiff: dim
+    },
+    type: {
+      feat: bold,
+      fix: bold,
+      perf: bold,
+      refactor: bold,
+      docs: bold,
+      test: bold,
+      chore: dim,
+      ci: dim,
+      style: dim
+    }
+  };
+}
+function applyAdaptive(theme, bg) {
+  if (bg !== "light") return theme;
+  return {
+    ...theme,
+    boxBorder: import_picocolors.default.dim,
+    boxBorderAccent: import_picocolors.default.blue,
+    type: {
+      ...theme.type,
+      feat: (s) => theme.strong(import_picocolors.default.cyan(s)),
+      fix: (s) => theme.strong(import_picocolors.default.red(s)),
+      perf: (s) => theme.strong(import_picocolors.default.magenta(s))
+    }
+  };
+}
+function getTheme(name, adaptive) {
+  let base;
+  if (name === "muted") base = buildMuted();
+  else if (name === "mono") base = buildMono();
+  else base = buildVibrant();
+  if (!adaptive) return base;
+  return applyAdaptive(base, detectTerminalBackground());
+}
+function detectTerminalBackground() {
+  const raw = process.env.COLORFGBG;
+  if (!raw) return "unknown";
+  const parts = raw.split(";").map((p) => p.trim());
+  if (parts.length < 2) return "unknown";
+  const last = parts[parts.length - 1];
+  const n = parseInt(last, 10);
+  if (!Number.isFinite(n)) return "unknown";
+  if (n >= 232 && n <= 255) return n >= 244 ? "light" : "dark";
+  if (n >= 16 && n <= 231) {
+    const i = n - 16;
+    const r = Math.floor(i / 36) / 5;
+    const g = Math.floor(i % 36 / 6) / 5;
+    const b = i % 6 / 5;
+    const luminance = 0.299 * r + 0.587 * g + 0.114 * b;
+    return luminance >= 0.55 ? "light" : "dark";
+  }
+  if (n >= 8 && n <= 15) return "light";
+  if (n >= 0 && n <= 7) return "dark";
+  return "unknown";
+}
+function resolveTheme(opts) {
+  if (opts.noColor) return getTheme("mono", false);
+  const baseName = opts.name ?? "vibrant";
+  const adaptive = opts.adaptive ?? true;
+  let theme = getTheme(baseName, adaptive);
+  if (opts.typeColors && Object.keys(opts.typeColors).length > 0) {
+    theme = { ...theme, type: overlayTypeColors(theme.type, opts.typeColors) };
+  }
+  return theme;
+}
+var import_picocolors, identity;
+var init_ui_theme = __esm({
+  "src/ui-theme.ts"() {
+    "use strict";
+    import_picocolors = __toESM(require_picocolors());
+    identity = (s) => s;
+  }
+});
+
+// src/ui.ts
+function hasCliNoColor() {
+  try {
+    return process.argv.slice(2).includes("--no-color");
+  } catch {
+    return false;
   }
 }
 function getTerminalWidth() {
@@ -9274,16 +9781,21 @@ function getTerminalWidth() {
 }
 function createUI(options) {
   const isColor = options.isTTY && !options.noColor;
-  const wrap = (fn) => (s) => isColor ? fn(s) : s;
+  const theme = resolveTheme({
+    name: options.themeName,
+    adaptive: options.adaptive,
+    noColor: !isColor,
+    typeColors: options.typeColors
+  });
   const format = {
-    step: (msg) => `${isColor ? import_picocolors.default.dim("\u203A") : "\u203A"} ${isColor ? import_picocolors.default.dim(msg) : msg}`,
-    success: (msg) => `${isColor ? import_picocolors.default.green("\u2713") : "\u2713"} ${msg}`,
-    error: (msg) => `${isColor ? import_picocolors.default.red("\u2717") : "\u2717"} ${msg}`,
-    dim: wrap(import_picocolors.default.dim),
-    bold: wrap(import_picocolors.default.bold),
-    commitType: wrap(import_picocolors.default.cyan),
-    commitScope: wrap(import_picocolors.default.yellow),
-    accent: wrap(import_picocolors.default.magenta)
+    step: (msg) => isColor ? `${theme.step("\u203A")} ${theme.dim(msg)}` : `\u203A ${msg}`,
+    success: (msg) => isColor ? `${theme.success("\u2713")} ${msg}` : `\u2713 ${msg}`,
+    error: (msg) => isColor ? `${theme.error("\u2717")} ${msg}` : `\u2717 ${msg}`,
+    dim: (msg) => isColor ? theme.dim(msg) : msg,
+    bold: (msg) => isColor ? theme.strong(msg) : msg,
+    commitType: (t) => isColor ? (theme.type[t] ?? theme.type.feat ?? ((s) => s))(t) : t,
+    commitScope: (scope) => isColor ? theme.scope(scope) : scope,
+    accent: (msg) => isColor ? theme.inlineCode(msg) : msg
   };
   function createSpinner(message, write = (s) => process.stderr.write(s)) {
     let frame = 0;
@@ -9294,7 +9806,7 @@ function createUI(options) {
         if (!options.isTTY) return;
         interval = setInterval(() => {
           const f = SPINNER_FRAMES2[frame++ % SPINNER_FRAMES2.length];
-          write(`\r${format.step(message)} ${isColor ? import_picocolors.default.cyan(f) : f}`);
+          write(`\r${format.step(message)} ${isColor ? theme.spinner.aiGenerate(f) : f}`);
         }, 80);
       },
       stop(finalMessage) {
@@ -9317,22 +9829,27 @@ function createUI(options) {
     error: (msg) => process.stderr.write(format.error(msg) + "\n"),
     dim: (msg) => process.stderr.write(format.dim(msg) + "\n")
   };
-  return { isColor, format, spinner: createSpinner, log };
+  return { isColor, format, spinner: createSpinner, log, theme };
 }
 function getUI() {
   if (!_defaultUI) {
+    const cfg = getConfig();
     _defaultUI = createUI({
       isTTY: !!process.stderr.isTTY,
-      noColor: !!process.env.NO_COLOR || hasCliNoColor()
+      noColor: !!process.env.NO_COLOR || hasCliNoColor(),
+      themeName: cfg.ui?.theme,
+      adaptive: cfg.ui?.adaptive !== false,
+      typeColors: cfg.ui?.type_colors
     });
   }
   return _defaultUI;
 }
-var import_picocolors, SPINNER_FRAMES2, _defaultUI, ui;
+var SPINNER_FRAMES2, _defaultUI, ui;
 var init_ui = __esm({
   "src/ui.ts"() {
     "use strict";
-    import_picocolors = __toESM(require_picocolors());
+    init_config();
+    init_ui_theme();
     SPINNER_FRAMES2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
     ui = new Proxy({}, {
       get(_target, prop) {
@@ -9342,7 +9859,10 @@ var init_ui = __esm({
   }
 });
 
-// src/ui-rich.ts
+// src/ui-layout.ts
+function stripAnsi(s) {
+  return s.replace(/\x1b\[[0-9;]*m/g, "");
+}
 function splitCommitForBox(message) {
   const firstLine = message.split("\n")[0] ?? "";
   const m = firstLine.match(HEADER_RX);
@@ -9354,91 +9874,174 @@ function splitCommitForBox(message) {
     subject: m[4] ?? ""
   };
 }
-function renderFileTree(files, maxFiles) {
+function colorizePath(filepath, isColor) {
+  if (!isColor) return filepath;
+  const slashIdx = filepath.lastIndexOf("/");
+  const dir = slashIdx >= 0 ? filepath.slice(0, slashIdx + 1) : "";
+  const name = slashIdx >= 0 ? filepath.slice(slashIdx + 1) : filepath;
+  const dotIdx = name.lastIndexOf(".");
+  const ext = dotIdx > 0 ? name.slice(dotIdx) : "";
+  const colorize = EXTENSION_COLORS[ext];
+  const coloredName = colorize ? colorize(name) : name;
+  return (dir ? import_picocolors2.default.dim(dir) : "") + coloredName;
+}
+function renderFileTree(files, maxFiles, opts = {}) {
   if (files.length === 0) return "";
+  const isColor = opts.isColor ?? false;
   const lines = [];
   const display = files.slice(0, maxFiles);
-  const overflow = Math.max(0, files.length - maxFiles);
+  const overflow = files.length - maxFiles;
   for (let i = 0; i < display.length; i++) {
-    const isLast = i === display.length - 1 && overflow === 0;
+    const isLast = i === display.length - 1 && overflow <= 0;
     const connector = isLast ? "\u2514\u2500" : "\u251C\u2500";
-    lines.push(`    ${connector} ${display[i]}`);
+    const colored = colorizePath(display[i] ?? "", isColor);
+    const connectorRendered = isColor ? import_picocolors2.default.dim(connector) : connector;
+    lines.push(`    ${connectorRendered} ${colored}`);
   }
   if (overflow > 0) {
-    lines.push(`    \u2514\u2500 +${overflow} more files`);
+    const connector = isColor ? import_picocolors2.default.dim("\u2514\u2500") : "\u2514\u2500";
+    const more = isColor ? import_picocolors2.default.dim(`+${overflow} more files`) : `+${overflow} more files`;
+    lines.push(`    ${connector} ${more}`);
   }
   return lines.join("\n");
 }
+function renderStatsLine(stats, isColor, theme) {
+  if (stats.files === 0 && stats.additions === 0 && stats.deletions === 0) return "";
+  const dim = theme?.dim ?? import_picocolors2.default.dim;
+  const addFn = theme?.additions ?? ((s) => import_picocolors2.default.green(s));
+  const delFn = theme?.deletions ?? ((s) => import_picocolors2.default.red(s));
+  const filesText = isColor ? dim(`${stats.files} files`) : `${stats.files} files`;
+  const additions = isColor ? addFn(`+${stats.additions}`) : `+${stats.additions}`;
+  const deletions = isColor ? delFn(`\u2212${stats.deletions}`) : `\u2212${stats.deletions}`;
+  const sep = isColor ? dim(" \xB7 ") : " \xB7 ";
+  let text = `${filesText}${sep}${additions} ${deletions}`;
+  if (stats.tokens !== void 0) {
+    const tokens = isColor ? dim(`${stats.tokens} tokens`) : `${stats.tokens} tokens`;
+    text += `${sep}${tokens}`;
+  }
+  return `    ${text}`;
+}
 function wrapLine(text, width) {
-  if (text.length <= width) return [text];
+  if (stripAnsi(text).length <= width) return [text];
   const result = [];
   let remaining = text;
-  while (remaining.length > width) {
-    let breakAt = remaining.lastIndexOf(" ", width);
-    if (breakAt < width / 2) breakAt = width;
+  while (stripAnsi(remaining).length > width) {
+    let visibleCount = 0;
+    let rawIdx = 0;
+    let lastSpaceRaw = -1;
+    const len = remaining.length;
+    while (rawIdx < len && visibleCount < width) {
+      if (remaining[rawIdx] === "\x1B") {
+        while (rawIdx < len && remaining[rawIdx] !== "m") rawIdx++;
+        if (rawIdx < len) rawIdx++;
+        continue;
+      }
+      if (remaining[rawIdx] === " ") lastSpaceRaw = rawIdx;
+      visibleCount++;
+      rawIdx++;
+    }
+    const breakAt = lastSpaceRaw > 0 && lastSpaceRaw > width / 2 ? lastSpaceRaw : rawIdx;
     result.push(remaining.slice(0, breakAt));
     remaining = remaining.slice(breakAt).trimStart();
   }
   if (remaining) result.push(remaining);
   return result;
 }
-function stripAnsi(s) {
-  return s.replace(/\x1b\[[0-9;]*m/g, "");
+function isImportantCommit(header, body) {
+  if (/BREAKING CHANGE/i.test(body)) return true;
+  if (/^[a-z]+(\([^)]+\))?!:/i.test(header)) return true;
+  return false;
+}
+function styleBoxTopRow(box, horizRepeat, isColor, theme) {
+  if (!isColor) return box.topLeft + box.horizontal.repeat(horizRepeat) + box.topRight;
+  const edge = theme?.boxBorder ?? import_picocolors2.default.dim;
+  const corner = theme?.boxBorderAccent ?? edge;
+  return corner(box.topLeft) + edge(box.horizontal.repeat(horizRepeat)) + corner(box.topRight);
+}
+function styleBoxBottomRow(box, horizRepeat, isColor, theme) {
+  if (!isColor) return box.bottomLeft + box.horizontal.repeat(horizRepeat) + box.bottomRight;
+  const edge = theme?.boxBorder ?? import_picocolors2.default.dim;
+  const corner = theme?.boxBorderAccent ?? edge;
+  return corner(box.bottomLeft) + edge(box.horizontal.repeat(horizRepeat)) + corner(box.bottomRight);
 }
-function boxedLine(content, innerWidth, isColor) {
+function boxedLine(vertical, content, innerWidth, isColor, theme) {
   const visibleLen = stripAnsi(content).length;
   const padding = " ".repeat(Math.max(0, innerWidth - visibleLen));
-  const border = isColor ? import_picocolors2.default.dim("\u2502") : "\u2502";
+  const border = isColor ? (theme?.boxBorder ?? import_picocolors2.default.dim)(vertical) : vertical;
   return `  ${border}  ${content}${padding}  ${border}`;
 }
+function buildHeaderPrefixAndSubject(parsed, headerFirstLine, isColor, theme) {
+  if (!parsed.type) {
+    return { prefix: "", subjectText: headerFirstLine };
+  }
+  const bangPlain = parsed.breaking ? "!" : "";
+  if (parsed.scope) {
+    const prefixPlain2 = `${parsed.type}(${parsed.scope})${bangPlain}: `;
+    if (!isColor) {
+      return { prefix: prefixPlain2, subjectText: parsed.subject };
+    }
+    const typeCell2 = theme ? theme.type[parsed.type] ?? theme.type.feat ?? ((s) => s) : (s) => import_picocolors2.default.bold(import_picocolors2.default.cyan(s));
+    const scopeCell = theme ? theme.scope : (s) => import_picocolors2.default.bold(import_picocolors2.default.yellow(s));
+    const bangCell2 = theme ? parsed.breaking ? theme.error("!") : "" : parsed.breaking ? import_picocolors2.default.bold(import_picocolors2.default.red("!")) : "";
+    const prefixStyled2 = `${typeCell2(parsed.type)}(${scopeCell(parsed.scope)})${bangCell2}: `;
+    return { prefix: prefixStyled2, subjectText: parsed.subject };
+  }
+  const prefixPlain = `${parsed.type}${bangPlain}: `;
+  if (!isColor) {
+    return { prefix: prefixPlain, subjectText: parsed.subject };
+  }
+  const typeCell = theme ? theme.type[parsed.type] ?? theme.type.feat ?? ((s) => s) : (s) => import_picocolors2.default.bold(import_picocolors2.default.cyan(s));
+  const bangCell = theme ? parsed.breaking ? theme.error("!") : "" : parsed.breaking ? import_picocolors2.default.bold(import_picocolors2.default.red("!")) : "";
+  const prefixStyled = `${typeCell(parsed.type)}${bangCell}: `;
+  return { prefix: prefixStyled, subjectText: parsed.subject };
+}
 function renderBoxedCommit(header, body, opts) {
-  if (opts.width < MIN_BOX_WIDTH) {
+  const requestedStyle = opts.style ?? "gradient";
+  const promoted = opts.autoEmphasis !== false && requestedStyle !== "none" && isImportantCommit(header.split("\n")[0] ?? header, body);
+  const style = promoted ? "double" : requestedStyle;
+  if (style === "none" || opts.width < MIN_BOX_WIDTH) {
     const lines2 = [header.split("\n")[0] ?? header];
     if (body) lines2.push("", body);
     return lines2.join("\n");
   }
+  const chars = BOX_CHARS[style];
   const innerWidth = opts.width - 6;
   const horiz = opts.width - 2;
-  const top = "  " + (opts.isColor ? import_picocolors2.default.dim("\u256D" + "\u2500".repeat(horiz) + "\u256E") : "\u256D" + "\u2500".repeat(horiz) + "\u256E");
-  const bottom = "  " + (opts.isColor ? import_picocolors2.default.dim("\u2570" + "\u2500".repeat(horiz) + "\u256F") : "\u2570" + "\u2500".repeat(horiz) + "\u256F");
+  const firstLineHeader = header.split("\n")[0] ?? header;
   const parsed = splitCommitForBox(header);
-  let firstLineStyled;
-  if (parsed.type && parsed.scope) {
-    const bare = `${parsed.type}(${parsed.scope})${parsed.breaking ? "!" : ""}: ${parsed.subject}`;
-    firstLineStyled = opts.isColor ? `${import_picocolors2.default.bold(import_picocolors2.default.cyan(parsed.type))}(${import_picocolors2.default.bold(import_picocolors2.default.yellow(parsed.scope))})${parsed.breaking ? import_picocolors2.default.bold(import_picocolors2.default.red("!")) : ""}: ${parsed.subject}` : bare;
-  } else if (parsed.type) {
-    const bare = `${parsed.type}${parsed.breaking ? "!" : ""}: ${parsed.subject}`;
-    firstLineStyled = opts.isColor ? `${import_picocolors2.default.bold(import_picocolors2.default.cyan(parsed.type))}${parsed.breaking ? import_picocolors2.default.bold(import_picocolors2.default.red("!")) : ""}: ${parsed.subject}` : bare;
-  } else {
-    firstLineStyled = header.split("\n")[0] ?? header;
-  }
+  const { prefix: headerPrefix, subjectText } = buildHeaderPrefixAndSubject(
+    parsed,
+    firstLineHeader,
+    opts.isColor,
+    opts.theme
+  );
+  const prefixLen = stripAnsi(headerPrefix).length;
+  const subjectLines = wrapLine(subjectText, Math.max(1, innerWidth - prefixLen));
+  const styledTop = styleBoxTopRow(chars, horiz, opts.isColor, opts.theme);
+  const styledBottom = styleBoxBottomRow(chars, horiz, opts.isColor, opts.theme);
   const lines = [];
-  const headerParts = wrapLine(firstLineStyled, innerWidth);
-  for (let i = 0; i < headerParts.length; i++) {
-    const indent = i === 0 ? "" : "  ";
-    lines.push(boxedLine(indent + (headerParts[i] ?? ""), innerWidth, opts.isColor));
+  lines.push("  " + styledTop);
+  lines.push(boxedLine(chars.vertical, headerPrefix + (subjectLines[0] ?? ""), innerWidth, opts.isColor, opts.theme));
+  for (let i = 1; i < subjectLines.length; i++) {
+    lines.push(boxedLine(chars.vertical, "  " + (subjectLines[i] ?? ""), innerWidth, opts.isColor, opts.theme));
   }
   if (body) {
-    lines.push(boxedLine("", innerWidth, opts.isColor));
+    lines.push(boxedLine(chars.vertical, "", innerWidth, opts.isColor, opts.theme));
     for (const bline of body.split("\n")) {
       const trimmed = bline.trim();
       if (!trimmed) continue;
-      const rendered = trimmed.replace(/^[-*]\s+/, opts.isColor ? `${import_picocolors2.default.green("\u2022")} ` : "\u2022 ");
+      const bulletChar = opts.isColor ? (opts.theme?.bullet ?? import_picocolors2.default.green)("\u2022") : "\u2022";
+      const rendered = trimmed.replace(/^[-*]\s+/, `${bulletChar} `);
       const wrapped = wrapLine(rendered, innerWidth);
       for (let i = 0; i < wrapped.length; i++) {
-        lines.push(boxedLine((i === 0 ? "" : "  ") + (wrapped[i] ?? ""), innerWidth, opts.isColor));
+        lines.push(
+          boxedLine(chars.vertical, (i === 0 ? "" : "  ") + (wrapped[i] ?? ""), innerWidth, opts.isColor, opts.theme)
+        );
       }
     }
   }
-  return [top, ...lines, bottom].join("\n");
-}
-function renderStatsLine(stats, isColor) {
-  const parts = [];
-  parts.push(`${stats.files} files`);
-  parts.push(`+${stats.additions} \u2212${stats.deletions}`);
-  if (stats.tokens !== void 0) parts.push(`${stats.tokens} tokens`);
-  const text = parts.join(" \xB7 ");
-  return isColor ? `    ${import_picocolors2.default.dim(text)}` : `    ${text}`;
+  lines.push("  " + styledBottom);
+  return lines.join("\n");
 }
 function shouldUseRichOutput(opts) {
   if (!opts.isTTY) return false;
@@ -9447,14 +10050,162 @@ function shouldUseRichOutput(opts) {
   if (opts.width < MIN_BOX_WIDTH) return false;
   return true;
 }
-var import_picocolors2, HEADER_RX, MIN_BOX_WIDTH;
-var init_ui_rich = __esm({
-  "src/ui-rich.ts"() {
+var import_picocolors2, HEADER_RX, EXTENSION_COLORS, MIN_BOX_WIDTH, BOX_CHARS;
+var init_ui_layout = __esm({
+  "src/ui-layout.ts"() {
     "use strict";
     import_picocolors2 = __toESM(require_picocolors());
-    init_ui();
     HEADER_RX = /^([a-z]+)(?:\(([^)]+)\))?(!)?:\s*(.*)$/;
+    EXTENSION_COLORS = {
+      ".ts": import_picocolors2.default.cyan,
+      ".mts": import_picocolors2.default.cyan,
+      ".tsx": import_picocolors2.default.cyanBright,
+      ".js": import_picocolors2.default.yellow,
+      ".mjs": import_picocolors2.default.yellow,
+      ".cjs": import_picocolors2.default.yellow,
+      ".jsx": import_picocolors2.default.yellowBright,
+      ".py": import_picocolors2.default.blue,
+      ".rs": import_picocolors2.default.red,
+      ".go": import_picocolors2.default.cyanBright,
+      ".css": import_picocolors2.default.magenta,
+      ".scss": import_picocolors2.default.magenta,
+      ".sass": import_picocolors2.default.magenta,
+      ".html": import_picocolors2.default.redBright,
+      ".md": import_picocolors2.default.green,
+      ".json": (s) => import_picocolors2.default.dim(import_picocolors2.default.cyan(s)),
+      ".yaml": (s) => import_picocolors2.default.dim(import_picocolors2.default.cyan(s)),
+      ".yml": (s) => import_picocolors2.default.dim(import_picocolors2.default.cyan(s)),
+      ".toml": (s) => import_picocolors2.default.dim(import_picocolors2.default.cyan(s)),
+      ".lock": import_picocolors2.default.dim
+    };
     MIN_BOX_WIDTH = 60;
+    BOX_CHARS = {
+      rounded: {
+        topLeft: "\u256D",
+        topRight: "\u256E",
+        bottomLeft: "\u2570",
+        bottomRight: "\u256F",
+        horizontal: "\u2500",
+        vertical: "\u2502"
+      },
+      gradient: {
+        topLeft: "\u256D",
+        topRight: "\u256E",
+        bottomLeft: "\u2570",
+        bottomRight: "\u256F",
+        horizontal: "\u2500",
+        vertical: "\u2502"
+      },
+      double: {
+        topLeft: "\u2554",
+        topRight: "\u2557",
+        bottomLeft: "\u255A",
+        bottomRight: "\u255D",
+        horizontal: "\u2550",
+        vertical: "\u2551"
+      }
+    };
+  }
+});
+
+// src/ui-rich.ts
+function buildUIContext(ui2, config2, args) {
+  return {
+    theme: ui2.theme,
+    animate: args.noAnimate ? "none" : config2.ui?.animate ?? "tasteful",
+    isTTY: !!process.stderr.isTTY,
+    isColor: ui2.isColor,
+    asciiFallback: !ui2.isColor,
+    uniform: config2.ui?.spinner === "uniform"
+  };
+}
+function createStageSpinner(opts) {
+  const origCfg = STAGE_CONFIG[opts.stage];
+  const cfg = opts.uniform ? {
+    frames: STAGE_CONFIG.aiGenerate.frames,
+    intervalMs: STAGE_CONFIG.aiGenerate.intervalMs,
+    themeKey: origCfg.themeKey
+  } : origCfg;
+  const intervalMs = Math.max(16, Math.round(cfg.intervalMs * (opts.animate === "full" ? 0.55 : 1)));
+  const frames = !opts.isColor && opts.asciiFallback ? ASCII_FRAMES : cfg.frames;
+  const colorize = opts.isColor && opts.animate !== "none" ? opts.theme.spinner[cfg.themeKey] : (s) => s;
+  const dim = opts.theme.dim;
+  const write = opts.write ?? ((s) => process.stderr.write(s));
+  let frame = 0;
+  let interval = null;
+  return {
+    start() {
+      if (interval) return;
+      if (!opts.isTTY) return;
+      if (opts.animate === "none") return;
+      interval = setInterval(() => {
+        const f = frames[frame++ % frames.length];
+        write(`\r${dim("\u203A")} ${dim(opts.message)} ${colorize(f)}`);
+      }, intervalMs);
+    },
+    stop(finalMessage) {
+      if (interval) {
+        clearInterval(interval);
+        interval = null;
+      }
+      if (opts.isTTY) {
+        write("\r\x1B[2K");
+      }
+      if (finalMessage) {
+        write(finalMessage + "\n");
+      }
+    }
+  };
+}
+async function flashSuccess(opts) {
+  const write = opts.write ?? ((s) => process.stderr.write(s));
+  const animate = opts.animate !== "none" && opts.isTTY;
+  const rawFallback = opts.settledMessage ?? opts.theme.success(opts.message);
+  const fallbackLine = animate ? rawFallback : stripAnsi(rawFallback);
+  if (!animate) {
+    write(fallbackLine + "\n");
+    return;
+  }
+  write(opts.theme.success(opts.message));
+  await new Promise((r) => setTimeout(r, opts.flashMs ?? 200));
+  write("\r\x1B[2K");
+  write((opts.settledMessage ?? opts.message) + "\n");
+}
+var STAGE_CONFIG, ASCII_FRAMES;
+var init_ui_rich = __esm({
+  "src/ui-rich.ts"() {
+    "use strict";
+    init_ui();
+    init_ui_layout();
+    init_ui_layout();
+    STAGE_CONFIG = {
+      aiGenerate: {
+        frames: ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"],
+        intervalMs: 80,
+        themeKey: "aiGenerate"
+      },
+      branchGen: {
+        frames: ["\u25F0", "\u25F3", "\u25F2", "\u25F1"],
+        intervalMs: 85,
+        themeKey: "branchGen"
+      },
+      localProvider: {
+        frames: ["\u25D0", "\u25D3", "\u25D1", "\u25D2"],
+        intervalMs: 100,
+        themeKey: "localProvider"
+      },
+      gitOp: {
+        frames: ["\u2190", "\u2196", "\u2191", "\u2197", "\u2192", "\u2198", "\u2193", "\u2199"],
+        intervalMs: 90,
+        themeKey: "gitOp"
+      },
+      smartDiff: {
+        frames: ["\u258F", "\u258E", "\u258D", "\u258C", "\u258B", "\u258A", "\u2589", "\u258A", "\u258B", "\u258C", "\u258D", "\u258E"],
+        intervalMs: 70,
+        themeKey: "smartDiff"
+      }
+    };
+    ASCII_FRAMES = ["|", "/", "-", "\\"];
   }
 });
 
@@ -9503,324 +10254,126 @@ async function interactiveRefineMessage(initial, opts) {
   if (opts.skip) return { action: "accept", message: initial };
   const rl = import_promises.default.createInterface({ input: process.stdin, output: process.stderr });
   try {
-    process.stderr.write(`
-${initial}
-
-`);
-    const choice = (await rl.question("Keep? [Y/n/e]: ")).trim().toLowerCase();
-    if (choice === "n") {
-      return { action: "abort" };
-    }
-    if (choice === "e") {
-      process.stderr.write("Enter new message (end with a line containing only .):\n");
-      const lines = [];
-      while (true) {
-        const line = await rl.question("");
-        if (line === ".") break;
-        lines.push(line);
-      }
-      const edited = lines.join("\n").trim();
-      return { action: "edit", message: edited.length > 0 ? edited : initial };
-    }
-    return { action: "accept", message: initial };
-  } finally {
-    rl.close();
-  }
-}
-async function promptYesNo(question, defaultYes = true) {
-  const rl = import_promises.default.createInterface({ input: process.stdin, output: process.stderr });
-  const suffix = defaultYes ? "[Y/n]" : "[y/N]";
-  try {
-    const answer = (await rl.question(`${question} ${suffix} `)).trim().toLowerCase();
-    if (answer === "n" || answer === "no") return false;
-    if (answer === "y" || answer === "yes") return true;
-    return defaultYes;
-  } finally {
-    rl.close();
-  }
-}
-async function confirmCommit(prompt2, opts) {
-  if (opts.skip) return { action: "commit" };
-  const rl = import_promises.default.createInterface({ input: process.stdin, output: process.stderr });
-  try {
-    const ans = (await rl.question(prompt2)).trim().toLowerCase();
-    if (ans !== "y" && ans !== "yes") {
-      return { action: "abort" };
-    }
-    return { action: "commit" };
-  } finally {
-    rl.close();
-  }
-}
-function shouldSkipTTYInteraction(hookMode) {
-  return hookMode === true || process.stdin.isTTY !== true;
-}
-function logVerboseDiagnostics(dim, verbose, quiet, diagnostics, roundTripMs) {
-  if (!verbose || quiet) return;
-  process.stderr.write(
-    `
-${formatVerboseCommitDiagnostics(diagnostics, roundTripMs)}
-`
-  );
-  dim("(verbose diagnostics on stderr)");
-}
-function isDisplayOpts(opts) {
-  return typeof opts === "object" && opts !== null && "log" in opts;
-}
-function createSilentLog() {
-  return {
-    step: () => {
-    },
-    success: () => {
-    },
-    error: (msg) => console.error(msg),
-    dim: () => {
-    }
-  };
-}
-function displayCommitMessage(message, opts) {
-  const display = isDisplayOpts(opts) ? opts : { log: opts };
-  const log = display.log;
-  const { subject, body } = splitCommitMessageForDisplay(message);
-  const tw = getTerminalWidth();
-  const useRich = shouldUseRichOutput({
-    isTTY: display.isTTY ?? !!process.stderr.isTTY,
-    noColor: display.isColor === false,
-    width: tw,
-    style: display.style ?? "rich"
-  });
-  if (useRich) {
-    const tree = display.stagedFiles && display.stagedFiles.length > 0 ? renderFileTree(display.stagedFiles, 8) : "";
-    if (tree) {
-      process.stderr.write(tree + "\n");
-    }
-    const boxed = renderBoxedCommit(subject, body, {
-      width: Math.min(Math.max(tw - 4, 60), 80),
-      isColor: !!display.isColor
-    });
-    process.stderr.write(boxed + "\n");
-    if (display.stats) {
-      process.stderr.write(renderStatsLine(display.stats, !!display.isColor) + "\n");
-    }
-    return;
-  }
-  log.success(subject);
-  if (body) {
-    for (const line of body.split("\n")) {
-      log.dim(`  ${line}`);
-    }
-    process.stderr.write("\n");
-  }
-}
-var import_promises;
-var init_commit_helpers = __esm({
-  "src/commit-helpers.ts"() {
-    "use strict";
-    import_promises = __toESM(require("node:readline/promises"));
-    init_ui_rich();
-  }
-});
-
-// src/smart-diff.ts
-function sanitizeFilepath(path) {
-  return path.replace(/[\x00-\x1F\x7F[\]`]/g, "_").slice(0, 200);
-}
-function classifyFile(filepath) {
-  const basename = filepath.split("/").pop() ?? filepath;
-  if (LOCK_FILES.has(basename)) return "lock";
-  if (filepath.endsWith(".map")) return "sourcemap";
-  if (VENDORED_PREFIXES.some((p) => filepath.startsWith(p))) return "vendored";
-  if (GENERATED_PATTERNS.some((p) => p.test(filepath))) return "generated";
-  return "code";
-}
-function parseDiffIntoFiles(diff) {
-  const files = [];
-  const parts = diff.split(/^(diff --git .+)$/m);
-  for (let i = 1; i < parts.length; i += 2) {
-    const header = parts[i];
-    const content = parts[i + 1] ?? "";
-    const match = header.match(/diff --git a\/(.+?) b\/(.+)/);
-    const filepath = match?.[2] ?? "unknown";
-    const lines = content.split("\n");
-    let additions = 0;
-    let deletions = 0;
-    for (const line of lines) {
-      if (line.startsWith("+") && !line.startsWith("+++")) additions++;
-      else if (line.startsWith("-") && !line.startsWith("---")) deletions++;
-    }
-    files.push({ filepath, content: header + content, additions, deletions });
-  }
-  return files;
-}
-function isMinified(content) {
-  const lines = content.split("\n").filter(
-    (l) => (l.startsWith("+") || l.startsWith("-")) && !l.startsWith("+++") && !l.startsWith("---")
-  );
-  if (lines.length === 0) return false;
-  return lines.some((l) => l.length > 500);
-}
-function buildFileSummary(file) {
-  const sizeKB = Math.round(file.content.length / 1024);
-  return `[modified: ${sanitizeFilepath(file.filepath)} \u2014 +${file.additions} \u2212${file.deletions} lines, ~${sizeKB}KB]
-`;
-}
-function preprocessDiffWithSizeBudget(diff, maxBytes = 5 * 1024 * 1024) {
-  const files = parseDiffIntoFiles(diff);
-  if (files.length === 0) {
-    return { processedDiff: diff, summarized: [], aggressivelySummarized: [], tokensSaved: 0 };
-  }
-  const entries = [];
-  const summarized = [];
-  let tokensSaved = 0;
-  for (const file of files) {
-    const classification = classifyFile(file.filepath);
-    switch (classification) {
-      case "sourcemap":
-        tokensSaved += estimateTokens(file.content);
-        summarized.push(file.filepath);
-        entries.push({ file, isNoise: true, summaryLine: null });
-        break;
-      case "lock":
-        tokensSaved += estimateTokens(file.content);
-        summarized.push(file.filepath);
-        entries.push({
-          file,
-          isNoise: true,
-          summaryLine: `[lock file updated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions} lines)]
-`
-        });
-        break;
-      case "generated":
-        tokensSaved += estimateTokens(file.content);
-        summarized.push(file.filepath);
-        entries.push({
-          file,
-          isNoise: true,
-          summaryLine: `[generated: ${sanitizeFilepath(file.filepath)} (+${file.additions} \u2212${file.deletions})]
-`
-        });
-        break;
-      case "vendored":
-        tokensSaved += estimateTokens(file.content);
-        summarized.push(file.filepath);
-        entries.push({
-          file,
-          isNoise: true,
-          summaryLine: `[vendored: ${sanitizeFilepath(file.filepath)} updated]
-`
-        });
-        break;
-      case "code":
-        if (isMinified(file.content)) {
-          tokensSaved += estimateTokens(file.content);
-          const sizeKB = Math.round(file.content.length / 1024);
-          summarized.push(file.filepath);
-          entries.push({
-            file,
-            isNoise: true,
-            summaryLine: `[minified asset: ${sanitizeFilepath(file.filepath)} (${sizeKB} KB)]
-`
-          });
-        } else {
-          entries.push({ file, isNoise: false, summaryLine: null });
-        }
-        break;
+    process.stderr.write(`
+${initial}
+
+`);
+    const choice = (await rl.question("Keep? [Y/n/e]: ")).trim().toLowerCase();
+    if (choice === "n") {
+      return { action: "abort" };
     }
-  }
-  const aggressiveMap = /* @__PURE__ */ new Map();
-  function buildOutput() {
-    const parts = [];
-    for (const entry of entries) {
-      if (entry.isNoise) {
-        if (entry.summaryLine !== null) parts.push(entry.summaryLine);
-      } else if (aggressiveMap.has(entry.file.filepath)) {
-        parts.push(aggressiveMap.get(entry.file.filepath));
-      } else {
-        parts.push(entry.file.content);
+    if (choice === "e") {
+      process.stderr.write("Enter new message (end with a line containing only .):\n");
+      const lines = [];
+      while (true) {
+        const line = await rl.question("");
+        if (line === ".") break;
+        lines.push(line);
       }
+      const edited = lines.join("\n").trim();
+      return { action: "edit", message: edited.length > 0 ? edited : initial };
     }
-    return parts.join("");
+    return { action: "accept", message: initial };
+  } finally {
+    rl.close();
   }
-  const codeEntries = entries.filter((e) => !e.isNoise);
-  let output = buildOutput();
-  if (output.length <= maxBytes) {
-    return {
-      processedDiff: output,
-      summarized,
-      aggressivelySummarized: [],
-      tokensSaved
-    };
+}
+async function promptYesNo(question, defaultYes = true) {
+  const rl = import_promises.default.createInterface({ input: process.stdin, output: process.stderr });
+  const suffix = defaultYes ? "[Y/n]" : "[y/N]";
+  try {
+    const answer = (await rl.question(`${question} ${suffix} `)).trim().toLowerCase();
+    if (answer === "n" || answer === "no") return false;
+    if (answer === "y" || answer === "yes") return true;
+    return defaultYes;
+  } finally {
+    rl.close();
   }
-  const TIER1_THRESHOLD = 5 * 1024;
-  for (const entry of codeEntries) {
-    if (entry.file.content.length > TIER1_THRESHOLD && !aggressiveMap.has(entry.file.filepath)) {
-      tokensSaved += estimateTokens(entry.file.content);
-      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+}
+async function confirmCommit(prompt2, opts) {
+  if (opts.skip) return { action: "commit" };
+  const rl = import_promises.default.createInterface({ input: process.stdin, output: process.stderr });
+  try {
+    const ans = (await rl.question(prompt2)).trim().toLowerCase();
+    if (ans !== "y" && ans !== "yes") {
+      return { action: "abort" };
     }
+    return { action: "commit" };
+  } finally {
+    rl.close();
   }
-  output = buildOutput();
-  if (output.length <= maxBytes) {
-    return {
-      processedDiff: output,
-      summarized,
-      aggressivelySummarized: [...aggressiveMap.keys()],
-      tokensSaved
-    };
-  }
-  const TIER2_THRESHOLD = 2 * 1024;
-  for (const entry of codeEntries) {
-    if (entry.file.content.length > TIER2_THRESHOLD && !aggressiveMap.has(entry.file.filepath)) {
-      tokensSaved += estimateTokens(entry.file.content);
-      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+}
+function shouldSkipTTYInteraction(hookMode) {
+  return hookMode === true || process.stdin.isTTY !== true;
+}
+function logVerboseDiagnostics(dim, verbose, quiet, diagnostics, roundTripMs) {
+  if (!verbose || quiet) return;
+  process.stderr.write(
+    `
+${formatVerboseCommitDiagnostics(diagnostics, roundTripMs)}
+`
+  );
+  dim("(verbose diagnostics on stderr)");
+}
+function isDisplayOpts(opts) {
+  return typeof opts === "object" && opts !== null && "log" in opts;
+}
+function createSilentLog() {
+  return {
+    step: () => {
+    },
+    success: () => {
+    },
+    error: (msg) => console.error(msg),
+    dim: () => {
     }
+  };
+}
+function displayCommitMessage(message, opts) {
+  const display = isDisplayOpts(opts) ? opts : { log: opts, isTTY: false };
+  const log = display.log;
+  const { subject, body } = splitCommitMessageForDisplay(message);
+  const tw = getTerminalWidth();
+  const useRich = shouldUseRichOutput({
+    isTTY: display.isTTY ?? !!process.stderr.isTTY,
+    noColor: display.isColor === false,
+    width: tw,
+    style: display.style ?? "rich"
+  });
+  if (useRich) {
+    const theme = display.theme ?? getUI().theme;
+    const tree = display.stagedFiles && display.stagedFiles.length > 0 ? renderFileTree(display.stagedFiles, 3, { isColor: !!display.isColor }) : "";
+    if (tree) {
+      process.stderr.write(tree + "\n");
+    }
+    const boxed = renderBoxedCommit(subject, body, {
+      width: display.boxWidth ?? Math.min(getTerminalWidth() - 4, 80),
+      isColor: !!display.isColor,
+      style: display.boxStyle ?? "gradient",
+      autoEmphasis: display.autoEmphasis ?? true,
+      theme
+    });
+    process.stderr.write(boxed + "\n");
+    if (display.stats) {
+      process.stderr.write(renderStatsLine(display.stats, !!display.isColor, theme) + "\n");
+    }
+    return;
   }
-  output = buildOutput();
-  if (output.length <= maxBytes) {
-    return {
-      processedDiff: output,
-      summarized,
-      aggressivelySummarized: [...aggressiveMap.keys()],
-      tokensSaved
-    };
-  }
-  for (const entry of codeEntries) {
-    if (!aggressiveMap.has(entry.file.filepath)) {
-      tokensSaved += estimateTokens(entry.file.content);
-      aggressiveMap.set(entry.file.filepath, buildFileSummary(entry.file));
+  log.success(subject);
+  if (body) {
+    for (const line of body.split("\n")) {
+      log.dim(`  ${line}`);
     }
+    process.stderr.write("\n");
   }
-  return {
-    processedDiff: buildOutput(),
-    summarized,
-    aggressivelySummarized: [...aggressiveMap.keys()],
-    tokensSaved
-  };
 }
-var LOCK_FILES, GENERATED_PATTERNS, VENDORED_PREFIXES;
-var init_smart_diff = __esm({
-  "src/smart-diff.ts"() {
+var import_promises;
+var init_commit_helpers = __esm({
+  "src/commit-helpers.ts"() {
     "use strict";
-    init_dist();
-    LOCK_FILES = /* @__PURE__ */ new Set([
-      "pnpm-lock.yaml",
-      "package-lock.json",
-      "yarn.lock",
-      "Cargo.lock",
-      "Gemfile.lock",
-      "poetry.lock",
-      "composer.lock",
-      "bun.lockb",
-      "shrinkwrap.json"
-    ]);
-    GENERATED_PATTERNS = [
-      /\.generated\.\w+$/,
-      /\.g\.dart$/,
-      /\.pb\.go$/,
-      /\.pb\.ts$/,
-      /(^|\/)\.prisma\/client\//,
-      /\/generated\//
-    ];
-    VENDORED_PREFIXES = ["vendor/", "third_party/", "node_modules/"];
+    import_promises = __toESM(require("node:readline/promises"));
+    init_ui();
+    init_ui_rich();
   }
 });
 
@@ -10021,6 +10574,8 @@ async function runLocalCommit(args) {
   }
   const config2 = getConfig();
   const excludes = [...config2.excludes ?? [], ...args.exclude];
+  const uiCtx = buildUIContext(ui2, config2, args);
+  const boxStyle = args.boxStyleOverride ?? config2.ui?.box?.style ?? "gradient";
   let diff = getStagedDiff(excludes);
   const changes = getStagedFiles();
   if (!args.noSmartDiff) {
@@ -10078,7 +10633,11 @@ async function runLocalCommit(args) {
       "Cloudflare provider requires api_url. Run: qc config set api_url https://your-worker.workers.dev"
     );
   }
-  const spinner = ui2.spinner(`generating commit (${modelDisplay} via ${local.provider})...`);
+  const spinner = createStageSpinner({
+    stage: "localProvider",
+    message: `generating commit (${modelDisplay} via ${local.provider})...`,
+    ...uiCtx
+  });
   if (!silent) spinner.start();
   const t0 = Date.now();
   let res;
@@ -10129,6 +10688,10 @@ async function runLocalCommit(args) {
       isTTY: !!process.stderr.isTTY,
       style: "rich",
       stagedFiles: stagedPaths,
+      boxStyle,
+      autoEmphasis: config2.ui?.box?.auto_emphasis ?? true,
+      theme: ui2.theme,
+      boxWidth: typeof config2.ui?.box?.width === "number" ? config2.ui.box.width : void 0,
       stats: {
         files: stagedPaths.length,
         additions: short.additions,
@@ -10148,15 +10711,39 @@ async function runLocalCommit(args) {
   }
   gitCommit(message);
   const branch = getCurrentBranch();
-  log.step(`[${branch} committed]`);
+  const hash = getCommitHash();
+  if (!silent) {
+    await flashSuccess({
+      message: `\u2713 committed   ${branch} \xB7 ${hash}`,
+      settledMessage: `${ui2.theme.success("\u2713 committed")}${ui2.theme.dim(`   ${branch} \xB7 ${hash}`)}`,
+      theme: ui2.theme,
+      animate: uiCtx.animate,
+      isTTY: uiCtx.isTTY
+    });
+  }
   if (args.push) {
     const pushStats = getPushStats();
     log.step(`pushing to origin/${branch}...`);
     gitPush();
-    if (pushStats) {
-      log.success(`pushed ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`);
-    } else {
-      log.success("pushed");
+    if (!silent) {
+      if (pushStats) {
+        await flashSuccess({
+          message: `\u2713 pushed ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`,
+          settledMessage: `${ui2.theme.success("\u2713 pushed")}${ui2.theme.dim(
+            ` ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`
+          )}`,
+          theme: ui2.theme,
+          animate: uiCtx.animate,
+          isTTY: uiCtx.isTTY
+        });
+      } else {
+        await flashSuccess({
+          message: "\u2713 pushed",
+          theme: ui2.theme,
+          animate: uiCtx.animate,
+          isTTY: uiCtx.isTTY
+        });
+      }
     }
   }
 }
@@ -10272,7 +10859,13 @@ async function runLocalBranch(opts) {
   }
   const ui2 = getUI();
   const log = ui2.log;
-  const spinner = ui2.spinner(`generating branch name (${opts.model ?? local.model} via ${local.provider})...`);
+  const config2 = getConfig();
+  const branchUiCtx = buildUIContext(ui2, config2, { noAnimate: opts.noAnimate });
+  const spinner = createStageSpinner({
+    stage: "branchGen",
+    message: `generating branch name (${opts.model ?? local.model} via ${local.provider})...`,
+    ...branchUiCtx
+  });
   if (process.stderr.isTTY) spinner.start();
   let final;
   try {
@@ -10322,6 +10915,7 @@ var init_local = __esm({
     init_ui();
     init_commit_helpers();
     init_branch_name();
+    init_ui_rich();
     CONFIG_PATH2 = (0, import_path8.join)((0, import_os4.homedir)(), CONFIG_DIR);
     PROVIDER_URLS = {
       ollama: "http://localhost:11434",
@@ -10356,12 +10950,14 @@ function finalizeGeneratedBranchName(raw) {
 async function runBranch(opts) {
   const ui2 = getUI();
   const log = ui2.log;
+  const config2 = getConfig();
+  const animate = opts.noAnimate ? "none" : config2.ui?.animate ?? "tasteful";
+  const uniformSpinner = config2.ui?.spinner === "uniform";
   if (!isGitRepo()) {
     log.error("Not a git repository.");
     process.exit(1);
   }
   const baseRef = opts.from ?? "HEAD";
-  const config2 = getConfig();
   const model = opts.model ?? config2.model;
   const genRules = branchGenerationRules(config2);
   if (opts.rescue) {
@@ -10390,7 +10986,16 @@ async function runBranch(opts) {
       const recent = getRecentBranchCommits(state.commitsAhead);
       const apiKey2 = opts.apiKey ?? getApiKey();
       if (apiKey2) {
-        const spinner2 = ui2.spinner(`generating branch name (${model ?? "default"})...`);
+        const spinner2 = createStageSpinner({
+          stage: "branchGen",
+          message: `generating branch name (${model ?? "default"})...`,
+          theme: ui2.theme,
+          animate,
+          isTTY: !!process.stderr.isTTY,
+          isColor: ui2.isColor,
+          asciiFallback: !ui2.isColor,
+          uniform: uniformSpinner
+        });
         if (process.stderr.isTTY) spinner2.start();
         try {
           const client = new ApiClient({ apiKey: apiKey2 });
@@ -10419,7 +11024,16 @@ async function runBranch(opts) {
             "Not authenticated. Run `qc login` first, or configure a local provider for `--rescue`."
           );
         }
-        const spinner2 = ui2.spinner(`generating branch name (${model ?? "default"} via local)...`);
+        const spinner2 = createStageSpinner({
+          stage: "branchGen",
+          message: `generating branch name (${model ?? "default"} via local)...`,
+          theme: ui2.theme,
+          animate,
+          isTTY: !!process.stderr.isTTY,
+          isColor: ui2.isColor,
+          asciiFallback: !ui2.isColor,
+          uniform: uniformSpinner
+        });
         if (process.stderr.isTTY) spinner2.start();
         try {
           try {
@@ -10516,13 +11130,23 @@ async function runBranch(opts) {
         noSwitch: opts.noSwitch,
         push: opts.push,
         baseRef,
-        rules: genRules
+        rules: genRules,
+        noAnimate: opts.noAnimate
       });
       return;
     }
     throw new Error("Not authenticated. Run `qc login` first, or provide --message.");
   }
-  const spinner = ui2.spinner(`generating branch name (${model ?? "default"})...`);
+  const spinner = createStageSpinner({
+    stage: "branchGen",
+    message: `generating branch name (${model ?? "default"})...`,
+    theme: ui2.theme,
+    animate,
+    isTTY: !!process.stderr.isTTY,
+    isColor: ui2.isColor,
+    asciiFallback: !ui2.isColor,
+    uniform: uniformSpinner
+  });
   if (process.stderr.isTTY) spinner.start();
   let result;
   try {
@@ -10560,6 +11184,7 @@ var init_branch2 = __esm({
     init_branch_name();
     init_commit_helpers();
     init_ui();
+    init_ui_rich();
   }
 });
 
@@ -10965,7 +11590,12 @@ async function runBranchGuard(args, log) {
     }
     generateLocalBranchNameFn = generateLocalBranchName2;
   }
-  const spinner = ui2.spinner(`generating branch name...`);
+  const guardUiCtx = buildUIContext(ui2, config2, args);
+  const spinner = createStageSpinner({
+    stage: "branchGen",
+    message: "generating branch name...",
+    ...guardUiCtx
+  });
   if (process.stderr.isTTY) spinner.start();
   let rawName;
   let usedFallback = false;
@@ -11075,6 +11705,7 @@ var init_branch_guard = __esm({
     init_branch_name();
     init_ui();
     init_commit_helpers();
+    init_ui_rich();
   }
 });
 
@@ -11101,7 +11732,8 @@ async function runCommit(args) {
       hookMode: !!args.hookMode,
       apiKey: apiKeyFlag ?? getApiKey() ?? void 0,
       model: args.model,
-      excludes
+      excludes,
+      noAnimate: args.noAnimate
     },
     log
   );
@@ -11182,7 +11814,13 @@ async function runCommit(args) {
   const skipInteractive = silent || args.quiet || shouldSkipTTYInteraction(args.hookMode);
   const skipConfirm = args.dryRun || messageOnly || silent || args.quiet || shouldSkipTTYInteraction(args.hookMode);
   const modelDisplay = model ?? "default";
-  const spinner = ui2.spinner(`generating commit (${modelDisplay})...`);
+  const uiCtx = buildUIContext(ui2, config2, args);
+  const boxStyle = args.boxStyleOverride ?? config2.ui?.box?.style ?? "gradient";
+  const spinner = createStageSpinner({
+    stage: "aiGenerate",
+    message: `generating commit (${modelDisplay})...`,
+    ...uiCtx
+  });
   if (!silent) spinner.start();
   const t0 = Date.now();
   let generatedMessage;
@@ -11226,6 +11864,10 @@ async function runCommit(args) {
     isTTY: !!process.stderr.isTTY,
     style: "rich",
     stagedFiles: stagedPaths,
+    boxStyle,
+    autoEmphasis: config2.ui?.box?.auto_emphasis ?? true,
+    theme: ui2.theme,
+    boxWidth: typeof config2.ui?.box?.width === "number" ? config2.ui.box.width : void 0,
     stats: {
       files: stagedPaths.length,
       additions: short.additions,
@@ -11245,15 +11887,38 @@ async function runCommit(args) {
   gitCommit(message);
   const hash = getCommitHash();
   const branch = getCurrentBranch();
-  log.step(`[${branch} ${hash}] committed`);
+  if (!silent) {
+    await flashSuccess({
+      message: `\u2713 committed   ${branch} \xB7 ${hash}`,
+      settledMessage: `${ui2.theme.success("\u2713 committed")}${ui2.theme.dim(`   ${branch} \xB7 ${hash}`)}`,
+      theme: ui2.theme,
+      animate: uiCtx.animate,
+      isTTY: !!process.stderr.isTTY
+    });
+  }
   if (push) {
     const pushStats = getPushStats();
     log.step(`pushing to origin/${branch}...`);
     gitPush();
-    if (pushStats) {
-      log.success(`pushed ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`);
-    } else {
-      log.success("pushed");
+    if (!silent) {
+      if (pushStats) {
+        await flashSuccess({
+          message: `\u2713 pushed ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`,
+          settledMessage: `${ui2.theme.success("\u2713 pushed")}${ui2.theme.dim(
+            ` ${pushStats.commits} commit(s) \xB7 ${pushStats.stat}`
+          )}`,
+          theme: ui2.theme,
+          animate: uiCtx.animate,
+          isTTY: !!process.stderr.isTTY
+        });
+      } else {
+        await flashSuccess({
+          message: "\u2713 pushed",
+          theme: ui2.theme,
+          animate: uiCtx.animate,
+          isTTY: !!process.stderr.isTTY
+        });
+      }
     }
   }
 }
@@ -11269,6 +11934,7 @@ var init_commit = __esm({
     init_smart_diff();
     init_commit_helpers();
     init_branch_guard();
+    init_ui_rich();
   }
 });
 
@@ -11285,8 +11951,8 @@ Usage:
   qc                    Generate commit message and commit (default)
   qc pr                 Generate PR description from branch commits
   qc changelog          Generate changelog from commits since last tag
-  qc changeset          Automate pnpm changeset with AI
-  qc branch             Generate branch name + create branch (use --message for description)
+  qc changeset          Generate changesets from branch commits (pnpm monorepo)
+  qc branch             Generate and create a named branch from changes
   qc init               Install prepare-commit-msg hook
   qc login              Sign in via browser
   qc logout             Clear local credentials
@@ -11294,11 +11960,13 @@ Usage:
   qc team               Team management (info, rules, invite)
   qc config             Show/set config
 
-Flags:
+Run \`qc <command> -h\` for command-specific help.
+
+Commit flags:
   -p, --push            Commit and push
-  -a, --all             Stage all tracked changes first
+  -a, --all             Stage all files (modified + untracked) first
   -m, --message-only    Print message only (stdout, no commit)
-  -v, --verbose         Show diagnostics (model, token estimates, rules) + API round-trip ms on stderr
+  -v, --verbose         Show diagnostics (model, tokens, latency)
   -q, --quiet           Minimal output
   -n, --dry-run         Show message without committing
   -i, --interactive     Interactive refinement mode
@@ -11309,28 +11977,15 @@ Flags:
   -t, --type <type>     Force commit type
   -S, --scope <scope>   Force scope
   -e, --exclude <pat>   Exclude files from diff (repeatable)
-
   --no-context          Skip commit history context
   --no-smart-diff       Skip smart diff preprocessing
   --no-color            Disable colors
+  --no-animate          Disable spinner animation and success flash
+  --style <name>        Box style: rounded | gradient | double | none
   --model <id>          Use specific model
-  --base <branch>       Base branch for pr/changeset (default: main)
-  --create              Create PR with gh CLI (qc pr --create)
-  --from <ref>          Start ref for changelog / base ref for qc branch
-  --to <ref>            End ref for changelog
-  --write               Write changelog to CHANGELOG.md
   --hook-mode           Silent mode for git hooks
-
-Branch flags (qc branch):
-  --message <text>      Generate from a description (no diff needed)
-  --from-commits        Generate from recent commits instead of diff
-  --rescue              Move commits off current protected branch (see docs)
-  --no-switch           Create branch but don't checkout
-  --from <ref>          Create branch from this ref (default: HEAD)
-
-Commit guard flags:
-  --allow-protected     Bypass protected-branch guard for this run
-  --auto-branch         Auto-create branch with generated name (no prompt)
+  --allow-protected     Bypass protected-branch guard
+  --auto-branch         Auto-create branch (no prompt) when on protected branch
 
 Compose short flags: qc -ap (stage all + push), qc -apv (+ verbose)
 
@@ -11343,6 +11998,81 @@ Examples:
   qc -e "*.lock"       # exclude lock files
   qc -t fix -S auth    # force type and scope
 `;
+var HELP_PR = `qc pr \u2014 Generate a PR description from branch commits
+
+Usage:
+  qc pr                 Generate PR description and print to stdout
+  qc pr --create        Generate and open a PR via \`gh\` CLI
+
+Flags:
+  --base <branch>       Base branch to compare against (default: main)
+  --create              Create the PR with \`gh pr create\` (requires gh CLI)
+  --model <id>          Use specific model
+
+Examples:
+  qc pr                 # print PR description
+  qc pr --create        # create the PR directly
+  qc pr --base develop  # compare against develop
+`;
+var HELP_CHANGELOG = `qc changelog \u2014 Generate a changelog from commits since last tag
+
+Usage:
+  qc changelog          Print changelog entry to stdout
+  qc changelog --write  Prepend to CHANGELOG.md
+
+Flags:
+  --from <ref>          Start ref (default: latest tag)
+  --to <ref>            End ref (default: HEAD)
+  --write               Write/prepend to CHANGELOG.md
+  --version <ver>       Version label for header (default: derived from --to)
+  --model <id>          Use specific model
+
+Examples:
+  qc changelog                     # print changelog since last tag
+  qc changelog --write             # prepend to CHANGELOG.md
+  qc changelog --from v1.0.0       # since a specific tag
+`;
+var HELP_CHANGESET = `qc changeset \u2014 Generate pnpm changesets from branch commits
+
+Usage:
+  qc changeset          Analyze commits on current branch vs base, generate .changeset/ file
+
+Requires: commits ahead of base branch (not just staged files).
+Tip: commit your changes first with \`qc\`, then run \`qc changeset\`.
+
+Flags:
+  --base <branch>       Base branch to compare against (default: main)
+  --model <id>          Use specific model
+
+Examples:
+  qc changeset                     # changeset from commits vs main
+  qc changeset --base develop      # compare against develop
+`;
+var HELP_BRANCH = `qc branch \u2014 Generate and create a branch with an AI-generated name
+
+Usage:
+  qc branch                     Name from staged/unstaged diff
+  qc branch <name>              Use explicit name (skip AI)
+  qc branch --message "..."     Name from a description (no diff needed)
+  qc branch --from-commits      Name from recent commit history
+  qc branch --rescue            Move commits off a protected branch
+
+Flags:
+  --message <text>      Generate name from a description
+  --from-commits        Use commit log instead of diff for naming
+  --rescue              Move existing commits off protected branch to new branch
+  --no-switch           Create branch but don't checkout
+  --from <ref>          Base from this ref (default: HEAD)
+  -p, --push            Push immediately and set upstream
+  -n, --dry-run         Show generated name without creating
+
+Examples:
+  qc branch                         # name from current changes
+  qc branch -m "add oauth login"    # name from description
+  qc branch feat/my-feature         # explicit name
+  qc branch --rescue                # move commits off main
+  qc branch -np                     # dry-run (show name only)
+`;
 var SHORT_FLAGS = {
   p: "push",
   a: "all",
@@ -11405,6 +12135,7 @@ function parseArgs(args) {
             result[key] = val;
           }
         } else if (ch === "h") {
+          if (result.command !== "commit") result.helpFor = result.command;
           result.command = "help";
         } else {
           throw new Error(`Unknown flag: -${ch}`);
@@ -11433,12 +12164,14 @@ function parseArgs(args) {
         continue;
       }
       if (ch === "h") {
+        if (result.command !== "commit") result.helpFor = result.command;
         result.command = "help";
         continue;
       }
       throw new Error(`Unknown flag: -${ch}`);
     }
     if (arg === "--help") {
+      if (result.command !== "commit") result.helpFor = result.command;
       result.command = "help";
     } else if (arg === "--all") {
       result.all = true;
@@ -11517,6 +12250,16 @@ function parseArgs(args) {
       const ex = args[++i];
       if (ex) result.exclude.push(ex);
     } else if (arg === "--no-color") {
+    } else if (arg === "--no-animate") {
+      result.noAnimate = true;
+    } else if (arg === "--style" && i + 1 < args.length) {
+      const v = args[++i];
+      if (v !== "rounded" && v !== "gradient" && v !== "double" && v !== "none") {
+        throw new Error(
+          `Invalid --style value: ${v}. Must be: rounded | gradient | double | none.`
+        );
+      }
+      result.boxStyleOverride = v;
     } else if (arg === "login") {
       result.command = "login";
       subcommandSeen = true;
@@ -11576,7 +12319,13 @@ async function main() {
   }
   const { command, apiKey } = values;
   if (command === "help") {
-    console.log(HELP);
+    const subHelp = {
+      pr: HELP_PR,
+      changelog: HELP_CHANGELOG,
+      changeset: HELP_CHANGESET,
+      branch: HELP_BRANCH
+    };
+    console.log(values.helpFor && subHelp[values.helpFor] ? subHelp[values.helpFor] : HELP);
     return;
   }
   if (values.setProvider) {
@@ -11662,7 +12411,8 @@ async function main() {
       push: values.push,
       from: values.from,
       model: values.model,
-      apiKey: values.apiKey
+      apiKey: values.apiKey,
+      noAnimate: values.noAnimate
     });
     return;
   }