@bastani/atomic 0.9.19-alpha.1 → 0.9.19-alpha.10

package/dist/builtin/subagents/src/extension/index.bundle.mjs

@@ -74,17 +74,17 @@ var require_visit = __commonJS(function(exports) {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  function visit_(key, node, visitor, path2) {
-    const ctrl = callVisitor(key, node, visitor, path2);
+  function visit_(key, node, visitor, path) {
+    const ctrl = callVisitor(key, node, visitor, path);
     if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-      replaceNode(key, path2, ctrl);
-      return visit_(key, ctrl, visitor, path2);
+      replaceNode(key, path, ctrl);
+      return visit_(key, ctrl, visitor, path);
     }
     if (typeof ctrl !== "symbol") {
       if (identity.isCollection(node)) {
-        path2 = Object.freeze(path2.concat(node));
+        path = Object.freeze(path.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = visit_(i, node.items[i], visitor, path2);
+          const ci = visit_(i, node.items[i], visitor, path);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -95,13 +95,13 @@ var require_visit = __commonJS(function(exports) {
           }
         }
       } else if (identity.isPair(node)) {
-        path2 = Object.freeze(path2.concat(node));
-        const ck = visit_("key", node.key, visitor, path2);
+        path = Object.freeze(path.concat(node));
+        const ck = visit_("key", node.key, visitor, path);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = visit_("value", node.value, visitor, path2);
+        const cv = visit_("value", node.value, visitor, path);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -122,17 +122,17 @@ var require_visit = __commonJS(function(exports) {
   visitAsync.BREAK = BREAK;
   visitAsync.SKIP = SKIP;
   visitAsync.REMOVE = REMOVE;
-  async function visitAsync_(key, node, visitor, path2) {
-    const ctrl = await callVisitor(key, node, visitor, path2);
+  async function visitAsync_(key, node, visitor, path) {
+    const ctrl = await callVisitor(key, node, visitor, path);
     if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-      replaceNode(key, path2, ctrl);
-      return visitAsync_(key, ctrl, visitor, path2);
+      replaceNode(key, path, ctrl);
+      return visitAsync_(key, ctrl, visitor, path);
     }
     if (typeof ctrl !== "symbol") {
       if (identity.isCollection(node)) {
-        path2 = Object.freeze(path2.concat(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, path2);
+          const ci = await visitAsync_(i, node.items[i], visitor, path);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -143,13 +143,13 @@ var require_visit = __commonJS(function(exports) {
           }
         }
       } else if (identity.isPair(node)) {
-        path2 = Object.freeze(path2.concat(node));
-        const ck = await visitAsync_("key", node.key, visitor, path2);
+        path = Object.freeze(path.concat(node));
+        const ck = await visitAsync_("key", node.key, visitor, path);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = await visitAsync_("value", node.value, visitor, path2);
+        const cv = await visitAsync_("value", node.value, visitor, path);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -176,23 +176,23 @@ var require_visit = __commonJS(function(exports) {
     }
     return visitor;
   }
-  function callVisitor(key, node, visitor, path2) {
+  function callVisitor(key, node, visitor, path) {
     if (typeof visitor === "function")
-      return visitor(key, node, path2);
+      return visitor(key, node, path);
     if (identity.isMap(node))
-      return visitor.Map?.(key, node, path2);
+      return visitor.Map?.(key, node, path);
     if (identity.isSeq(node))
-      return visitor.Seq?.(key, node, path2);
+      return visitor.Seq?.(key, node, path);
     if (identity.isPair(node))
-      return visitor.Pair?.(key, node, path2);
+      return visitor.Pair?.(key, node, path);
     if (identity.isScalar(node))
-      return visitor.Scalar?.(key, node, path2);
+      return visitor.Scalar?.(key, node, path);
     if (identity.isAlias(node))
-      return visitor.Alias?.(key, node, path2);
+      return visitor.Alias?.(key, node, path);
     return;
   }
-  function replaceNode(key, path2, node) {
-    const parent = path2[path2.length - 1];
+  function replaceNode(key, path, node) {
+    const parent = path[path.length - 1];
     if (identity.isCollection(parent)) {
       parent.items[key] = node;
     } else if (identity.isPair(parent)) {
@@ -483,8 +483,8 @@ var require_toJS = __commonJS(function(exports) {
         return value.toJSON(arg, ctx);
       const data = { aliasCount: 0, count: 1, res: undefined };
       ctx.anchors.set(value, data);
-      ctx.onCreate = (res2) => {
-        data.res = res2;
+      ctx.onCreate = (res) => {
+        data.res = res;
         delete ctx.onCreate;
       };
       const res = value.toJSON(arg, ctx);
@@ -528,8 +528,8 @@ var require_Node = __commonJS(function(exports) {
       };
       const res = toJS.toJS(this, "", ctx);
       if (typeof onAnchor === "function")
-        for (const { count, res: res2 } of ctx.anchors.values())
-          onAnchor(res2, count);
+        for (const { count, res } of ctx.anchors.values())
+          onAnchor(res, count);
       return typeof reviver === "function" ? applyReviver.applyReviver(reviver, { "": res }, "", res) : res;
     }
   }
@@ -583,16 +583,16 @@ var require_Alias = __commonJS(function(exports) {
     toJSON(_arg, ctx) {
       if (!ctx)
         return { source: this.source };
-      const { anchors: anchors2, doc, maxAliasCount } = ctx;
+      const { anchors, doc, maxAliasCount } = ctx;
       const source = this.resolve(doc, ctx);
       if (!source) {
         const msg = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
         throw new ReferenceError(msg);
       }
-      let data = anchors2.get(source);
+      let data = anchors.get(source);
       if (!data) {
         toJS.toJS(source, null, ctx);
-        data = anchors2.get(source);
+        data = anchors.get(source);
       }
       if (data?.res === undefined) {
         const msg = "This should not happen: Alias anchor was not resolved?";
@@ -601,7 +601,7 @@ var require_Alias = __commonJS(function(exports) {
       if (maxAliasCount >= 0) {
         data.count += 1;
         if (data.aliasCount === 0)
-          data.aliasCount = getAliasCount(doc, source, anchors2);
+          data.aliasCount = getAliasCount(doc, source, anchors);
         if (data.count * data.aliasCount > maxAliasCount) {
           const msg = "Excessive alias count indicates a resource exhaustion attack";
           throw new ReferenceError(msg);
@@ -623,22 +623,22 @@ var require_Alias = __commonJS(function(exports) {
       return src;
     }
   }
-  function getAliasCount(doc, node, anchors2) {
+  function getAliasCount(doc, node, anchors) {
     if (identity.isAlias(node)) {
       const source = node.resolve(doc);
-      const anchor = anchors2 && source && anchors2.get(source);
+      const anchor = anchors && source && anchors.get(source);
       return anchor ? anchor.count * anchor.aliasCount : 0;
     } else if (identity.isCollection(node)) {
       let count = 0;
       for (const item of node.items) {
-        const c = getAliasCount(doc, item, anchors2);
+        const c = getAliasCount(doc, item, anchors);
         if (c > count)
           count = c;
       }
       return count;
     } else if (identity.isPair(node)) {
-      const kc = getAliasCount(doc, node.key, anchors2);
-      const vc = getAliasCount(doc, node.value, anchors2);
+      const kc = getAliasCount(doc, node.key, anchors);
+      const vc = getAliasCount(doc, node.value, anchors);
       return Math.max(kc, vc);
     }
     return 1;
@@ -723,10 +723,10 @@ var require_createNode = __commonJS(function(exports) {
         value = value.toJSON();
       }
       if (!value || typeof value !== "object") {
-        const node2 = new Scalar.Scalar(value);
+        const node = new Scalar.Scalar(value);
         if (ref)
-          ref.node = node2;
-        return node2;
+          ref.node = node;
+        return node;
       }
       tagObj = value instanceof Map ? schema[identity.MAP] : (Symbol.iterator in Object(value)) ? schema[identity.SEQ] : schema[identity.MAP];
     }
@@ -751,10 +751,10 @@ var require_Collection = __commonJS(function(exports) {
   var createNode = require_createNode();
   var identity = require_identity();
   var Node = require_Node();
-  function collectionFromPath(schema, path2, value) {
+  function collectionFromPath(schema, path, value) {
     let v = value;
-    for (let i = path2.length - 1;i >= 0; --i) {
-      const k = path2[i];
+    for (let i = path.length - 1;i >= 0; --i) {
+      const k = path[i];
       if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
         const a = [];
         a[k] = v;
@@ -773,7 +773,7 @@ var require_Collection = __commonJS(function(exports) {
       sourceObjects: new Map
     });
   }
-  var isEmptyPath = (path2) => path2 == null || typeof path2 === "object" && !!path2[Symbol.iterator]().next().done;
+  var isEmptyPath = (path) => path == null || typeof path === "object" && !!path[Symbol.iterator]().next().done;
 
   class Collection extends Node.NodeBase {
     constructor(type, schema) {
@@ -794,11 +794,11 @@ var require_Collection = __commonJS(function(exports) {
         copy.range = this.range.slice();
       return copy;
     }
-    addIn(path2, value) {
-      if (isEmptyPath(path2))
+    addIn(path, value) {
+      if (isEmptyPath(path))
         this.add(value);
       else {
-        const [key, ...rest] = path2;
+        const [key, ...rest] = path;
         const node = this.get(key, true);
         if (identity.isCollection(node))
           node.addIn(rest, value);
@@ -808,8 +808,8 @@ var require_Collection = __commonJS(function(exports) {
           throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
       }
     }
-    deleteIn(path2) {
-      const [key, ...rest] = path2;
+    deleteIn(path) {
+      const [key, ...rest] = path;
       if (rest.length === 0)
         return this.delete(key);
       const node = this.get(key, true);
@@ -818,8 +818,8 @@ var require_Collection = __commonJS(function(exports) {
       else
         throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
     }
-    getIn(path2, keepScalar) {
-      const [key, ...rest] = path2;
+    getIn(path, keepScalar) {
+      const [key, ...rest] = path;
       const node = this.get(key, true);
       if (rest.length === 0)
         return !keepScalar && identity.isScalar(node) ? node.value : node;
@@ -834,15 +834,15 @@ var require_Collection = __commonJS(function(exports) {
         return n == null || allowScalar && identity.isScalar(n) && n.value == null && !n.commentBefore && !n.comment && !n.tag;
       });
     }
-    hasIn(path2) {
-      const [key, ...rest] = path2;
+    hasIn(path) {
+      const [key, ...rest] = path;
       if (rest.length === 0)
         return this.has(key);
       const node = this.get(key, true);
       return identity.isCollection(node) ? node.hasIn(rest) : false;
     }
-    setIn(path2, value) {
-      const [key, ...rest] = path2;
+    setIn(path, value) {
+      const [key, ...rest] = path;
       if (rest.length === 0) {
         this.set(key, value);
       } else {
@@ -975,17 +975,17 @@ var require_foldFlowLines = __commonJS(function(exports) {
     if (onFold)
       onFold();
     let res = text.slice(0, folds[0]);
-    for (let i2 = 0;i2 < folds.length; ++i2) {
-      const fold = folds[i2];
-      const end2 = folds[i2 + 1] || text.length;
+    for (let i = 0;i < folds.length; ++i) {
+      const fold = folds[i];
+      const end = folds[i + 1] || text.length;
       if (fold === 0)
         res = `
-${indent}${text.slice(0, end2)}`;
+${indent}${text.slice(0, end)}`;
       else {
         if (mode === FOLD_QUOTED && escapedFolds[fold])
           res += `${text[fold]}\\`;
         res += `
-${indent}${text.slice(fold + 1, end2)}`;
+${indent}${text.slice(fold + 1, end)}`;
       }
     }
     return res;
@@ -1621,15 +1621,15 @@ var require_merge = __commonJS(function(exports) {
     if (!identity.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) {
+    for (const [key, value] of srcMap) {
       if (map instanceof Map) {
         if (!map.has(key))
-          map.set(key, value2);
+          map.set(key, value);
       } else if (map instanceof Set) {
         map.add(key);
       } else if (!Object.prototype.hasOwnProperty.call(map, key)) {
         Object.defineProperty(map, key, {
-          value: value2,
+          value,
           writable: true,
           enumerable: true,
           configurable: true
@@ -1752,8 +1752,8 @@ var require_stringifyCollection = __commonJS(function(exports) {
   var stringifyComment = require_stringifyComment();
   function stringifyCollection(collection, ctx, options) {
     const flow = ctx.inFlow ?? collection.flow;
-    const stringify2 = flow ? stringifyFlowCollection : stringifyBlockCollection;
-    return stringify2(collection, ctx, options);
+    const stringify = flow ? stringifyFlowCollection : stringifyBlockCollection;
+    return stringify(collection, ctx, options);
   }
   function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, flowChars, itemIndent, onChompKeep, onComment }) {
     const { indent, options: { commentString } } = ctx;
@@ -1762,13 +1762,13 @@ var require_stringifyCollection = __commonJS(function(exports) {
     const lines = [];
     for (let i = 0;i < items.length; ++i) {
       const item = items[i];
-      let comment2 = null;
+      let comment = null;
       if (identity.isNode(item)) {
         if (!chompKeep && item.spaceBefore)
           lines.push("");
         addCommentBefore(ctx, lines, item.commentBefore, chompKeep);
         if (item.comment)
-          comment2 = item.comment;
+          comment = item.comment;
       } else if (identity.isPair(item)) {
         const ik = identity.isNode(item.key) ? item.key : null;
         if (ik) {
@@ -1778,12 +1778,12 @@ var require_stringifyCollection = __commonJS(function(exports) {
         }
       }
       chompKeep = false;
-      let str2 = stringify.stringify(item, itemCtx, () => comment2 = null, () => chompKeep = true);
-      if (comment2)
-        str2 += stringifyComment.lineComment(str2, itemIndent, commentString(comment2));
-      if (chompKeep && comment2)
+      let str = stringify.stringify(item, itemCtx, () => comment = null, () => chompKeep = true);
+      if (comment)
+        str += stringifyComment.lineComment(str, itemIndent, commentString(comment));
+      if (chompKeep && comment)
         chompKeep = false;
-      lines.push(blockItemPrefix + str2);
+      lines.push(blockItemPrefix + str);
     }
     let str;
     if (lines.length === 0) {
@@ -2033,10 +2033,10 @@ var require_map = __commonJS(function(exports) {
     default: true,
     nodeClass: YAMLMap.YAMLMap,
     tag: "tag:yaml.org,2002:map",
-    resolve(map2, onError) {
-      if (!identity.isMap(map2))
+    resolve(map, onError) {
+      if (!identity.isMap(map))
         onError("Expected a mapping for this tag");
-      return map2;
+      return map;
     },
     createNode: (schema, obj, ctx) => YAMLMap.YAMLMap.from(schema, obj, ctx)
   };
@@ -2145,10 +2145,10 @@ var require_seq = __commonJS(function(exports) {
     default: true,
     nodeClass: YAMLSeq.YAMLSeq,
     tag: "tag:yaml.org,2002:seq",
-    resolve(seq2, onError) {
-      if (!identity.isSeq(seq2))
+    resolve(seq, onError) {
+      if (!identity.isSeq(seq))
         onError("Expected a sequence for this tag");
-      return seq2;
+      return seq;
     },
     createNode: (schema, obj, ctx) => YAMLSeq.YAMLSeq.from(schema, obj, ctx)
   };
@@ -2494,8 +2494,8 @@ ${cn.comment}` : item.comment;
   }
   function createPairs(schema, iterable, ctx) {
     const { replacer } = ctx;
-    const pairs2 = new YAMLSeq.YAMLSeq(schema);
-    pairs2.tag = "tag:yaml.org,2002:pairs";
+    const pairs = new YAMLSeq.YAMLSeq(schema);
+    pairs.tag = "tag:yaml.org,2002:pairs";
     let i = 0;
     if (iterable && Symbol.iterator in Object(iterable))
       for (let it of iterable) {
@@ -2519,9 +2519,9 @@ ${cn.comment}` : item.comment;
         } else {
           key = it;
         }
-        pairs2.items.push(Pair.createPair(key, value, ctx));
+        pairs.items.push(Pair.createPair(key, value, ctx));
       }
-    return pairs2;
+    return pairs;
   }
   var pairs = {
     collection: "seq",
@@ -2575,9 +2575,9 @@ var require_omap = __commonJS(function(exports) {
     }
     static from(schema, iterable, ctx) {
       const pairs$1 = pairs.createPairs(schema, iterable, ctx);
-      const omap2 = new this;
-      omap2.items = pairs$1.items;
-      return omap2;
+      const omap = new this;
+      omap.items = pairs$1.items;
+      return omap;
     }
   }
   YAMLOMap.tag = "tag:yaml.org,2002:omap";
@@ -2703,8 +2703,8 @@ var require_int2 = __commonJS(function(exports) {
           str = `0x${str}`;
           break;
       }
-      const n2 = BigInt(str);
-      return sign === "-" ? BigInt(-1) * n2 : n2;
+      const n = BigInt(str);
+      return sign === "-" ? BigInt(-1) * n : n;
     }
     const n = parseInt(str, radix);
     return sign === "-" ? -1 * n : n;
@@ -2808,14 +2808,14 @@ var require_set = __commonJS(function(exports) {
     }
     static from(schema, iterable, ctx) {
       const { replacer } = ctx;
-      const set2 = new this(schema);
+      const set = new this(schema);
       if (iterable && Symbol.iterator in Object(iterable))
         for (let value of iterable) {
           if (typeof replacer === "function")
             value = replacer.call(iterable, value, value);
-          set2.items.push(Pair.createPair(value, null, ctx));
+          set.items.push(Pair.createPair(value, null, ctx));
         }
-      return set2;
+      return set;
     }
   }
   YAMLSet.tag = "tag:yaml.org,2002:set";
@@ -2848,7 +2848,7 @@ var require_timestamp = __commonJS(function(exports) {
     const sign = str[0];
     const parts = sign === "-" || sign === "+" ? str.substring(1) : str;
     const num = (n) => asBigInt ? BigInt(n) : Number(n);
-    const res = parts.replace(/_/g, "").split(":").reduce((res2, p) => res2 * num(60) + num(p), num(0));
+    const res = parts.replace(/_/g, "").split(":").reduce((res, p) => res * num(60) + num(p), num(0));
     return sign === "-" ? num(-1) * res : res;
   }
   function stringifySexagesimal(node) {
@@ -3039,16 +3039,16 @@ var require_tags = __commonJS(function(exports) {
     }
     if (addMergeTag)
       tags = tags.concat(merge.merge);
-    return tags.reduce((tags2, tag) => {
+    return tags.reduce((tags, tag) => {
       const tagObj = typeof tag === "string" ? tagsByName[tag] : tag;
       if (!tagObj) {
         const tagName = JSON.stringify(tag);
         const keys = Object.keys(tagsByName).map((key) => JSON.stringify(key)).join(", ");
         throw new Error(`Unknown custom tag ${tagName}; use one of ${keys}`);
       }
-      if (!tags2.includes(tagObj))
-        tags2.push(tagObj);
-      return tags2;
+      if (!tags.includes(tagObj))
+        tags.push(tagObj);
+      return tags;
     }, []);
   }
   exports.coreKnownTags = coreKnownTags;
@@ -3235,9 +3235,9 @@ var require_Document = __commonJS(function(exports) {
       if (assertCollection(this.contents))
         this.contents.add(value);
     }
-    addIn(path2, value) {
+    addIn(path, value) {
       if (assertCollection(this.contents))
-        this.contents.addIn(path2, value);
+        this.contents.addIn(path, value);
     }
     createAlias(node, name) {
       if (!node.anchor) {
@@ -3286,30 +3286,30 @@ var require_Document = __commonJS(function(exports) {
     delete(key) {
       return assertCollection(this.contents) ? this.contents.delete(key) : false;
     }
-    deleteIn(path2) {
-      if (Collection.isEmptyPath(path2)) {
+    deleteIn(path) {
+      if (Collection.isEmptyPath(path)) {
         if (this.contents == null)
           return false;
         this.contents = null;
         return true;
       }
-      return assertCollection(this.contents) ? this.contents.deleteIn(path2) : false;
+      return assertCollection(this.contents) ? this.contents.deleteIn(path) : false;
     }
     get(key, keepScalar) {
       return identity.isCollection(this.contents) ? this.contents.get(key, keepScalar) : undefined;
     }
-    getIn(path2, keepScalar) {
-      if (Collection.isEmptyPath(path2))
+    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(path2, keepScalar) : undefined;
+      return identity.isCollection(this.contents) ? this.contents.getIn(path, keepScalar) : undefined;
     }
     has(key) {
       return identity.isCollection(this.contents) ? this.contents.has(key) : false;
     }
-    hasIn(path2) {
-      if (Collection.isEmptyPath(path2))
+    hasIn(path) {
+      if (Collection.isEmptyPath(path))
         return this.contents !== undefined;
-      return identity.isCollection(this.contents) ? this.contents.hasIn(path2) : false;
+      return identity.isCollection(this.contents) ? this.contents.hasIn(path) : false;
     }
     set(key, value) {
       if (this.contents == null) {
@@ -3318,13 +3318,13 @@ var require_Document = __commonJS(function(exports) {
         this.contents.set(key, value);
       }
     }
-    setIn(path2, value) {
-      if (Collection.isEmptyPath(path2)) {
+    setIn(path, value) {
+      if (Collection.isEmptyPath(path)) {
         this.contents = value;
       } else if (this.contents == null) {
-        this.contents = Collection.collectionFromPath(this.schema, Array.from(path2), value);
+        this.contents = Collection.collectionFromPath(this.schema, Array.from(path), value);
       } else if (assertCollection(this.contents)) {
-        this.contents.setIn(path2, value);
+        this.contents.setIn(path, value);
       }
     }
     setSchema(version, options = {}) {
@@ -3375,8 +3375,8 @@ var require_Document = __commonJS(function(exports) {
       };
       const res = toJS.toJS(this.contents, jsonArg ?? "", ctx);
       if (typeof onAnchor === "function")
-        for (const { count, res: res2 } of ctx.anchors.values())
-          onAnchor(res2, count);
+        for (const { count, res } of ctx.anchors.values())
+          onAnchor(res, count);
       return typeof reviver === "function" ? applyReviver.applyReviver(reviver, { "": res }, "", res) : res;
     }
     toJSON(jsonArg, onAnchor) {
@@ -4130,12 +4130,12 @@ var require_resolve_block_scalar = __commonJS(function(exports) {
         break;
     }
     if (chompStart === 0) {
-      const value2 = header.chomp === "+" && lines.length > 0 ? `
+      const value = header.chomp === "+" && lines.length > 0 ? `
 `.repeat(Math.max(1, lines.length - 1)) : "";
-      let end2 = start + header.length;
+      let end = start + header.length;
       if (scalar.source)
-        end2 += scalar.source.length;
-      return { value: value2, type, comment: header.comment, range: [start, end2, end2] };
+        end += scalar.source.length;
+      return { value, type, comment: header.comment, range: [start, end, end] };
     }
     let trimIndent = scalar.indent + header.indent;
     let offset = scalar.offset + header.length;
@@ -4584,9 +4584,9 @@ var require_compose_scalar = __commonJS(function(exports) {
     return schema[identity.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((tag) => (tag.default === true || atKey && tag.default === "key") && tag.test?.test(value)) || schema[identity.SCALAR];
     if (schema.compat) {
-      const compat = schema.compat.find((tag2) => tag2.default && tag2.test?.test(value)) ?? schema[identity.SCALAR];
+      const compat = schema.compat.find((tag) => tag.default && tag.test?.test(value)) ?? schema[identity.SCALAR];
       if (tag.tag !== compat.tag) {
         const ts = directives.tagString(tag.tag);
         const cs = directives.tagString(compat.tag);
@@ -5221,9 +5221,9 @@ var require_cst_visit = __commonJS(function(exports) {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  visit.itemAtPath = (cst, path2) => {
+  visit.itemAtPath = (cst, path) => {
     let item = cst;
-    for (const [field, index] of path2) {
+    for (const [field, index] of path) {
       const tok = item?.[field];
       if (tok && "items" in tok) {
         item = tok.items[index];
@@ -5232,23 +5232,23 @@ var require_cst_visit = __commonJS(function(exports) {
     }
     return item;
   };
-  visit.parentCollection = (cst, path2) => {
-    const parent = visit.itemAtPath(cst, path2.slice(0, -1));
-    const field = path2[path2.length - 1][0];
+  visit.parentCollection = (cst, path) => {
+    const parent = visit.itemAtPath(cst, path.slice(0, -1));
+    const field = path[path.length - 1][0];
     const coll = parent?.[field];
     if (coll && "items" in coll)
       return coll;
     throw new Error("Parent collection not found");
   };
-  function _visit(path2, item, visitor) {
-    let ctrl = visitor(item, path2);
+  function _visit(path, item, visitor) {
+    let ctrl = visitor(item, path);
     if (typeof ctrl === "symbol")
       return ctrl;
     for (const field of ["key", "value"]) {
       const token = item[field];
       if (token && "items" in token) {
         for (let i = 0;i < token.items.length; ++i) {
-          const ci = _visit(Object.freeze(path2.concat([[field, i]])), token.items[i], visitor);
+          const ci = _visit(Object.freeze(path.concat([[field, i]])), token.items[i], visitor);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -5259,10 +5259,10 @@ var require_cst_visit = __commonJS(function(exports) {
           }
         }
         if (typeof ctrl === "function" && field === "key")
-          ctrl = ctrl(item, path2);
+          ctrl = ctrl(item, path);
       }
     }
-    return typeof ctrl === "function" ? ctrl(item, path2) : ctrl;
+    return typeof ctrl === "function" ? ctrl(item, path) : ctrl;
   }
   exports.visit = visit;
 });
@@ -5742,18 +5742,18 @@ var require_lexer = __commonJS(function(exports) {
       let indent = 0;
       let ch;
       loop:
-        for (let i2 = this.pos;ch = this.buffer[i2]; ++i2) {
+        for (let i = this.pos;ch = this.buffer[i]; ++i) {
           switch (ch) {
             case " ":
               indent += 1;
               break;
             case `
 `:
-              nl = i2;
+              nl = i;
               indent = 0;
               break;
             case "\r": {
-              const next = this.buffer[i2 + 1];
+              const next = this.buffer[i + 1];
               if (!next && !this.atEnd)
                 return this.setNext("block-scalar");
               if (next === `
@@ -5796,16 +5796,16 @@ var require_lexer = __commonJS(function(exports) {
         nl = i - 1;
       } else if (!this.blockScalarKeep) {
         do {
-          let i2 = nl - 1;
-          let ch2 = this.buffer[i2];
-          if (ch2 === "\r")
-            ch2 = this.buffer[--i2];
-          const lastChar = i2;
-          while (ch2 === " ")
-            ch2 = this.buffer[--i2];
-          if (ch2 === `
-` && i2 >= this.pos && i2 + 1 + indent > lastChar)
-            nl = i2;
+          let i = nl - 1;
+          let ch = this.buffer[i];
+          if (ch === "\r")
+            ch = this.buffer[--i];
+          const lastChar = i;
+          while (ch === " ")
+            ch = this.buffer[--i];
+          if (ch === `
+` && i >= this.pos && i + 1 + indent > lastChar)
+            nl = i;
           else
             break;
         } while (true);
@@ -6492,12 +6492,12 @@ var require_parser = __commonJS(function(exports) {
                 if (includesToken(it.start, "newline")) {
                   Object.assign(it, { key: null, sep: [this.sourceToken] });
                 } else {
-                  const start2 = getFirstKeyStartProps(it.start);
+                  const start = getFirstKeyStartProps(it.start);
                   this.stack.push({
                     type: "block-map",
                     offset: this.offset,
                     indent: this.indent,
-                    items: [{ start: start2, key: null, sep: [this.sourceToken] }]
+                    items: [{ start, key: null, sep: [this.sourceToken] }]
                   });
                 }
               } else if (it.value) {
@@ -6510,7 +6510,7 @@ var require_parser = __commonJS(function(exports) {
                   items: [{ start, key: null, sep: [this.sourceToken] }]
                 });
               } else if (isFlowToken(it.key) && !includesToken(it.sep, "newline")) {
-                const start2 = getFirstKeyStartProps(it.start);
+                const start = getFirstKeyStartProps(it.start);
                 const key = it.key;
                 const sep = it.sep;
                 sep.push(this.sourceToken);
@@ -6520,7 +6520,7 @@ var require_parser = __commonJS(function(exports) {
                   type: "block-map",
                   offset: this.offset,
                   indent: this.indent,
-                  items: [{ start: start2, key, sep }]
+                  items: [{ start, key, sep }]
                 });
               } else if (start.length > 0) {
                 it.sep = it.sep.concat(start, this.sourceToken);
@@ -6549,14 +6549,14 @@ var require_parser = __commonJS(function(exports) {
           case "scalar":
           case "single-quoted-scalar":
           case "double-quoted-scalar": {
-            const fs3 = this.flowScalar(this.type);
+            const fs = this.flowScalar(this.type);
             if (atNextItem || it.value) {
-              map.items.push({ start, key: fs3, sep: [] });
+              map.items.push({ start, key: fs, sep: [] });
               this.onKeyLine = true;
             } else if (it.sep) {
-              this.stack.push(fs3);
+              this.stack.push(fs);
             } else {
-              Object.assign(it, { key: fs3, sep: [] });
+              Object.assign(it, { key: fs, sep: [] });
               this.onKeyLine = true;
             }
             return;
@@ -6684,13 +6684,13 @@ var require_parser = __commonJS(function(exports) {
           case "scalar":
           case "single-quoted-scalar":
           case "double-quoted-scalar": {
-            const fs3 = this.flowScalar(this.type);
+            const fs = this.flowScalar(this.type);
             if (!it || it.value)
-              fc.items.push({ start: [], key: fs3, sep: [] });
+              fc.items.push({ start: [], key: fs, sep: [] });
             else if (it.sep)
-              this.stack.push(fs3);
+              this.stack.push(fs);
             else
-              Object.assign(it, { key: fs3, sep: [] });
+              Object.assign(it, { key: fs, sep: [] });
             return;
           }
           case "flow-map-end":
@@ -6864,22 +6864,22 @@ var require_public_api = __commonJS(function(exports) {
     return { lineCounter: lineCounter$1, prettyErrors };
   }
   function parseAllDocuments(source, options = {}) {
-    const { lineCounter: lineCounter2, prettyErrors } = parseOptions(options);
-    const parser$1 = new parser.Parser(lineCounter2?.addNewLine);
+    const { lineCounter, prettyErrors } = parseOptions(options);
+    const parser$1 = new parser.Parser(lineCounter?.addNewLine);
     const composer$1 = new composer.Composer(options);
     const docs = Array.from(composer$1.compose(parser$1.parse(source)));
-    if (prettyErrors && lineCounter2)
+    if (prettyErrors && lineCounter)
       for (const doc of docs) {
-        doc.errors.forEach(errors.prettifyError(source, lineCounter2));
-        doc.warnings.forEach(errors.prettifyError(source, lineCounter2));
+        doc.errors.forEach(errors.prettifyError(source, lineCounter));
+        doc.warnings.forEach(errors.prettifyError(source, lineCounter));
       }
     if (docs.length > 0)
       return docs;
     return Object.assign([], { empty: true }, composer$1.streamInfo());
   }
   function parseDocument(source, options = {}) {
-    const { lineCounter: lineCounter2, prettyErrors } = parseOptions(options);
-    const parser$1 = new parser.Parser(lineCounter2?.addNewLine);
+    const { lineCounter, prettyErrors } = parseOptions(options);
+    const parser$1 = new parser.Parser(lineCounter?.addNewLine);
     const composer$1 = new composer.Composer(options);
     let doc = null;
     for (const _doc of composer$1.compose(parser$1.parse(source), true, source.length)) {
@@ -6890,9 +6890,9 @@ var require_public_api = __commonJS(function(exports) {
         break;
       }
     }
-    if (prettyErrors && lineCounter2) {
-      doc.errors.forEach(errors.prettifyError(source, lineCounter2));
-      doc.warnings.forEach(errors.prettifyError(source, lineCounter2));
+    if (prettyErrors && lineCounter) {
+      doc.errors.forEach(errors.prettifyError(source, lineCounter));
+      doc.warnings.forEach(errors.prettifyError(source, lineCounter));
     }
     return doc;
   }
@@ -6949,16 +6949,16 @@ import * as os8 from "node:os";
 import * as path23 from "node:path";
 import {
   APP_NAME as APP_NAME3,
-  keyHintIfBound as keyHintIfBound3
+  keyHintIfBound as keyHintIfBound5
 } from "@bastani/atomic";
 import {
   Box,
   Container as Container4,
   Spacer as Spacer2,
-  Text as Text4,
-  truncateToWidth,
-  visibleWidth as visibleWidth2,
-  wrapTextWithAnsi
+  Text as Text5,
+  truncateToWidth as truncateToWidth4,
+  visibleWidth as visibleWidth4,
+  wrapTextWithAnsi as wrapTextWithAnsi2
 } from "@earendil-works/pi-tui";
 
 // dist/builtin/subagents/src/agents/agent-discovery.ts
@@ -7234,7 +7234,7 @@ function readSubagentSettings(filePath) {
 }
 function readMergedSubagentSettings(filePaths) {
   let settings = EMPTY_SUBAGENT_SETTINGS;
-  let path2 = null;
+  let path = null;
   for (let i = filePaths.length - 1;i >= 0; i--) {
     const filePath = filePaths[i];
     if (!fs2.existsSync(filePath))
@@ -7244,9 +7244,9 @@ function readMergedSubagentSettings(filePaths) {
       disableBuiltins: next.disableBuiltins ?? settings.disableBuiltins,
       overrides: { ...settings.overrides, ...next.overrides }
     };
-    path2 = filePath;
+    path = filePath;
   }
-  return { settings, path: path2 };
+  return { settings, path };
 }
 function applyBuiltinOverride(agent, override, meta) {
   const next = {
@@ -8169,7 +8169,7 @@ var DEFAULT_INTERCOM_BRIDGE_TEMPLATE = `The inherited thread is reference-only.
 
 Use contact_supervisor first. It resolves the supervisor session "{orchestratorTarget}" and run metadata automatically.
 - Need a decision, blocked, approval, or product/API/scope ambiguity: contact_supervisor({ reason: "need_decision", message: "<question>" })
-- A claimed decision or interview ends this child. Do not wait for or expect a reply in this run; the supervisor receives a dynamic [TASK_CONTEXT] handoff and may launch a fresh subagent with a new run identity and the answer.
+- In parallel runs, blocking requests wait here and the supervisor's correlated reply lets this same child continue; siblings keep running. Do not request a replacement launch. A single-child claimed decision/interview instead ends with a dynamic [TASK_CONTEXT] fresh-child handoff; follow the actual tool result.
 - Do not ask for clarification when the only conflict is review-only/no-edit versus progress-writing or artifact-writing instructions. Review-only/no-edit wins; leave files unchanged and mention the conflict in your final result only if it matters.
 - Meaningful progress or unexpected discoveries that change the plan: contact_supervisor({ reason: "progress_update", message: "UPDATE: <summary>" })
 - Generic intercom is lower-level plumbing/fallback only: intercom({ action: "ask", to: "{orchestratorTarget}", message: "<question>" })
@@ -8483,9 +8483,9 @@ function resolveTempScopeId(options) {
     if (username)
       return `user-${sanitizeTempScopeSegment(username)}`;
   } catch {}
-  const homedir5 = env.USERPROFILE ?? env.HOME;
-  if (homedir5)
-    return `home-${sanitizeTempScopeSegment(homedir5)}`;
+  const homedir = env.USERPROFILE ?? env.HOME;
+  if (homedir)
+    return `home-${sanitizeTempScopeSegment(homedir)}`;
   const resolveHomedir = options && Object.hasOwn(options, "homedir") ? options.homedir : os4.homedir;
   try {
     const fallbackHomedir = resolveHomedir?.();
@@ -8495,7 +8495,7 @@ function resolveTempScopeId(options) {
   return "shared";
 }
 var MAX_PARALLEL_TASKS = 50;
-var MAX_CONCURRENCY = 4;
+var MAX_CONCURRENCY = 3;
 var TEMP_ROOT_DIR = path6.join(os4.tmpdir(), `${APP_NAME2}-subagents-${resolveTempScopeId()}`);
 var TEMP_ARTIFACTS_DIR = path6.join(TEMP_ROOT_DIR, "artifacts");
 var SLASH_RESULT_TYPE = "subagent-slash-result";
@@ -8504,7 +8504,7 @@ var SLASH_SUBAGENT_STARTED_EVENT = "subagent:slash:started";
 var SLASH_SUBAGENT_RESPONSE_EVENT = "subagent:slash:response";
 var SLASH_SUBAGENT_UPDATE_EVENT = "subagent:slash:update";
 var SLASH_SUBAGENT_CANCEL_EVENT = "subagent:slash:cancel";
-var SUBAGENT_ACTIONS = ["list", "get", "create", "update", "delete", "status", "interrupt"];
+var SUBAGENT_ACTIONS = ["list", "get", "create", "update", "delete", "status", "kill", "wait"];
 var DEFAULT_FORK_PREAMBLE = "You are a delegated subagent running from a fork of the parent session. " + "Treat the inherited conversation as reference-only context, not a live thread to continue. " + "Do not continue or answer prior messages as if they are waiting for a reply. " + "Your sole job is to execute the task below and return a focused result for that task using your tools.";
 function normalizeTopLevelParallelValue(value) {
   const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
@@ -8657,7 +8657,7 @@ function registerSubagentNotify(pi) {
     const agent = result.agent ?? "unknown";
     const summary = typeof result.summary === "string" ? result.summary : "";
     const interrupted = result.status === "interrupted" || result.state === "interrupted";
-    const status = interrupted ? "interrupted" : result.status === "ok" ? "completed" : result.status === "continued" ? "interrupted" : "failed";
+    const status = result.status === "killed" || result.state === "killed" ? "killed" : interrupted ? "interrupted" : result.status === "ok" ? "completed" : result.status === "continued" ? "interrupted" : "failed";
     const taskInfo = result.taskIndex !== undefined && result.totalTasks !== undefined ? `(${result.taskIndex + 1}/${result.totalTasks})` : undefined;
     const sessionLine = result.shareUrl ? `Session: ${result.shareUrl}` : result.shareError ? `Session share error: ${result.shareError}` : result.sessionFile ? `Session file: ${result.sessionFile}` : undefined;
     const displaySummary = summary.trim() ? summary : "(no output)";
@@ -8892,8 +8892,8 @@ function collectInstalledPackageSkillPaths(cwd) {
             continue;
           if (!scopeEntry.isDirectory() && !scopeEntry.isSymbolicLink())
             continue;
-          const pkgRoot2 = path7.join(scopeDir, scopeEntry.name);
-          results.push(...extractSkillPathsFromPackageRoot(pkgRoot2, dir.source, true));
+          const pkgRoot = path7.join(scopeDir, scopeEntry.name);
+          results.push(...extractSkillPathsFromPackageRoot(pkgRoot, dir.source, true));
         }
         continue;
       }
@@ -9913,7 +9913,7 @@ function formatControlNoticeMessage(event, childIntercomTarget) {
       "Hint: Inspect status, then nudge if the work seems stuck.",
       childIntercomTarget ? `Nudge: ${nudgeCommand}` : "Nudge: no child message route registered",
       `Status: subagent({ action: "status", id: "${runTarget}" })`,
-      `Interrupt: subagent({ action: "interrupt", id: "${runTarget}" })`
+      `Kill: subagent({ action: "kill", id: "${runTarget}" })`
     ].filter((line) => Boolean(line)).join(`
 `);
   }
@@ -9925,7 +9925,7 @@ function formatControlNoticeMessage(event, childIntercomTarget) {
     "Hint: Inspect status first unless the run is clearly blocked.",
     childIntercomTarget ? `Nudge: ${nudgeCommand}` : "Nudge: no child message route registered",
     `Status: subagent({ action: "status", id: "${runTarget}" })`,
-    `Interrupt: subagent({ action: "interrupt", id: "${runTarget}" })`
+    `Kill: subagent({ action: "kill", id: "${runTarget}" })`
   ].filter((line) => Boolean(line)).join(`
 `);
 }
@@ -10012,9 +10012,12 @@ function handleSubagentControlNotice(input) {
 }
 
 // dist/builtin/subagents/src/runs/inprocess/runner.ts
+import { randomUUID } from "node:crypto";
 import { appendFileSync as appendFileSync2, existsSync as existsSync10, mkdirSync as mkdirSync4, statSync as statSync4 } from "node:fs";
 import { basename as basename2, dirname as dirname7, join as join10, relative as relative2, resolve as resolve6 } from "node:path";
 import {
+  applyAssistantMessageDelta,
+  beginStreamingAssistantMessage,
   createAgentSession,
   DefaultResourceLoader,
   getAgentDir as getAgentDir2,
@@ -10025,6 +10028,7 @@ import {
 import {
   SubagentControl
 } from "@bastani/atomic-natives";
+import { clampThinkingLevel } from "@bastani/pi-ai/compat";
 
 // dist/builtin/subagents/src/shared/artifacts.ts
 import * as fs10 from "node:fs";
@@ -10276,7 +10280,7 @@ var CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS = [
 var CHILD_FANOUT_BOUNDARY_INSTRUCTIONS = [
   "You are a child subagent with explicit fanout responsibility for this assigned task.",
   "The parent session owns final orchestration, completion decisions, and follow-up implementation launches.",
-  "Delegation is one level deep: the `subagent` tool refuses every launch and interrupt from inside a subagent.",
+  "Delegation is one level deep: the `subagent` tool refuses every launch and kill from inside a subagent.",
   "Do the assigned fanout work yourself and report what you found; do not plan around delegating it.",
   "If you need to edit files, call the actual edit/write tools. Do not print tool-call syntax, patches, or pseudo-tool calls as text."
 ].join(`
@@ -10441,22 +10445,24 @@ var EMPTY_STATS = {
 var CAPACITY_RETRY_INITIAL_DELAY_MS = 5;
 var INTERRUPTED_ENVELOPE = "Interrupted";
 var CAPACITY_RETRY_MAX_DELAY_MS = 100;
-function waitForExecutionCapacity(delayMs, signals) {
-  if (signals.interrupt.aborted)
-    return Promise.resolve("interrupt");
-  if (signals.abort.aborted)
-    return Promise.resolve("abort");
+function waitForExecutionCapacity(delayMs, signals, onSettled) {
+  if (signals.interrupt.aborted || signals.abort.aborted) {
+    const result = signals.interrupt.aborted ? "interrupt" : "abort";
+    onSettled(result);
+    return Promise.resolve(result);
+  }
   return new Promise((resolveWait) => {
     let settled = false;
     let timer;
-    const settle = (result2) => {
+    const settle = (result) => {
       if (settled)
         return;
       settled = true;
       clearTimeout(timer);
       signals.abort.removeEventListener("abort", onAbort);
       signals.interrupt.removeEventListener("abort", onInterrupt);
-      resolveWait(result2);
+      onSettled(result);
+      resolveWait(result);
     };
     const onAbort = () => settle("abort");
     const onInterrupt = () => settle("interrupt");
@@ -10504,10 +10510,10 @@ function createTestSession(sessionManager, spec) {
   let aborted = false;
   let settlePromptAbort;
   const messages = [];
-  const promptAbort = new Promise((resolve7, reject) => {
+  const promptAbort = new Promise((resolve, reject) => {
     settlePromptAbort = () => {
       if (testOptions.abortResolvesPrompt)
-        resolve7("aborted");
+        resolve("aborted");
       else
         reject(new Error("aborted"));
     };
@@ -10592,6 +10598,9 @@ function createTestSession(sessionManager, spec) {
       }
       if (testOptions.fallbackBeforeGate)
         emitFallback();
+      for (const event of testOptions.beforeGateEvents ?? [])
+        for (const listener of listeners)
+          listener(event);
       if (testOptions.promptGate) {
         const gateResult = await Promise.race([
           testOptions.promptGate.then(() => "released"),
@@ -10646,23 +10655,23 @@ function createTestSession(sessionManager, spec) {
       tokens: zeroTokens,
       cost: 0
     }),
-    dispose: () => {}
+    dispose: testOptions.dispose ?? (() => {})
   };
 }
 function nativeStatus(value) {
-  return value;
+  return value === "killed" ? "interrupted" : value;
 }
 function nativeCause(value) {
   return value;
 }
-function refusal(result2) {
-  if (!result2.refusal)
+function refusal(result) {
+  if (!result.refusal)
     return {};
   return {
     refusal: {
-      kind: result2.refusal.kind,
-      reason: result2.refusal.reason,
-      ...result2.refusal.maxDepth === undefined ? {} : { maxDepth: result2.refusal.maxDepth }
+      kind: result.refusal.kind,
+      reason: result.refusal.reason,
+      ...result.refusal.maxDepth === undefined ? {} : { maxDepth: result.refusal.maxDepth }
     }
   };
 }
@@ -10701,10 +10710,10 @@ function attemptStatus(termination) {
 }
 function boundedEnvelope(output, artifactPath, maxOutput) {
   const config = { ...DEFAULT_MAX_OUTPUT, ...maxOutput };
-  const result2 = truncateOutput(output, config, artifactPath);
-  return result2.truncated && artifactPath ? `${result2.text}
+  const result = truncateOutput(output, config, artifactPath);
+  return result.truncated && artifactPath ? `${result.text}
 
-Full output: ${artifactPath}` : result2.text;
+Full output: ${artifactPath}` : result.text;
 }
 function canonicalArtifactPaths(artifactsDir, childPath) {
   const prefix = childPath.replaceAll("/", "_");
@@ -10807,6 +10816,7 @@ class SubagentControlRuntime {
   attemptTerminators = new Map;
   delivered = new Set;
   deliveredEnvelopes = new Map;
+  killedChildren = new Set;
   nextAttemptId = 1;
   constructor(parent, sessionRoot) {
     this.parent = { ...parent };
@@ -10829,13 +10839,13 @@ class SubagentControlRuntime {
     const native = this.native.admitChildSession({ taskName: spec.taskName, agentName: spec.agent.name, cwd: spec.cwd }, { path: parent.path, depth: parent.depth });
     if (!native.child)
       return refusal(native);
-    const identity2 = native.child;
+    const identity = native.child;
     const childModePolicy = resolveChildModePolicy(spec);
-    const sessionDir = spec.sessionFile ? dirname7(spec.sessionFile) : sessionDirectory(this.sessionRoot, identity2.path);
+    const sessionDir = spec.sessionFile ? dirname7(spec.sessionFile) : sessionDirectory(this.sessionRoot, identity.path);
     mkdirSync4(sessionDir, { recursive: true });
     return {
       admitted: AdmittedChild.create({
-        identity: identity2,
+        identity,
         spec,
         policy: {
           ...childModePolicy,
@@ -10849,7 +10859,7 @@ class SubagentControlRuntime {
           thinkingLevel: spec.thinkingLevel ?? spec.agent.thinking,
           intercomGroup: parent.intercomGroup,
           intercom: spec.intercom,
-          depth: identity2.depth
+          depth: identity.depth
         },
         sessionDir,
         sessionFile: spec.sessionFile,
@@ -10857,29 +10867,46 @@ class SubagentControlRuntime {
       })
     };
   }
-  async runChildAttempt(admitted, candidate, signals, onModelChange) {
+  async runChildAttempt(admitted, candidate, signals, onModelChange, taskHooks, onCleanup) {
     const candidateModelId = modelIdForCandidate(candidate, admitted.policy.model);
     const configuredThinking = candidate.thinkingLevel ?? admitted.policy.thinkingLevel;
     let effectiveModelId = candidateModelId;
     let effectiveThinking = initialThinkingForAttempt(candidateModelId, configuredThinking);
     let attemptedModels = candidateModelId ? [candidateModelId] : [];
+    const selectedModel = candidate.model ?? admitted.policy.model;
+    if (selectedModel)
+      taskHooks?.reportActivity({
+        reportId: `${randomUUID()}:admission-model`,
+        change: {
+          kind: "model",
+          model: `${selectedModel.provider}/${selectedModel.id}`,
+          thinking: configuredThinking === undefined ? undefined : clampThinkingLevel(selectedModel, configuredThinking)
+        }
+      });
     let guard;
     let retryDelayMs = CAPACITY_RETRY_INITIAL_DELAY_MS;
     for (;; ) {
       guard = this.native.beginChildAttempt(admitted.identity.path);
       if (guard.token || guard.refusal?.kind !== "capacityExhausted")
         break;
-      const waitResult = await waitForExecutionCapacity(retryDelayMs, signals);
+      let killed = false;
+      const waitResult = await waitForExecutionCapacity(retryDelayMs, signals, (result) => {
+        killed = this.killedChildren.has(admitted.identity.path) || result === PARENT_CANCEL_CAUSE && !!taskHooks && signals.abort.reason === "user";
+      });
       if (waitResult !== "retry") {
         const stats = { ...EMPTY_STATS, sessionId: admitted.identity.path };
         if (waitResult === "interrupt" || waitResult === PARENT_CANCEL_CAUSE) {
+          if (killed)
+            this.killedChildren.add(admitted.identity.path);
+          else
+            this.killedChildren.delete(admitted.identity.path);
           this.native.publishChildStatus(admitted.identity.path, nativeStatus("interrupted"));
           return {
-            status: "interrupted",
-            ...waitResult === PARENT_CANCEL_CAUSE ? { cause: PARENT_CANCEL_CAUSE } : {},
+            status: killed ? "killed" : "interrupted",
+            ...waitResult === PARENT_CANCEL_CAUSE && !killed ? { cause: PARENT_CANCEL_CAUSE } : {},
             stats,
             path: admitted.identity.path,
-            envelope: waitResult === PARENT_CANCEL_CAUSE ? cancelledEnvelope(undefined, admitted.spec, stats) : INTERRUPTED_ENVELOPE,
+            envelope: killed ? "Killed. This child cannot be resumed." : waitResult === PARENT_CANCEL_CAUSE ? cancelledEnvelope(undefined, admitted.spec, stats) : INTERRUPTED_ENVELOPE,
             ...effectiveModelId === undefined ? {} : { model: effectiveModelId },
             ...effectiveThinking === undefined ? {} : { thinking: effectiveThinking }
           };
@@ -10914,14 +10941,22 @@ class SubagentControlRuntime {
     const token = guard.token;
     this.attemptTokens.set(admitted.identity.path, token);
     let session;
+    const executionEnded = new AbortController;
     let activeSessionManager;
     let termination;
     let terminating;
+    let terminationWasKill = false;
     let unsubscribe;
     let skillReport = {};
     const terminate = async (cause) => {
-      if (terminating)
+      if (terminating) {
+        if (!terminationWasKill)
+          this.killedChildren.delete(admitted.identity.path);
         return terminating;
+      }
+      if (taskHooks && cause === "abort" && signals.abort.reason === "user")
+        this.killedChildren.add(admitted.identity.path);
+      terminationWasKill = this.killedChildren.has(admitted.identity.path);
       termination = cause;
       terminating = (async () => {
         try {
@@ -10948,6 +10983,7 @@ class SubagentControlRuntime {
         mkdirSync4(dirname7(admitted.sessionFile), { recursive: true });
       const sessionManager = admitted.sessionFile ? SessionManager.open(admitted.sessionFile, admitted.sessionDir, admitted.policy.cwd) : SessionManager.create(admitted.policy.cwd, admitted.sessionDir, workflow ? { internal: true, workflow } : { internal: true });
       activeSessionManager = sessionManager;
+      taskHooks?.bindTranscript?.(sessionManager);
       if (workflow)
         sessionManager.markSessionInternal(workflow);
       let created;
@@ -10987,7 +11023,7 @@ class SubagentControlRuntime {
             sessionManager,
             settingsManager,
             orchestrationContext: admitted.spec.parent?.orchestrationContext,
-            subagentPolicy: admitted.policy,
+            subagentPolicy: { ...admitted.policy, executionEnded: executionEnded.signal },
             systemPromptTransform,
             initialContextTransform: promptBehavior.initialContextTransform
           })).session
@@ -10995,6 +11031,14 @@ class SubagentControlRuntime {
         await created.session.extensionRunner.emit({ type: "session_start", reason: "startup" });
       }
       session = created.session;
+      const transcriptSession = session;
+      let observedStreamingMessage;
+      taskHooks?.bindTranscript?.({
+        getSessionId: () => sessionManager.getSessionId(),
+        getEntries: () => sessionManager.getEntries(),
+        subscribe: (listener) => transcriptSession.subscribe(listener),
+        getStreamingMessage: () => observedStreamingMessage
+      });
       const initialModelId = modelIdForSession(session) ?? candidateModelId;
       effectiveModelId = initialModelId;
       effectiveThinking = thinkingLevelForSession(session) ?? initialThinkingForAttempt(candidateModelId, configuredThinking);
@@ -11015,10 +11059,11 @@ class SubagentControlRuntime {
         lastActivityAt: Date.now()
       };
       const attemptStartedAt = Date.now();
+      const activityPrefix = randomUUID();
       let lastProgressEmit = 0;
       const emitProgress = (force) => {
         const onProgress = admitted.spec.onProgress;
-        if (!onProgress)
+        if (!onProgress && !taskHooks)
           return;
         const now = Date.now();
         if (!force && now - lastProgressEmit < 400)
@@ -11026,11 +11071,38 @@ class SubagentControlRuntime {
         lastProgressEmit = now;
         progressState.durationMs = now - attemptStartedAt;
         progressState.lastActivityAt = now;
-        onProgress({ ...progressState, recentTools: [...progressState.recentTools] });
+        taskHooks?.reportActivity({
+          reportId: `${activityPrefix}:metrics-${++activitySequence}`,
+          change: {
+            kind: "metrics",
+            elapsedMs: progressState.durationMs,
+            toolCount: progressState.toolCount,
+            tokenCount: progressState.tokens
+          }
+        });
+        onProgress?.({ ...progressState, recentTools: [...progressState.recentTools] });
       };
+      let activitySequence = 0;
+      const reportModel = () => taskHooks?.reportActivity({
+        reportId: `${activityPrefix}:model-${++activitySequence}`,
+        change: { kind: "model", model: effectiveModelId, thinking: effectiveThinking }
+      });
+      reportModel();
       unsubscribe = session.subscribe((event) => {
         writeEvent(admitted.spec.artifactJsonlPath, event);
+        if (event.type === "message_start" && event.message.role === "assistant")
+          observedStreamingMessage = beginStreamingAssistantMessage(event.message);
+        else if (event.type === "message_update" && observedStreamingMessage)
+          applyAssistantMessageDelta(observedStreamingMessage, event.assistantMessageEvent);
+        else if (event.type === "message_end" && event.message.role === "assistant")
+          observedStreamingMessage = undefined;
         const emission = progressEmissionFor(event.type);
+        if (event.type === "tool_execution_start") {
+          taskHooks?.reportActivity({
+            reportId: `${activityPrefix}:tool-${++activitySequence}`,
+            change: { kind: "action", tool: event.toolName, text: safeArgsPreview(event.args) }
+          });
+        }
         if (event.type === "agent_start") {
           this.native.publishChildStatus(admitted.identity.path, nativeStatus("running"));
         } else if (event.type === "tool_execution_start") {
@@ -11068,10 +11140,13 @@ class SubagentControlRuntime {
           effectiveModelId = event.to;
           progressState.model = event.to;
           onModelChange?.(effectiveModelId, effectiveThinking);
+          reportModel();
+          emitProgress(true);
         } else if (event.type === "thinking_level_changed") {
           effectiveThinking = event.level;
           progressState.thinking = effectiveThinking;
           onModelChange?.(effectiveModelId, effectiveThinking);
+          reportModel();
           emitProgress(true);
         }
       });
@@ -11103,11 +11178,11 @@ class SubagentControlRuntime {
         };
       if (status === "interrupted")
         return {
-          status,
-          ...termination === PARENT_CANCEL_CAUSE ? { cause: PARENT_CANCEL_CAUSE } : {},
+          status: this.killedChildren.has(admitted.identity.path) ? "killed" : status,
+          ...termination === PARENT_CANCEL_CAUSE && !this.killedChildren.has(admitted.identity.path) ? { cause: PARENT_CANCEL_CAUSE } : {},
           stats,
           path: admitted.identity.path,
-          envelope,
+          envelope: this.killedChildren.has(admitted.identity.path) ? "Killed. This child cannot be resumed." : envelope,
           sessionFile,
           ...effectiveModelId === undefined ? {} : { model: effectiveModelId },
           ...effectiveThinking === undefined ? {} : { thinking: effectiveThinking },
@@ -11136,11 +11211,11 @@ class SubagentControlRuntime {
       } catch {}
       if (status === "interrupted")
         return {
-          status,
-          ...termination === PARENT_CANCEL_CAUSE ? { cause: PARENT_CANCEL_CAUSE } : {},
+          status: this.killedChildren.has(admitted.identity.path) ? "killed" : status,
+          ...termination === PARENT_CANCEL_CAUSE && !this.killedChildren.has(admitted.identity.path) ? { cause: PARENT_CANCEL_CAUSE } : {},
           stats,
           path: admitted.identity.path,
-          envelope: termination === PARENT_CANCEL_CAUSE ? cancelledEnvelope(session, admitted.spec, stats) : INTERRUPTED_ENVELOPE,
+          envelope: termination === PARENT_CANCEL_CAUSE && !this.killedChildren.has(admitted.identity.path) ? cancelledEnvelope(session, admitted.spec, stats) : this.killedChildren.has(admitted.identity.path) ? "Killed. This child cannot be resumed." : INTERRUPTED_ENVELOPE,
           sessionFile: session?.sessionFile,
           ...effectiveModelId === undefined ? {} : { model: effectiveModelId },
           ...effectiveThinking === undefined ? {} : { thinking: effectiveThinking },
@@ -11160,6 +11235,7 @@ class SubagentControlRuntime {
         ...skillReport
       };
     } finally {
+      executionEnded.abort();
       signals.abort.removeEventListener("abort", abortListener);
       signals.interrupt.removeEventListener("abort", interruptListener);
       try {
@@ -11168,16 +11244,36 @@ class SubagentControlRuntime {
       try {
         activeSessionManager?.flush();
       } catch {}
-      try {
-        session?.dispose();
-      } catch {}
+      if (onCleanup) {
+        onCleanup((async () => {
+          try {
+            await session?.dispose();
+            return { kind: "reaped" };
+          } catch (error) {
+            return {
+              kind: "failed",
+              resources: [
+                {
+                  resource: "agent-session",
+                  code: "CleanupFailed",
+                  message: error instanceof Error ? error.message : String(error)
+                }
+              ]
+            };
+          }
+        })());
+      } else {
+        try {
+          session?.dispose();
+        } catch {}
+      }
       if (this.attemptTokens.get(admitted.identity.path) === token)
         this.attemptTokens.delete(admitted.identity.path);
       if (this.attemptTerminators.get(admitted.identity.path) === terminate)
         this.attemptTerminators.delete(admitted.identity.path);
     }
   }
-  startAttempt(admitted, candidate, signals) {
+  startAttempt(admitted, candidate, signals, taskHooks) {
     const initialModel = modelIdForCandidate(candidate, admitted.policy.model);
     const initialThinking = initialThinkingForAttempt(initialModel, candidate.thinkingLevel ?? admitted.policy.thinkingLevel);
     const running = {
@@ -11196,19 +11292,26 @@ class SubagentControlRuntime {
         envelope: "uninitialized"
       })
     };
+    let cleanup = Promise.resolve({ kind: "reaped" });
     running.promise = this.runChildAttempt(admitted, candidate, signals, (model, thinking) => {
       running.currentModel = model;
       running.currentThinking = thinking;
-    }).then((result2) => {
-      running.status = result2.status;
+    }, taskHooks, taskHooks ? (result) => {
+      cleanup = result;
+    } : undefined).then((result) => {
+      running.status = result.status;
       this.runningAttempts.delete(running.id);
-      return result2;
+      return result;
     });
     running.terminate = (cause) => this.terminateRunningAttempt(running, cause);
     running.promise.catch(() => {
       return;
     });
     this.runningAttempts.set(running.id, running);
+    taskHooks?.onExecution({
+      result: running.promise,
+      cleanup: running.promise.then(() => cleanup, () => cleanup)
+    });
     return running;
   }
   continueDetached(running, _reason) {
@@ -11266,20 +11369,25 @@ class SubagentControlRuntime {
     return this.deliveredEnvelopes.get(pathValue);
   }
   findChild(pathValue) {
-    return this.native.listChildren().find((child) => child.path === pathValue);
+    return this.listChildren().find((child) => child.path === pathValue);
   }
   listChildren() {
-    return this.native.listChildren();
+    return this.native.listChildren().map((child) => ({
+      ...child,
+      status: child.status === "interrupted" && this.killedChildren.has(child.path) ? "killed" : child.status
+    }));
   }
-  async interruptChild(pathValue) {
+  async killChild(pathValue) {
     const running = [...this.runningAttempts.values()].find((attempt) => attempt.child.identity.path === pathValue && (attempt.status === "running" || attempt.status === "continued"));
     if (!running)
       return false;
+    if (this.findChild(pathValue)?.status !== "interrupted")
+      this.killedChildren.add(pathValue);
     await this.terminateChildAttempt(running, "interrupt");
     return true;
   }
   subscribe(pathValue, callback) {
-    this.native.subscribeChildStatus(pathValue, callback);
+    this.native.subscribeChildStatus(pathValue, (status) => callback(status === "interrupted" && this.killedChildren.has(pathValue) ? "killed" : status));
   }
   async terminateRunningAttempt(running, cause) {
     const terminate = this.attemptTerminators.get(running.child.identity.path);
@@ -11349,6 +11457,21 @@ function childLines(control, id) {
   }
   return control.listChildren().map((child) => `${child.path} — ${child.status} (${child.loaded ? "loaded" : "cold"})`);
 }
+function statusGroup(control, id) {
+  return {
+    parentPath: control.parent.path,
+    children: canonicalChildren(control).filter((child) => !id || id === control.parent.path || child.path === id).map((child) => {
+      const delivered = control.getDeliveredResult(child.path);
+      const metadata = control.getChildMetadata(child.path) ?? delivered;
+      return {
+        ...child,
+        sessionFile: delivered?.sessionFile,
+        ...metadata?.model === undefined ? {} : { model: metadata.model },
+        ...metadata?.thinking === undefined ? {} : { thinking: metadata.thinking }
+      };
+    })
+  };
+}
 function inspectInProcessChildStatus(id) {
   if (id) {
     const control = findSubagentControl(id);
@@ -11361,31 +11484,34 @@ function inspectInProcessChildStatus(id) {
       return;
     return {
       content: [{ type: "text", text }],
-      details: { mode: "management", results: [] }
+      details: { mode: "management", results: [], statusGroups: [statusGroup(control, id)] }
     };
   }
-  const lines = listSubagentControls().flatMap((control) => [
-    `Parent: ${control.parent.path}`,
-    ...childLines(control)
-  ]);
+  const controls = listSubagentControls();
+  const lines = controls.flatMap((control) => [`Parent: ${control.parent.path}`, ...childLines(control)]);
   if (lines.length === 0)
     return;
   return {
     content: [{ type: "text", text: lines.join(`
 `) }],
-    details: { mode: "management", results: [] }
+    details: { mode: "management", results: [], statusGroups: controls.map((control) => statusGroup(control)) }
   };
 }
-async function interruptInProcessChild(id) {
+async function killInProcessChild(id) {
   const control = findSubagentControl(id);
   if (!control)
     return;
   const identities = canonicalChildren(control);
   const candidates = id === control.parent.path ? identities : identities.filter((child) => child.path === id);
   for (const child of candidates) {
-    if (await control.interruptChild(child.path)) {
+    if (await control.killChild(child.path)) {
       return {
-        content: [{ type: "text", text: `Interrupt requested for in-process child ${child.path}.` }],
+        content: [
+          {
+            type: "text",
+            text: `Kill requested for in-process child ${child.path}. This child cannot be resumed.`
+          }
+        ],
         details: { mode: "management", results: [] }
       };
     }
@@ -11481,8 +11607,8 @@ function registerBurstDisplay(callIds, taskCount) {
   }
   return display;
 }
-function updateBurstDisplay(display, result2) {
-  display.result = result2;
+function updateBurstDisplay(display, result) {
+  display.result = result;
 }
 function getBurstDisplay(callId) {
   const display = displayByCallId.get(callId);
@@ -11503,20 +11629,17 @@ function resolveRequestedCwd(runtimeCwd, requestedCwd) {
 
 // dist/builtin/subagents/src/runs/foreground/subagent-executor-live-update.ts
 var liveResultIndices = new WeakMap;
-function markLiveResultIndices(result2, indices) {
-  liveResultIndices.set(result2, indices);
+function markLiveResultIndices(result, indices) {
+  liveResultIndices.set(result, indices);
 }
-function getLiveResultIndices(result2) {
-  return liveResultIndices.get(result2);
+function getLiveResultIndices(result) {
+  return liveResultIndices.get(result);
 }
 
 // dist/builtin/subagents/src/runs/foreground/subagent-executor-parent-ask-projection.ts
 var parentAskHandoffs = new WeakMap;
-function markParentAskHandoff(result2, handoff) {
-  parentAskHandoffs.set(result2, handoff);
-}
-function getParentAskHandoff(result2) {
-  return parentAskHandoffs.get(result2);
+function getParentAskHandoff(result) {
+  return parentAskHandoffs.get(result);
 }
 
 // dist/builtin/subagents/src/runs/foreground/subagent-executor-types.ts
@@ -11656,11 +11779,11 @@ function formatStandardParallelContent(results) {
     error: child.error
   })), (index, agent) => `=== Task ${index + 1}: ${agent} ===`);
 }
-function projectParentAskContent(result2, route, projectedResults) {
-  const handoff = getParentAskHandoff(result2);
+function projectParentAskContent(result, route, projectedResults) {
+  const handoff = getParentAskHandoff(result);
   if (!handoff)
     return;
-  const originalItem = result2.content.length === 1 && result2.content[0]?.type === "text" ? result2.content[0] : { type: "text", text: "" };
+  const originalItem = result.content.length === 1 && result.content[0]?.type === "text" ? result.content[0] : { type: "text", text: "" };
   const routeEnd = route.start + route.length;
   const inRoute = (index) => index >= route.start && index < routeEnd;
   if (!inRoute(handoff.askingChildIndex)) {
@@ -11680,16 +11803,16 @@ function projectParentAskContent(result2, route, projectedResults) {
     }
   ];
 }
-function projectParallelContent(result2, sharedResults, projectedResults, route, live) {
+function projectParallelContent(result, sharedResults, projectedResults, route, live) {
   const projectedText = formatStandardParallelContent(projectedResults);
   if (live)
     return [{ type: "text", text: projectedText }];
-  const parentAskContent = projectParentAskContent(result2, route, projectedResults);
+  const parentAskContent = projectParentAskContent(result, route, projectedResults);
   if (parentAskContent)
     return parentAskContent;
-  if (result2.content.length !== 1 || result2.content[0]?.type !== "text")
-    return result2.content;
-  const originalItem = result2.content[0];
+  if (result.content.length !== 1 || result.content[0]?.type !== "text")
+    return result.content;
+  const originalItem = result.content[0];
   const originalText = originalItem.text;
   const sharedText = formatStandardParallelContent(sharedResults);
   if (originalText === sharedText)
@@ -11699,13 +11822,13 @@ function projectParallelContent(result2, sharedResults, projectedResults, route,
 `)) {
     return [{ ...originalItem, text: `${projectedText}${originalText.slice(sharedText.length)}` }];
   }
-  return result2.content;
+  return result.content;
 }
-function projectResult(result2, route, live = false) {
-  const sharedDetails = result2.details;
+function projectResult(result, route, live = false) {
+  const sharedDetails = result.details;
   if (!sharedDetails || !live && sharedDetails.results.length === 0)
-    return result2;
-  const liveIndices = live ? getLiveResultIndices(result2) : undefined;
+    return result;
+  const liveIndices = live ? getLiveResultIndices(result) : undefined;
   const results = liveIndices ? sharedDetails.results.filter((_child, index) => {
     const resultIndex = liveIndices[index];
     return resultIndex !== undefined && resultIndex >= route.start && resultIndex < route.start + route.length;
@@ -11714,8 +11837,8 @@ function projectResult(result2, route, live = false) {
   const controlEvents = sharedDetails.controlEvents?.filter((event) => event.index !== undefined && event.index >= route.start && event.index < route.start + route.length).map((event) => ({ ...event, index: event.index - route.start }));
   const artifactFiles = results.flatMap((child) => child.artifactPaths ? [child.artifactPaths] : []);
   return {
-    content: projectParallelContent(result2, sharedDetails.results, results, route, live),
-    ...result2.isError !== undefined ? { isError: result2.isError } : {},
+    content: projectParallelContent(result, sharedDetails.results, results, route, live),
+    ...result.isError !== undefined ? { isError: result.isError } : {},
     details: {
       mode: "parallel",
       ...sharedDetails.runId !== undefined ? { runId: sharedDetails.runId } : {},
@@ -11729,11 +11852,11 @@ function projectResult(result2, route, live = false) {
     }
   };
 }
-function resolveItem(item, result2) {
+function resolveItem(item, result) {
   if (item.settled)
     return;
   item.settled = true;
-  item.resolve(result2);
+  item.resolve(result);
 }
 function rejectItem(item, reason) {
   if (item.settled)
@@ -11804,10 +11927,10 @@ function createExecutionBurstDispatcher(input) {
     };
     input.setActive(true);
     try {
-      const result2 = await input.execute(first.id, merged.params, first.signal, onUpdate, first.ctx);
-      updateBurstDisplay(display, result2);
+      const result = await input.execute(first.id, merged.params, first.signal, onUpdate, first.ctx);
+      updateBurstDisplay(display, result);
       for (let index = 0;index < items.length; index++) {
-        resolveItem(items[index], projectResult(result2, merged.routes[index]));
+        resolveItem(items[index], projectResult(result, merged.routes[index]));
       }
     } catch (error) {
       const rejection = error instanceof Error ? error : new Error(String(error));
@@ -11827,8 +11950,8 @@ function createExecutionBurstDispatcher(input) {
   return (id, params, signal, onUpdate, ctx) => {
     if (input.isActive())
       return Promise.resolve(input.duplicateResult(params));
-    return new Promise((resolve8, reject) => {
-      queue.push({ id, params, signal, onUpdate, ctx, settled: false, resolve: resolve8, reject });
+    return new Promise((resolve, reject) => {
+      queue.push({ id, params, signal, onUpdate, ctx, settled: false, resolve, reject });
       if (!flushScheduled) {
         flushScheduled = true;
         setImmediate(flush);
@@ -11838,7 +11961,7 @@ function createExecutionBurstDispatcher(input) {
 }
 
 // dist/builtin/subagents/src/runs/foreground/subagent-executor-context.ts
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import * as fs13 from "node:fs";
 import * as path13 from "node:path";
 
@@ -12081,13 +12204,13 @@ function normalizeRepeatedParallelCounts(params) {
     return { error: buildRequestedModeError(params, expandedTasks.error) };
   return { params: { ...params, tasks: expandedTasks.tasks } };
 }
-function withForkContext(result2, context) {
-  if (context !== "fork" || !result2.details)
-    return result2;
+function withForkContext(result, context) {
+  if (context !== "fork" || !result.details)
+    return result;
   return {
-    ...result2,
+    ...result,
     details: {
-      ...result2.details,
+      ...result.details,
       context: "fork"
     }
   };
@@ -12166,7 +12289,7 @@ function prepareExecutionContext(input) {
   });
   const agents = intercomBridge.active ? discoveredAgents.map((agent) => applyIntercomBridgeToAgent(agent, intercomBridge)) : discoveredAgents;
   const parallelAgentConfigs = intercomBridge.active ? resolvedTaskAgents?.map((agent) => applyIntercomBridgeToAgent(agent, intercomBridge)) : resolvedTaskAgents;
-  const runId = randomUUID().slice(0, 8);
+  const runId = randomUUID2().slice(0, 8);
   const shareEnabled = effectiveParams.share === true;
   const hasTasks = (effectiveParams.tasks?.length ?? 0) > 0;
   const hasSingle = !hasTasks && Boolean(effectiveParams.agent);
@@ -12272,10 +12395,10 @@ function resolveCandidateModel(candidateId, lookup, preferredProvider) {
   const slash = baseModel.indexOf("/");
   if (slash < 0) {
     const available = lookup.getAvailable().filter((entry) => entry.id === baseModel);
-    const model2 = available.find((entry) => entry.provider === preferredProvider) ?? (available.length === 1 ? available[0] : undefined);
-    if (!model2)
+    const model = available.find((entry) => entry.provider === preferredProvider) ?? (available.length === 1 ? available[0] : undefined);
+    if (!model)
       return;
-    return thinkingLevel === undefined ? { model: model2 } : { model: model2, thinkingLevel };
+    return thinkingLevel === undefined ? { model } : { model, thinkingLevel };
   }
   const provider = baseModel.slice(0, slash);
   const modelId = baseModel.slice(slash + 1);
@@ -12289,7 +12412,7 @@ function createCandidateModelResolver(lookup, preferredProvider) {
 }
 
 // dist/builtin/subagents/src/runs/shared/intercom-group.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 import { readRuntimeIntercomGroup } from "@bastani/atomic";
 function normalizeAutoGroupSentinel(group) {
   if (group === undefined || group === true)
@@ -12313,14 +12436,14 @@ function inheritedIntercomGroup(ctx) {
 function resolveChildIntercomGroup(explicit, inherited, sharedAutoGroup) {
   const normalized = normalizeAutoGroupSentinel(explicit);
   if (normalized === true)
-    return sharedAutoGroup ?? randomUUID2();
+    return sharedAutoGroup ?? randomUUID3();
   if (typeof normalized === "string" && normalized.trim().length > 0)
     return normalized.trim();
   return inherited;
 }
 function sharedAutoGroupForSet(setGroup, items) {
   const needsAuto = normalizeAutoGroupSentinel(setGroup) === true || items.some((item) => normalizeAutoGroupSentinel(item.group) === true);
-  return needsAuto ? randomUUID2() : undefined;
+  return needsAuto ? randomUUID3() : undefined;
 }
 
 // dist/builtin/subagents/src/runs/shared/model-fallback.ts
@@ -12499,8 +12622,8 @@ function hasTrackedPathComponent(runGit, repo, relativePath) {
   let candidate = "";
   for (const component of components) {
     candidate = candidate ? `${candidate}/${component}` : component;
-    const result2 = runGit(repo, ["ls-files", "--stage", "--", candidate]);
-    if (result2.stdout.split(/\r?\n/).some((line) => line.slice(line.indexOf("\t") + 1) === candidate))
+    const result = runGit(repo, ["ls-files", "--stage", "--", candidate]);
+    if (result.stdout.split(/\r?\n/).some((line) => line.slice(line.indexOf("\t") + 1) === candidate))
       return true;
   }
   return false;
@@ -12533,9 +12656,9 @@ function configureHooks(runGit, mainRoot) {
   const current = runGit(mainRoot, ["config", "--get", "core.hooksPath"]);
   if (current.status === 0 && path16.resolve(mainRoot, current.stdout.trim()) === desired)
     return;
-  const result2 = runGit(mainRoot, ["config", "core.hooksPath", desired]);
-  if (result2.status !== 0)
-    throw new Error(result2.stderr.trim() || "failed to configure shared core.hooksPath");
+  const result = runGit(mainRoot, ["config", "core.hooksPath", desired]);
+  if (result.status !== 0)
+    throw new Error(result.stderr.trim() || "failed to configure shared core.hooksPath");
 }
 function copyIncludes(runGit, mainRoot, worktreeRoot) {
   if (!fs15.existsSync(path16.join(mainRoot, ".worktreeinclude")))
@@ -12659,24 +12782,24 @@ function findCanonicalGitRoot(cwd) {
 // dist/builtin/subagents/src/runs/shared/worktree.ts
 var DEFAULT_WORKTREE_SETUP_HOOK_TIMEOUT_MS = 30000;
 function runGit(cwd, args) {
-  const result2 = spawnSync("git", ["-C", cwd, ...args], {
+  const result = spawnSync("git", ["-C", cwd, ...args], {
     encoding: "utf-8",
     env: createGitEnvironment({}, createChildProcessEnvironment3())
   });
   return {
-    stdout: result2.stdout ?? "",
-    stderr: result2.stderr ?? "",
-    status: result2.status
+    stdout: result.stdout ?? "",
+    stderr: result.stderr ?? "",
+    status: result.status
   };
 }
 function runGitChecked(cwd, args) {
-  const result2 = runGit(cwd, args);
-  if (result2.status !== 0) {
+  const result = runGit(cwd, args);
+  if (result.status !== 0) {
     const command = `git -C ${cwd} ${args.join(" ")}`;
-    const message = result2.stderr.trim() || result2.stdout.trim() || `${command} failed`;
+    const message = result.stderr.trim() || result.stdout.trim() || `${command} failed`;
     throw new Error(message);
   }
-  return result2.stdout;
+  return result.stdout;
 }
 function originDefaultBranch(mainRoot) {
   const symbolic = runGit(mainRoot, ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
@@ -12798,18 +12921,18 @@ function normalizeSyntheticPath(worktreePath, rawPath) {
   if (path18.isAbsolute(trimmed))
     throw new Error(`synthetic path must be relative: ${rawPath}`);
   const resolved = path18.resolve(worktreePath, trimmed);
-  const relative4 = path18.relative(worktreePath, resolved);
-  if (!relative4 || relative4 === ".") {
+  const relative = path18.relative(worktreePath, resolved);
+  if (!relative || relative === ".") {
     throw new Error(`synthetic path cannot target the worktree root: ${rawPath}`);
   }
-  if (relative4 === ".." || relative4.startsWith(`..${path18.sep}`) || path18.isAbsolute(relative4)) {
+  if (relative === ".." || relative.startsWith(`..${path18.sep}`) || path18.isAbsolute(relative)) {
     throw new Error(`synthetic path escapes the worktree root: ${rawPath}`);
   }
-  return path18.normalize(relative4);
+  return path18.normalize(relative);
 }
 function hasTrackedEntries(worktreePath, relativePath) {
-  const result2 = runGit(worktreePath, ["ls-files", "--", relativePath]);
-  return result2.status === 0 && result2.stdout.trim().length > 0;
+  const result = runGit(worktreePath, ["ls-files", "--", relativePath]);
+  return result.status === 0 && result.stdout.trim().length > 0;
 }
 function parseWorktreeSetupHookOutput(rawStdout) {
   const trimmed = rawStdout.trim();
@@ -12832,7 +12955,7 @@ function isSpuriousHookStdinWriteFailure(code, status) {
   return code === "EPIPE" && status !== null;
 }
 function runWorktreeSetupHook(hook, input) {
-  const result2 = spawnSync(hook.hookPath, [], {
+  const result = spawnSync(hook.hookPath, [], {
     cwd: input.worktreePath,
     encoding: "utf-8",
     input: JSON.stringify(input),
@@ -12840,20 +12963,20 @@ function runWorktreeSetupHook(hook, input) {
     timeout: hook.timeoutMs,
     shell: false
   });
-  if (result2.error) {
-    const code = "code" in result2.error && typeof result2.error.code === "string" ? result2.error.code : undefined;
+  if (result.error) {
+    const code = "code" in result.error && typeof result.error.code === "string" ? result.error.code : undefined;
     if (code === "ETIMEDOUT") {
       throw new Error(`worktree setup hook timed out after ${hook.timeoutMs}ms`);
     }
-    if (!isSpuriousHookStdinWriteFailure(code, result2.status)) {
-      throw new Error(`worktree setup hook failed: ${result2.error.message}`);
+    if (!isSpuriousHookStdinWriteFailure(code, result.status)) {
+      throw new Error(`worktree setup hook failed: ${result.error.message}`);
     }
   }
-  if (result2.status !== 0) {
-    const details = result2.stderr.trim() || result2.stdout.trim() || "no output";
-    throw new Error(`worktree setup hook failed with exit code ${result2.status}: ${details}`);
+  if (result.status !== 0) {
+    const details = result.stderr.trim() || result.stdout.trim() || "no output";
+    throw new Error(`worktree setup hook failed with exit code ${result.status}: ${details}`);
   }
-  const output = parseWorktreeSetupHookOutput(result2.stdout);
+  const output = parseWorktreeSetupHookOutput(result.stdout);
   if (output.syntheticPaths === undefined)
     return [];
   if (!Array.isArray(output.syntheticPaths)) {
@@ -12924,8 +13047,8 @@ function createSingleWorktree(mainRoot, cwdRelative, runId, index, baseRef, base
 }
 function removeSyntheticPath(worktree, syntheticPath) {
   const resolved = path18.resolve(worktree.path, syntheticPath);
-  const relative4 = path18.relative(worktree.path, resolved);
-  if (!relative4 || relative4 === "." || relative4 === ".." || relative4.startsWith(`..${path18.sep}`) || path18.isAbsolute(relative4)) {
+  const relative = path18.relative(worktree.path, resolved);
+  if (!relative || relative === "." || relative === ".." || relative.startsWith(`..${path18.sep}`) || path18.isAbsolute(relative)) {
     return;
   }
   let stat;
@@ -13187,29 +13310,216 @@ function findDuplicateParallelOutputPath(input) {
   return;
 }
 
-// dist/builtin/subagents/src/runs/foreground/subagent-executor-parallel-task.ts
-function skippedParallelResult(task, taskText, error) {
+// dist/builtin/subagents/src/runs/foreground/task-execution.ts
+function subagentTaskResultLabel(result) {
+  return result.kind === "cancelled" && result.cause === "user" ? "killed (non-resumable)" : result.kind;
+}
+function subagentTaskResponseText(response) {
+  const outcomes = response.kind === "parallel" ? response.slots.map((slot) => slot.outcome) : [response];
+  const killed = outcomes.filter((outcome) => outcome.kind === "admitted" && outcome.observation.kind === "settled" && subagentTaskResultLabel(outcome.observation.result) === "killed (non-resumable)");
+  return `${killed.length ? `${killed.length} killed. These children cannot be resumed. Underlying host response:
+` : ""}${JSON.stringify(response)}`;
+}
+function taskToolResult(response, host) {
   return {
-    agent: task.agent,
-    task: taskText,
-    status: "skipped",
-    messages: [],
-    usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 },
-    error
+    content: [{ type: "text", text: subagentTaskResponseText(response) }],
+    details: {
+      mode: "single",
+      results: [],
+      taskResponse: response,
+      taskRecords: taskResponseRecords(response, host)
+    },
+    ...response.kind === "unstarted" ? { isError: true } : {}
+  };
+}
+function taskResponseRecords(response, host) {
+  const outcomes = response.kind === "parallel" ? response.slots.map((slot) => slot.outcome) : [response];
+  const ids = new Set(outcomes.flatMap((outcome) => outcome.kind === "admitted" ? [outcome.observation.taskId] : []));
+  const watched = host?.watchOwnerTasks();
+  if (!watched?.ok)
+    return [];
+  try {
+    return watched.value.snapshot.tasks.filter((task) => ids.has(task.ref.taskId));
+  } finally {
+    watched.value.dispose();
+  }
+}
+async function runAgentTask(input) {
+  let yieldWait;
+  let pendingYield = false;
+  const registered = Promise.withResolvers();
+  const started = await input.host.startAgentTask({ kind: "agent", agent: input.agent, task: input.intentTask ?? input.task, cwd: input.options.cwd ?? input.cwd }, `${input.options.runId}:${input.options.index ?? 0}`, (context) => {
+    const cleaned = Promise.withResolvers();
+    let executionBound = false;
+    const result = registered.promise.then(async () => {
+      try {
+        const child = await input.runtime.runSync(input.cwd, input.agents, input.agent, input.task, {
+          ...input.options,
+          signal: context.signal,
+          taskExecution: {
+            signal: context.signal,
+            reportActivity: context.reportActivity,
+            bindTranscript: (session) => context.bindTranscript({
+              getSessionId: () => session.getSessionId(),
+              getEntries: () => session.getEntries(),
+              ...session.subscribe ? { subscribe: session.subscribe.bind(session) } : {},
+              ...session.getStreamingMessage ? { getStreamingMessage: session.getStreamingMessage.bind(session) } : {},
+              ...input.options.intercomSessionName ? {
+                completionSource: {
+                  runId: input.options.runId,
+                  intercomTarget: input.options.intercomSessionName
+                }
+              } : {}
+            }),
+            onExecution: (execution) => {
+              executionBound = true;
+              execution.cleanup.then(cleaned.resolve, (error) => cleaned.resolve({
+                kind: "failed",
+                resources: [{ resource: "agent-session", code: "CleanupFailed", message: String(error) }]
+              }));
+            },
+            yieldTaskWait: () => {
+              if (yieldWait)
+                yieldWait("intercom-coordination");
+              else
+                pendingYield = true;
+            }
+          }
+        });
+        if (child.model !== undefined || child.thinking !== undefined)
+          context.reportActivity({
+            reportId: "terminal-model",
+            change: { kind: "model", model: child.model, thinking: child.thinking }
+          });
+        input.onTerminal?.(child);
+        const text = input.outputText?.(child) ?? getSingleResultOutput(child);
+        const bytes = Buffer.from(text);
+        context.reportActivity({
+          reportId: "terminal-output",
+          change: { kind: "output", offset: "0", bytesBase64: bytes.toString("base64") }
+        });
+        const output = {
+          ownerId: context.ref.ownerId,
+          taskId: context.ref.taskId,
+          artifactId: `output:${context.ref.taskId}`,
+          byteCount: String(bytes.length),
+          omittedRanges: []
+        };
+        if (child.status === "killed")
+          return { kind: "cancelled", cause: "user", output };
+        if (child.interrupted)
+          return {
+            kind: "cancelled",
+            cause: input.options.interruptSignal?.aborted ? "parent-handoff" : "owner-close",
+            output
+          };
+        return child.status === "ok" ? { kind: "completed", output } : {
+          kind: "failed",
+          code: "AgentFailed",
+          message: child.error ?? child.envelope ?? "Agent failed",
+          output
+        };
+      } finally {
+        if (!executionBound)
+          cleaned.resolve({ kind: "reaped" });
+      }
+    });
+    return { result, cleanup: cleaned.promise };
+  }, input.schedule);
+  if (!started.ok)
+    return { kind: "unstarted", reason: { kind: "rejected", error: started.error } };
+  const yieldForIntercom = () => {
+    if (yieldWait)
+      yieldWait("intercom-coordination");
+    else
+      pendingYield = true;
+  };
+  input.options.intercomDetachSignal?.addEventListener("abort", yieldForIntercom, { once: true });
+  if (input.options.intercomDetachSignal?.aborted)
+    yieldForIntercom();
+  const observation = input.host.observeAgentLaunch(started.value.taskId, input.wait, (yieldRegistered) => {
+    yieldWait = yieldRegistered;
+    if (pendingYield)
+      yieldRegistered("intercom-coordination");
+    registered.resolve();
+  });
+  registered.resolve();
+  const observed = await observation.finally(() => input.options.intercomDetachSignal?.removeEventListener("abort", yieldForIntercom));
+  if (!observed.ok)
+    throw new Error(`${observed.error.code}: ${observed.error.message}`);
+  return { kind: "admitted", observation: observed.value };
+}
+
+// dist/builtin/subagents/src/runs/foreground/subagent-executor-parallel-task.ts
+function runUnboundParallelTask(options, agent, task, schedule, run) {
+  const observed = Promise.withResolvers();
+  const finished = Promise.withResolvers();
+  let started = false;
+  let yielded = false;
+  const yieldQueued = () => {
+    if (started)
+      return;
+    yielded = true;
+    observed.resolve({
+      agent,
+      task,
+      status: "continued",
+      detached: true,
+      detachedReason: "intercom-coordination",
+      messages: [],
+      usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 }
+    });
   };
+  options.intercomDetachSignal?.addEventListener("abort", yieldQueued, { once: true });
+  schedule(async () => {
+    started = true;
+    try {
+      const result = await run({
+        ...options,
+        onDetachedExit: (result) => {
+          try {
+            options.onDetachedExit?.(result);
+          } finally {
+            finished.resolve();
+          }
+        }
+      });
+      observed.resolve(result);
+      if (!result.detached) {
+        finished.resolve();
+        if (yielded)
+          options.onDetachedExit?.(result);
+      }
+      await finished.promise;
+    } catch (error) {
+      observed.reject(error);
+    }
+  });
+  if (options.intercomDetachSignal?.aborted)
+    yieldQueued();
+  return observed.promise.finally(() => options.intercomDetachSignal?.removeEventListener("abort", yieldQueued));
 }
 async function runForegroundParallelTasks(input) {
   const intercomDetachController = new AbortController;
-  const parentAskController = new AbortController;
-  const startedIndices = new Set;
-  const activeIndices = new Set;
-  return mapConcurrent(input.tasks, input.concurrencyLimit, async (task, index) => {
-    if (parentAskController.signal.aborted) {
-      return skippedParallelResult(task, input.taskTexts[index] ?? task.task, "Skipped after parent ask handoff");
-    }
-    if (intercomDetachController.signal.aborted) {
-      return skippedParallelResult(task, input.taskTexts[index] ?? task.task, "Skipped after foreground group detached for intercom coordination");
+  const host = input.ctx.getAgentTaskHost?.();
+  let active = 0;
+  const queued = [];
+  const pump = () => {
+    while (active < input.concurrencyLimit && queued.length > 0) {
+      const dispatch = queued.shift();
+      active++;
+      const release = () => {
+        active--;
+        pump();
+      };
+      dispatch().then(release, release);
     }
+  };
+  const schedule = (dispatch) => {
+    queued.push(dispatch);
+    pump();
+  };
+  return mapConcurrent(input.tasks, input.tasks.length, async (task, index) => {
     const behavior = input.behaviors[index];
     const effectiveSkills = behavior?.skills;
     const taskCwd = resolveParallelTaskCwd(task, input.paramsCwd, input.worktreeSetup, index);
@@ -13219,19 +13529,7 @@ async function runForegroundParallelTasks(input) {
     const taskText = injectSingleOutputInstruction(`${readInstructions.prefix}${input.taskTexts[index]}${progressInstructions.suffix}`, outputPath);
     const childIntercomTarget = input.childIntercomTarget?.(task.agent, index);
     const supervisorAuthorization = await requestSupervisorAuthorization(input.intercomEvents, childIntercomTarget);
-    if (parentAskController.signal.aborted) {
-      return skippedParallelResult(task, input.taskTexts[index] ?? task.task, "Skipped after parent ask handoff");
-    }
-    if (intercomDetachController.signal.aborted) {
-      return skippedParallelResult(task, input.taskTexts[index] ?? task.task, "Skipped after foreground group detached for intercom coordination");
-    }
     const interruptController = new AbortController;
-    const interruptForParentAsk = () => interruptController.abort();
-    parentAskController.signal.addEventListener("abort", interruptForParentAsk, { once: true });
-    if (parentAskController.signal.aborted)
-      interruptController.abort();
-    startedIndices.add(index);
-    activeIndices.add(index);
     if (input.foregroundControl) {
       input.foregroundControl.currentAgent = task.agent;
       input.foregroundControl.currentIndex = index;
@@ -13275,21 +13573,9 @@ async function runForegroundParallelTasks(input) {
       supervisorAuthorization,
       orchestratorIntercomTarget: input.orchestratorIntercomTarget,
       intercomGroup: resolveChildIntercomGroup(task.group ?? input.setIntercomGroup, inheritedIntercomGroup(input.ctx), input.sharedAutoIntercomGroup),
-      onDetachedExit: (result2) => input.onDetachedExit?.(index, result2),
+      onDetachedExit: (result) => input.onDetachedExit?.(index, result),
       intercomDetachSignal: intercomDetachController.signal,
       onIntercomDetachCommit: () => intercomDetachController.abort(),
-      onParentAskHandoff: input.onParentAskHandoff ? (request) => {
-        if (parentAskController.signal.aborted)
-          return;
-        request.taskContext = input.tasks[request.index]?.task ?? "";
-        input.onParentAskHandoff?.({
-          askingChildIndex: request.index,
-          releasedChildIndices: [...activeIndices].sort((left, right) => left - right),
-          unlaunchedChildIndices: input.tasks.map((_, taskIndex) => taskIndex).filter((taskIndex) => !startedIndices.has(taskIndex)),
-          request
-        });
-        parentAskController.abort();
-      } : undefined,
       modelOverride: input.modelOverrides[index],
       availableModels: input.availableModels,
       knownModelProviders: input.knownModelProviders,
@@ -13319,12 +13605,12 @@ async function runForegroundParallelTasks(input) {
           input.liveResults[index] = stepResults[0];
         if (stepProgress.length > 0)
           input.liveProgress[index] = stepProgress[0];
-        const indexedResults = input.liveResults.flatMap((result2, resultIndex) => result2 === undefined ? [] : [{ result: result2, index: resultIndex }]);
-        const mergedResults = indexedResults.map(({ result: result2 }) => result2);
+        const indexedResults = input.liveResults.flatMap((result, resultIndex) => result === undefined ? [] : [{ result, index: resultIndex }]);
+        const mergedResults = indexedResults.map(({ result }) => result);
         const mergedProgress = input.liveProgress.filter((progress) => progress !== undefined);
         const controlEvents = progressUpdate.details?.controlEvents?.map((event) => ({ ...event, index }));
         const artifactDir = progressUpdate.details?.artifacts?.dir;
-        const artifactFiles = mergedResults.flatMap((result2) => result2.artifactPaths ? [result2.artifactPaths] : []);
+        const artifactFiles = mergedResults.flatMap((result) => result.artifactPaths ? [result.artifactPaths] : []);
         const aggregateUpdate = {
           content: progressUpdate.content,
           details: {
@@ -13341,9 +13627,39 @@ async function runForegroundParallelTasks(input) {
       } : undefined
     };
     input.onExecution?.(index, input.ctx.cwd, runOptions);
-    return input.runtime.runSync(input.ctx.cwd, taskAgents, task.agent, taskText, runOptions).finally(() => {
-      activeIndices.delete(index);
-      parentAskController.signal.removeEventListener("abort", interruptForParentAsk);
+    if (host) {
+      if (input.wait?.kind !== "foreground") {
+        runOptions.intercomDetachSignal = undefined;
+        runOptions.onIntercomDetachCommit = undefined;
+      }
+      let terminalChild;
+      const response = await runAgentTask({
+        host,
+        cwd: input.ctx.cwd,
+        agents: taskAgents,
+        agent: task.agent,
+        task: taskText,
+        intentTask: task.task,
+        options: runOptions,
+        wait: input.wait,
+        runtime: input.runtime,
+        schedule: (dispatch) => schedule(() => dispatch().finally(() => input.onTaskTerminal?.(index))),
+        onTerminal: (child) => {
+          terminalChild = child;
+        }
+      });
+      if (terminalChild)
+        return { ...terminalChild, taskResponse: response };
+      return {
+        agent: task.agent,
+        task: task.task,
+        status: "continued",
+        messages: [],
+        usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 },
+        taskResponse: response
+      };
+    }
+    return runUnboundParallelTask(runOptions, task.agent, taskText, schedule, (options) => input.runtime.runSync(input.ctx.cwd, taskAgents, task.agent, taskText, options)).finally(() => {
       if (input.foregroundControl?.currentIndex === index) {
         input.foregroundControl.interrupt = undefined;
         input.foregroundControl.updatedAt = Date.now();
@@ -13356,9 +13672,11 @@ async function runForegroundParallelTasks(input) {
 import { isStaleExtensionContextError as isStaleExtensionContextError4 } from "@bastani/atomic";
 
 // dist/builtin/subagents/src/intercom/result-intercom.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { isStaleExtensionContextError as isStaleExtensionContextError3 } from "@bastani/atomic";
 function resolveSubagentResultStatus(input) {
+  if (input.status === "killed" || input.state === "killed")
+    return "killed";
   if (input.detached || input.status === "continued")
     return "detached";
   if (input.interrupted || input.status === "interrupted" || input.state === "interrupted")
@@ -13374,6 +13692,7 @@ function countStatuses(children) {
     completed: 0,
     failed: 0,
     interrupted: 0,
+    killed: 0,
     detached: 0
   };
   for (const child of children) {
@@ -13385,6 +13704,7 @@ function formatStatusCounts(children) {
   let completed = 0;
   let failed = 0;
   let interrupted = 0;
+  let killed = 0;
   let cancelled = 0;
   let detached = 0;
   for (const child of children) {
@@ -13397,6 +13717,8 @@ function formatStatusCounts(children) {
       failed += 1;
     else if (label === "interrupted")
       interrupted += 1;
+    else if (label === "killed")
+      killed += 1;
     else if (label === "detached")
       detached += 1;
   }
@@ -13405,6 +13727,7 @@ function formatStatusCounts(children) {
     failed ? `${failed} failed` : undefined,
     cancelled ? `${cancelled} cancelled` : undefined,
     interrupted ? `${interrupted} interrupted` : undefined,
+    killed ? `${killed} killed (non-resumable)` : undefined,
     detached ? `${detached} detached` : undefined
   ].filter((part) => Boolean(part));
   return parts.length ? parts.join(", ") : "0 results";
@@ -13413,6 +13736,10 @@ function resolveGroupedStatus(children) {
   const counts = countStatuses(children);
   if (counts.failed > 0)
     return "failed";
+  if (groupedParentCancelCause(children))
+    return "interrupted";
+  if (counts.killed > 0)
+    return "killed";
   if (counts.interrupted > 0)
     return "interrupted";
   if (counts.completed > 0)
@@ -13491,8 +13818,8 @@ async function deliverSubagentResultIntercomEvent(events, payload, timeoutMs = 5
 async function deliverSubagentIntercomMessageEvent(events, to, message, timeoutMs = 500, extra = {}) {
   if (typeof events.on !== "function" || typeof events.emit !== "function")
     return false;
-  const requestId = typeof extra.requestId === "string" ? extra.requestId : randomUUID3();
-  return new Promise((resolve14) => {
+  const requestId = typeof extra.requestId === "string" ? extra.requestId : randomUUID4();
+  return new Promise((resolve) => {
     let settled = false;
     let unsubscribe;
     let timer;
@@ -13508,7 +13835,7 @@ async function deliverSubagentIntercomMessageEvent(events, to, message, timeoutM
         if (!isStaleExtensionContextError3(error))
           throw error;
       }
-      resolve14(delivered);
+      resolve(delivered);
     };
     try {
       unsubscribe = events.on(SUBAGENT_RESULT_INTERCOM_DELIVERY_EVENT, (data) => {
@@ -13534,9 +13861,9 @@ async function deliverSubagentIntercomMessageEvent(events, to, message, timeoutM
     }
   });
 }
-function stripSingleResultOutputs(result2) {
+function stripSingleResultOutputs(result) {
   return {
-    ...result2,
+    ...result,
     messages: undefined,
     finalOutput: undefined,
     truncation: undefined
@@ -13583,14 +13910,14 @@ function formatSubagentResultReceipt(input) {
 
 // dist/builtin/subagents/src/runs/foreground/completion-notification.ts
 function deliverLocalCompletionNotification(events, payload, notificationId) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve, reject) => {
     let settled = false;
     let deferred = false;
     const finish = (delivered) => {
       if (settled)
         return;
       settled = true;
-      resolve14(delivered);
+      resolve(delivered);
     };
     const fail = (error) => {
       if (settled)
@@ -13713,28 +14040,28 @@ function createForegroundControlNotifier(data, deps) {
 function workflowStageAcceptsDetachedNotification(ctx) {
   return ctx.orchestrationContext?.messageAdmission?.isOpen() !== false;
 }
-function resultSummaryForIntercom(result2) {
-  const output = getSingleResultOutput(result2);
-  if (result2.status === "error" && result2.error) {
-    return output ? `${result2.error}
+function resultSummaryForIntercom(result) {
+  const output = getSingleResultOutput(result);
+  if (result.status === "error" && result.error) {
+    return output ? `${result.error}
 
 Output:
-${output}` : result2.error;
+${output}` : result.error;
   }
-  return output || result2.error || "(no output)";
+  return output || result.error || "(no output)";
 }
 function notifyDetachedForegroundChildExit(input) {
-  const { pi, runId, index, result: result2 } = input;
+  const { pi, runId, index, result } = input;
   deliverLocalCompletionNotification(pi.events, {
     id: runId,
     runId,
-    agent: result2.agent,
-    status: result2.status,
-    summary: resultSummaryForIntercom(result2),
-    ...result2.interrupted ? { state: "interrupted" } : {},
+    agent: result.agent,
+    status: result.status,
+    summary: resultSummaryForIntercom(result),
+    ...result.interrupted ? { state: "interrupted" } : {},
     timestamp: Date.now(),
-    ...result2.progressSummary?.durationMs !== undefined ? { durationMs: result2.progressSummary.durationMs } : {},
-    ...result2.sessionFile ? { sessionFile: result2.sessionFile } : {},
+    ...result.progressSummary?.durationMs !== undefined ? { durationMs: result.progressSummary.durationMs } : {},
+    ...result.sessionFile ? { sessionFile: result.sessionFile } : {},
     ...input.totalTasks !== undefined && input.totalTasks > 1 ? { taskIndex: index, totalTasks: input.totalTasks } : {},
     noticeLabel: "Detached subagent task"
   }, `foreground-detach-${runId}-${index}`).catch((error) => {
@@ -13746,20 +14073,20 @@ function notifyDetachedForegroundChildExit(input) {
 async function emitForegroundResultIntercom(input) {
   if (!input.intercomBridge.active || !input.intercomBridge.orchestratorTarget)
     return null;
-  const children = input.results.flatMap((result2, index) => result2.detached ? [] : [
+  const children = input.results.flatMap((result, index) => result.detached ? [] : [
     {
-      agent: result2.agent,
+      agent: result.agent,
       status: resolveSubagentResultStatus({
-        status: result2.status,
-        interrupted: result2.interrupted,
-        detached: result2.detached
+        status: result.status,
+        interrupted: result.interrupted,
+        detached: result.detached
       }),
-      summary: resultSummaryForIntercom(result2),
+      summary: resultSummaryForIntercom(result),
       index,
-      ...result2.cause ? { cause: result2.cause } : {},
-      artifactPath: result2.artifactPaths?.outputPath,
-      sessionPath: result2.sessionFile,
-      intercomTarget: resolveSubagentIntercomTarget(input.runId, result2.agent, index)
+      ...result.cause ? { cause: result.cause } : {},
+      artifactPath: result.artifactPaths?.outputPath,
+      sessionPath: result.sessionFile,
+      intercomTarget: resolveSubagentIntercomTarget(input.runId, result.agent, index)
     }
   ]);
   if (children.length === 0)
@@ -13870,7 +14197,6 @@ async function runParallelPath(data, deps) {
   });
   if (errorResult)
     return errorResult;
-  let parentAsk;
   try {
     const duplicateOutputError = findDuplicateParallelOutputPath({
       tasks,
@@ -13897,7 +14223,9 @@ async function runParallelPath(data, deps) {
       }
     }
     const results = await runForegroundParallelTasks({
-      onDetachedExit: (index, result2) => {
+      wait: params.wait,
+      onTaskTerminal: (index) => detachedCleanup.recover(index),
+      onDetachedExit: (index, result) => {
         try {
           if (workflowStageAcceptsDetachedNotification(ctx)) {
             notifyDetachedForegroundChildExit({
@@ -13906,17 +14234,13 @@ async function runParallelPath(data, deps) {
               mode: "parallel",
               index,
               totalTasks: tasks.length,
-              result: result2
+              result
             });
           }
         } finally {
           detachedCleanup.recover(index);
         }
       },
-      onParentAskHandoff: (handoff) => {
-        if (!parentAsk)
-          parentAsk = handoff;
-      },
       tasks,
       taskTexts,
       agents,
@@ -13954,57 +14278,67 @@ async function runParallelPath(data, deps) {
       worktreeSetup,
       runtime: deps.runtime
     });
+    if (ctx.getAgentTaskHost) {
+      const response = {
+        kind: "parallel",
+        slots: results.map((result, ordinal) => ({
+          ordinal,
+          outcome: result.taskResponse ?? {
+            kind: "unstarted",
+            reason: { kind: "skipped", cause: "parallel-group-detach" }
+          }
+        }))
+      };
+      worktreeCleanupDeferred = detachedCleanup.defer(response.slots.flatMap(({ ordinal, outcome }) => outcome.kind === "admitted" && outcome.observation.kind === "yielded" ? [ordinal] : []));
+      return {
+        content: [{ type: "text", text: subagentTaskResponseText(response) }],
+        details: {
+          mode: "parallel",
+          results: [],
+          taskResponse: response,
+          taskRecords: taskResponseRecords(response, ctx.getAgentTaskHost())
+        }
+      };
+    }
     for (let i = 0;i < results.length; i++) {
       const run = results[i];
       recordRun(run.agent, taskTexts[i], run.status, run.progressSummary?.durationMs ?? 0);
     }
-    for (const result2 of results) {
-      if (result2.progress)
-        allProgress.push(result2.progress);
-      if (result2.artifactPaths)
-        allArtifactPaths.push(result2.artifactPaths);
+    for (const result of results) {
+      if (result.progress)
+        allProgress.push(result.progress);
+      if (result.artifactPaths)
+        allArtifactPaths.push(result.artifactPaths);
     }
-    const interrupted = results.find((result2) => result2.interrupted && !isParentCancellation(result2.cause));
+    const interrupted = results.find((result) => result.status === "killed" || result.interrupted && !isParentCancellation(result.cause));
     const details = compactForegroundDetails({
       mode: "parallel",
       runId,
       results,
-      parentAskYielded: parentAsk !== undefined,
+      parentAskYielded: false,
       progress: params.includeProgress ? allProgress : undefined,
       artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined
     });
-    if (parentAsk) {
-      const worktreeSuffix2 = buildParallelWorktreeSuffix(worktreeSetup, artifactsDir, tasks);
-      const handoffText = formatParentAskHandoffOutput(parentAsk);
-      const yieldedResult = {
-        content: [{ type: "text", text: worktreeSuffix2 ? `${handoffText}
-
-${worktreeSuffix2}` : handoffText }],
-        details
-      };
-      markParentAskHandoff(yieldedResult, parentAsk);
-      return yieldedResult;
-    }
-    if (interrupted && !results.some((result2) => isParentCancellation(result2.cause) && (result2.interrupted || result2.status === "interrupted"))) {
+    if (interrupted && !results.some((result) => isParentCancellation(result.cause) && (result.interrupted || result.status === "interrupted"))) {
       return {
         content: [
           {
             type: "text",
-            text: `Parallel run ended after interrupt (${interrupted.agent}). Launch fresh subagents for any follow-up.`
+            text: interrupted.status === "killed" ? `Parallel child killed (${interrupted.agent}). This child cannot be resumed. Launch fresh subagents for any follow-up.` : `Parallel run ended before completion (${interrupted.agent}). Launch fresh subagents for any follow-up.`
           }
         ],
         details
       };
     }
-    const detachedIndex = results.findIndex((result2) => result2.detached);
+    const detachedIndex = results.findIndex((result) => result.detached);
     const detached = detachedIndex >= 0 ? results[detachedIndex] : undefined;
-    worktreeCleanupDeferred = detachedCleanup.defer(results.flatMap((result2, index) => result2.detached ? [index] : []));
+    worktreeCleanupDeferred = detachedCleanup.defer(results.flatMap((result, index) => result.detached ? [index] : []));
     if (detached) {
       return {
         content: [
           {
             type: "text",
-            text: `Parallel run detached for intercom coordination (${detached.agent}). Reply to the supervisor request first. After the child exits, launch fresh follow-up work if needed.`
+            text: `Parallel observation yielded for intercom coordination (${detached.agent}). The original children continue; reply to any pending ask without relaunching them.`
           }
         ],
         details
@@ -14024,12 +14358,12 @@ ${worktreeSuffix2}` : handoffText }],
       };
     }
     const worktreeSuffix = buildParallelWorktreeSuffix(worktreeSetup, artifactsDir, tasks);
-    const childContent = formatParallelResultContent(results.map((result2) => ({
-      agent: result2.agent,
-      output: result2.truncation?.text || getSingleResultOutput(result2),
-      status: result2.status,
-      error: result2.error,
-      ...result2.cause ? { cause: result2.cause } : {}
+    const childContent = formatParallelResultContent(results.map((result) => ({
+      agent: result.agent,
+      output: result.truncation?.text || getSingleResultOutput(result),
+      status: result.status,
+      error: result.error,
+      ...result.cause ? { cause: result.cause } : {}
     })), (i, agent) => `=== Task ${i + 1}: ${agent} ===`);
     const fullContent = worktreeSuffix ? `${childContent}
 
@@ -14132,8 +14466,9 @@ function matchesIntercomDetachRoute(event, expected) {
 // dist/builtin/subagents/src/runs/foreground/execution-intercom-detach.ts
 function registerExecutionIntercomDetach(options, state) {
   const reservations = new IntercomDetachReservations;
+  let taskWaitYielded = false;
   const unsubscribe = options.intercomEvents?.on?.(INTERCOM_DETACH_REQUEST_EVENT, (payload) => {
-    if (!options.allowIntercomDetach || state.isUnavailable())
+    if (!options.allowIntercomDetach || state.isUnavailable() || taskWaitYielded)
       return;
     if (!payload || typeof payload !== "object")
       return;
@@ -14150,11 +14485,26 @@ function registerExecutionIntercomDetach(options, state) {
     }
     if (event.phase !== "commit" || state.isDetached() || !reservations.commit(event))
       return;
-    options.onIntercomDetachCommit?.();
-    state.detach();
+    if (options.taskExecution) {
+      taskWaitYielded = true;
+      options.taskExecution.yieldTaskWait("intercom-coordination");
+      options.onIntercomDetachCommit?.();
+    } else {
+      options.onIntercomDetachCommit?.();
+      state.detach();
+    }
     options.intercomEvents?.emit?.(INTERCOM_DETACH_RESPONSE_EVENT, { ...event, accepted: true });
   });
-  const detachSibling = () => state.detach();
+  const detachSibling = () => {
+    if (options.taskExecution) {
+      if (state.isUnavailable() || taskWaitYielded)
+        return;
+      taskWaitYielded = true;
+      options.taskExecution.yieldTaskWait("intercom-coordination");
+    } else {
+      state.detach();
+    }
+  };
   options.intercomDetachSignal?.addEventListener("abort", detachSibling, { once: true });
   if (options.intercomDetachSignal?.aborted)
     detachSibling();
@@ -14248,7 +14598,7 @@ function workflowOrchestrationContext(options) {
   };
 }
 function progressFor(agent, task, outcome, startedAt) {
-  const status = outcome.status === "ok" ? "completed" : outcome.status === "interrupted" && isParentCancellation(outcome.cause) ? "interrupted" : "failed";
+  const status = outcome.status === "ok" ? "completed" : outcome.status === "killed" ? "killed" : outcome.status === "interrupted" && isParentCancellation(outcome.cause) ? "interrupted" : "failed";
   return {
     index: 0,
     agent: agent.name,
@@ -14270,17 +14620,17 @@ function progressFor(agent, task, outcome, startedAt) {
 }
 function resultFromOutcome(agent, task, outcome, startedAt, artifactPaths) {
   const status = outcome.status;
-  const output = outcome.status === "ok" ? outcome.output : outcome.envelope;
+  const output = outcome.status === "killed" ? "Killed. This child cannot be resumed." : outcome.status === "ok" ? outcome.output : outcome.envelope;
   const model = outcome.model;
   const thinking = outcome.thinking;
-  const result2 = {
+  const result = {
     agent: agent.name,
     task,
     status,
     ...outcome.status === "error" ? { cause: outcome.cause, error: outcome.cause } : outcome.status === "interrupted" && isParentCancellation(outcome.cause) ? { cause: outcome.cause } : {},
     stats: outcome.stats,
     path: outcome.path,
-    envelope: outcome.envelope,
+    envelope: outcome.status === "killed" ? output : outcome.envelope,
     interrupted: status === "interrupted" ? true : undefined,
     messages: [],
     usage: usageFromStats(outcome.stats),
@@ -14299,7 +14649,7 @@ function resultFromOutcome(agent, task, outcome, startedAt, artifactPaths) {
     },
     ...artifactPaths ? { artifactPaths } : {}
   };
-  return result2;
+  return result;
 }
 function refusedResult(agent, task, reason) {
   return {
@@ -14431,9 +14781,9 @@ ${task}`);
   const startedAt = Date.now();
   const neverAbort = new AbortController().signal;
   const running = control.startAttempt(admission.admitted, { model: resolvedCandidate?.model, modelId: candidate, thinkingLevel: spec.thinkingLevel }, {
-    abort: options.signal ?? neverAbort,
+    abort: options.taskExecution?.signal ?? options.signal ?? neverAbort,
     interrupt: options.interruptSignal ?? neverAbort
-  });
+  }, options.taskExecution);
   if (options.onUpdate) {
     const launchModel = running.currentModel ?? candidate;
     spec.onProgress?.({
@@ -14453,8 +14803,8 @@ ${task}`);
   }
   let detached = false;
   let resolveContinuation;
-  const continuation = new Promise((resolve14) => {
-    resolveContinuation = resolve14;
+  const continuation = new Promise((resolve) => {
+    resolveContinuation = resolve;
   });
   const detachCleanup = registerExecutionIntercomDetach(options, {
     isUnavailable: () => running.status !== "running",
@@ -14490,10 +14840,10 @@ ${task}`);
         timestamp: Date.now(),
         artifactsDir: options.artifactsDir
       }, { artifactsDir: options.artifactsDir, artifactPaths, artifactsDisabled, maxOutput: options.maxOutput });
-      const delivered2 = control.getDeliveredResult(continuedOutcome.path);
-      if (delivered2) {
-        recovered.envelope = delivered2.envelope;
-        recovered.finalOutput = delivered2.envelope;
+      const delivered = control.getDeliveredResult(continuedOutcome.path);
+      if (delivered) {
+        recovered.envelope = delivered.envelope;
+        recovered.finalOutput = delivered.envelope;
       }
       options.onDetachedExit?.(recovered);
     });
@@ -14535,37 +14885,37 @@ ${task}`);
   detachCleanup();
   parentAskCleanup();
   const outcome = winner.value;
-  const result2 = resultFromOutcome(agent, task, outcome, startedAt, artifactPaths);
+  const result = resultFromOutcome(agent, task, outcome, startedAt, artifactPaths);
   if (filteredCandidates.skippedAttempts.length)
-    result2.modelAttempts = [...filteredCandidates.skippedAttempts, ...result2.modelAttempts ?? []];
+    result.modelAttempts = [...filteredCandidates.skippedAttempts, ...result.modelAttempts ?? []];
   await control.deliverChildResult({
     path: outcome.path,
     status: outcome.status,
     ...outcome.status === "error" || outcome.status === "interrupted" && outcome.cause ? { cause: outcome.cause } : {},
     stats: outcome.stats,
     envelope: outcome.envelope,
-    ...result2.model === undefined ? {} : { model: result2.model },
-    ...result2.thinking === undefined ? {} : { thinking: result2.thinking },
+    ...result.model === undefined ? {} : { model: result.model },
+    ...result.thinking === undefined ? {} : { thinking: result.thinking },
     sessionFile: outcome.sessionFile,
     timestamp: Date.now(),
     artifactsDir: options.artifactsDir
   }, { artifactsDir: options.artifactsDir, artifactPaths, artifactsDisabled, maxOutput: options.maxOutput });
   const delivered = control.getDeliveredResult(outcome.path);
   if (delivered) {
-    result2.envelope = delivered.envelope;
-    result2.finalOutput = delivered.envelope;
+    result.envelope = delivered.envelope;
+    result.finalOutput = delivered.envelope;
   }
   const update = {
-    content: [{ type: "text", text: result2.finalOutput ?? "(no output)" }],
+    content: [{ type: "text", text: result.finalOutput ?? "(no output)" }],
     details: {
       mode: "single",
       runId: options.runId,
-      results: [result2],
-      progress: result2.progress ? [result2.progress] : undefined
+      results: [result],
+      progress: result.progress ? [result.progress] : undefined
     }
   };
   options.onUpdate?.(update);
-  return result2;
+  return result;
 }
 async function runSync(runtimeCwd, agents, agentName, task, options) {
   const agent = agents.find((candidate) => candidate.name === agentName);
@@ -14593,15 +14943,15 @@ function resolveSubagentExecutorRuntimeDeps(overrides) {
 // dist/builtin/subagents/src/runs/foreground/subagent-executor-single.ts
 import * as fs18 from "node:fs";
 import * as path20 from "node:path";
-function formatFailedSingleRunOutput(result2, displayOutput) {
-  const error = result2.error || "Failed";
+function formatFailedSingleRunOutput(result, displayOutput) {
+  const error = result.error || "Failed";
   const output = displayOutput.trim();
   const lines = [error];
   if (output && output !== error.trim()) {
     lines.push("", "Output:", output);
   }
-  if (result2.artifactPaths?.outputPath) {
-    lines.push("", `Output artifact: ${result2.artifactPaths.outputPath}`);
+  if (result.artifactPaths?.outputPath) {
+    lines.push("", `Output artifact: ${result.artifactPaths.outputPath}`);
   }
   return lines.join(`
 `);
@@ -14753,10 +15103,10 @@ async function runSinglePath(data, deps) {
         parentAsk = request;
         interruptController.abort();
       },
-      onDetachedExit: (result2) => {
+      onDetachedExit: (result) => {
         cleanupTransientProgress(progressDir, artifactConfig.enabled);
-        if (result2 && workflowStageAcceptsDetachedNotification(ctx)) {
-          notifyDetachedForegroundChildExit({ pi: deps.pi, runId, mode: "single", index: 0, result: result2 });
+        if (result && workflowStageAcceptsDetachedNotification(ctx)) {
+          notifyDetachedForegroundChildExit({ pi: deps.pi, runId, mode: "single", index: 0, result });
         }
       },
       index: 0,
@@ -14769,7 +15119,34 @@ async function runSinglePath(data, deps) {
       currentThinkingLevel: ctx.thinkingLevel,
       skills: effectiveSkills
     };
-    r = await deps.runtime.runSync(ctx.cwd, agents, params.agent, task, runOptions);
+    if (ctx.getAgentTaskHost) {
+      let settledChild;
+      const response = await runAgentTask({
+        host: ctx.getAgentTaskHost(),
+        cwd: ctx.cwd,
+        agents,
+        agent: params.agent,
+        task,
+        intentTask: handoffTaskContext,
+        options: runOptions,
+        wait: params.wait,
+        runtime: deps.runtime,
+        onTerminal: (child) => {
+          settledChild = child;
+          cleanupTransientProgress(progressDir, artifactConfig.enabled);
+        },
+        outputText: (child) => parentAsk && child.interrupted ? formatParentAskHandoffOutput({
+          askingChildIndex: 0,
+          releasedChildIndices: [0],
+          unlaunchedChildIndices: [],
+          request: parentAsk
+        }) : getSingleResultOutput(child)
+      });
+      if (!parentAsk || !settledChild?.interrupted)
+        return taskToolResult(response, ctx.getAgentTaskHost());
+      r = settledChild;
+    } else
+      r = await deps.runtime.runSync(ctx.cwd, agents, params.agent, task, runOptions);
   } catch (error) {
     cleanupTransientProgress(progressDir, artifactConfig.enabled);
     throw error;
@@ -14862,12 +15239,23 @@ async function runSinglePath(data, deps) {
       details
     };
   }
+  if (r.status === "killed") {
+    return {
+      content: [
+        {
+          type: "text",
+          text: `Killed (${params.agent}). This child cannot be resumed. Launch a fresh subagent for any follow-up.`
+        }
+      ],
+      details
+    };
+  }
   if (r.interrupted) {
     return {
       content: [
         {
           type: "text",
-          text: `Run ended after interrupt (${params.agent}). Launch a fresh subagent for any follow-up.`
+          text: `Run ended before completion (${params.agent}). Launch a fresh subagent for any follow-up.`
         }
       ],
       details
@@ -14887,7 +15275,7 @@ async function runSinglePath(data, deps) {
 
 // dist/builtin/subagents/src/runs/foreground/subagent-executor.ts
 var MUTATING_MANAGEMENT_ACTIONS = new Set(["create", "update", "delete"]);
-var READ_ONLY_MANAGEMENT_ACTIONS = new Set(["list", "get", "status"]);
+var READ_ONLY_MANAGEMENT_ACTIONS = new Set(["list", "get", "status", "wait"]);
 var FANOUT_REFUSAL_MESSAGE = "Subagent fanout is not authorized for this child.";
 async function handleManagementRequest(input) {
   const { params, paramsWithResolvedCwd, requestCwd, ctx, deps } = input;
@@ -14925,6 +15313,64 @@ async function handleManagementRequest(input) {
     if (childRefusal)
       return childRefusal;
   }
+  if (action === "wait") {
+    const observed = ctx.getAgentTaskHost && params.id !== undefined ? await ctx.getAgentTaskHost().waitForTask(params.id, params.budgetMs) : { ok: false, error: { code: "UnknownTask", message: "Task not found in this owner" } };
+    return {
+      content: [
+        {
+          type: "text",
+          text: `${observed.ok && observed.value.kind === "settled" && subagentTaskResultLabel(observed.value.result) === "killed (non-resumable)" ? `Killed. This child cannot be resumed. Underlying host observation:
+` : ""}${JSON.stringify(observed.ok ? observed.value : observed.error)}`
+        }
+      ],
+      details: {
+        mode: "management",
+        results: [],
+        ...observed.ok ? {
+          taskResponse: { kind: "admitted", observation: observed.value },
+          taskRecords: taskResponseRecords({ kind: "admitted", observation: observed.value }, ctx.getAgentTaskHost?.())
+        } : { taskError: observed.error.message }
+      },
+      ...!observed.ok ? { isError: true } : {}
+    };
+  }
+  const targetTaskId = paramsWithResolvedCwd.id ?? paramsWithResolvedCwd.runId;
+  if ((action === "status" || action === "kill") && ctx.getAgentTaskHost && targetTaskId) {
+    const host = ctx.getAgentTaskHost();
+    const taskId = targetTaskId;
+    if (host.resolveTask(taskId).ok) {
+      if (action === "kill") {
+        const cancelled = await host.cancelTask(taskId, "user");
+        if (!cancelled.ok)
+          return {
+            content: [{ type: "text", text: cancelled.error.message }],
+            isError: true,
+            details: { mode: "management", results: [], taskError: cancelled.error.message }
+          };
+      }
+      const watched = host.watchOwnerTasks();
+      if (watched.ok) {
+        const records = watched.value.snapshot.tasks.filter((task) => task.ref.taskId === taskId);
+        watched.value.dispose();
+        return {
+          content: [
+            {
+              type: "text",
+              text: `${records.some((task) => task.execution.kind === "settled" && subagentTaskResultLabel(task.execution.result) === "killed (non-resumable)") ? `Killed. This child cannot be resumed. Underlying host records:
+` : action === "kill" ? `Kill requested. This child cannot be resumed. Underlying host records:
+` : ""}${JSON.stringify(records)}`
+            }
+          ],
+          details: { mode: "management", results: [], taskRecords: records }
+        };
+      }
+      return {
+        content: [{ type: "text", text: watched.error.message }],
+        isError: true,
+        details: { mode: "management", results: [], taskError: watched.error.message }
+      };
+    }
+  }
   if (action === "status") {
     const targetRunId = paramsWithResolvedCwd.id ?? paramsWithResolvedCwd.runId;
     const inProcess = inspectInProcessChildStatus(targetRunId);
@@ -14944,10 +15390,10 @@ async function handleManagementRequest(input) {
       details: { mode: "management", results: [] }
     };
   }
-  if (action === "interrupt") {
+  if (action === "kill") {
     const targetRunId = paramsWithResolvedCwd.runId ?? paramsWithResolvedCwd.id;
     if (targetRunId) {
-      const inProcess = await interruptInProcessChild(targetRunId);
+      const inProcess = await killInProcessChild(targetRunId);
       if (inProcess)
         return inProcess;
     }
@@ -14955,7 +15401,7 @@ async function handleManagementRequest(input) {
       content: [
         {
           type: "text",
-          text: targetRunId ? `No running in-process child found for '${targetRunId}'.` : "No interrupt-capable child found."
+          text: targetRunId ? `No running in-process child found for '${targetRunId}'.` : "No kill-capable child found."
         }
       ],
       isError: true,
@@ -15008,12 +15454,12 @@ function createSubagentExecutor(rawDeps) {
     const prepared = built.prepared;
     try {
       if (prepared.hasTasks && prepared.effectiveParams.tasks) {
-        const result2 = await runParallelPath(prepared.execData, deps);
-        return withForkContext(result2, prepared.effectiveParams.context);
+        const result = await runParallelPath(prepared.execData, deps);
+        return withForkContext(result, prepared.effectiveParams.context);
       }
       if (prepared.hasSingle) {
-        const result2 = await runSinglePath(prepared.execData, deps);
-        return withForkContext(result2, prepared.effectiveParams.context);
+        const result = await runSinglePath(prepared.execData, deps);
+        return withForkContext(result, prepared.effectiveParams.context);
       }
     } catch (error) {
       return toExecutionErrorResult(prepared.effectiveParams, error);
@@ -15215,28 +15661,28 @@ function resolveProgressModel(update, entry) {
       return byIndex.model;
   }
   if (entry.agent) {
-    const byAgent = results.find((result2) => result2.agent === entry.agent && typeof result2.model === "string");
+    const byAgent = results.find((result) => result.agent === entry.agent && typeof result.model === "string");
     if (byAgent?.model)
       return byAgent.model;
   }
-  const firstWithModel = results.find((result2) => typeof result2.model === "string");
+  const firstWithModel = results.find((result) => typeof result.model === "string");
   return firstWithModel?.model;
 }
 function toolCallSummaryText(summary) {
   const text = typeof summary.expandedText === "string" && summary.expandedText.trim().length > 0 ? summary.expandedText.trim() : typeof summary.text === "string" ? summary.text.trim() : "";
   return text || undefined;
 }
-function buildDelegationMessages(result2, fallbackText) {
-  if (Array.isArray(result2.messages) && result2.messages.length > 0)
-    return result2.messages;
-  const toolCallSummaries = (result2.toolCalls ?? []).flatMap((summary) => {
-    const text2 = toolCallSummaryText(summary);
-    return text2 ? [`- ${text2}`] : [];
+function buildDelegationMessages(result, fallbackText) {
+  if (Array.isArray(result.messages) && result.messages.length > 0)
+    return result.messages;
+  const toolCallSummaries = (result.toolCalls ?? []).flatMap((summary) => {
+    const text = toolCallSummaryText(summary);
+    return text ? [`- ${text}`] : [];
   });
   const toolCallText = toolCallSummaries.length > 0 ? `Tool calls:
 ${toolCallSummaries.join(`
 `)}` : undefined;
-  const text = typeof result2.finalOutput === "string" && result2.finalOutput.trim().length > 0 ? result2.finalOutput.trim() : fallbackText;
+  const text = typeof result.finalOutput === "string" && result.finalOutput.trim().length > 0 ? result.finalOutput.trim() : fallbackText;
   const contentText = [toolCallText, text].filter((part) => Boolean(part)).join(`
 
 `);
@@ -15247,15 +15693,15 @@ ${toolCallSummaries.join(`
 function toDelegationUpdate(requestId, update) {
   const progress = update.details?.progress?.[0];
   const taskProgress = update.details?.progress?.map((entry) => {
-    const lastOutput2 = entry.recentOutput?.[entry.recentOutput.length - 1];
-    const safeLastOutput2 = typeof lastOutput2 === "string" && lastOutput2.trim() && lastOutput2 !== "(running...)" ? lastOutput2 : undefined;
+    const lastOutput = entry.recentOutput?.[entry.recentOutput.length - 1];
+    const safeLastOutput = typeof lastOutput === "string" && lastOutput.trim() && lastOutput !== "(running...)" ? lastOutput : undefined;
     return {
       index: entry.index,
       agent: entry.agent ?? "delegate",
       status: entry.status,
       currentTool: entry.currentTool,
       currentToolArgs: entry.currentToolArgs,
-      recentOutput: safeLastOutput2,
+      recentOutput: safeLastOutput,
       recentOutputLines: filterRecentOutput(entry.recentOutput),
       recentTools: sanitizeRecentTools(entry.recentTools),
       model: resolveProgressModel(update, entry),
@@ -15345,7 +15791,7 @@ function registerPromptTemplateDelegationBridge(options) {
       return;
     }
     try {
-      const result2 = await options.execute(request.requestId, request, controller.signal, ctx, (update) => {
+      const result = await options.execute(request.requestId, request, controller.signal, ctx, (update) => {
         const payload = toDelegationUpdate(request.requestId, update);
         if (!payload)
           return;
@@ -15353,10 +15799,10 @@ function registerPromptTemplateDelegationBridge(options) {
           controller.abort();
         }
       });
-      const contentText = firstTextContent(result2.content);
-      const messages = buildDelegationMessages(result2.details?.results?.[0] ?? {}, contentText);
+      const contentText = firstTextContent(result.content);
+      const messages = buildDelegationMessages(result.details?.results?.[0] ?? {}, contentText);
       const parallelResults = request.tasks ? request.tasks.map((task, index) => {
-        const step = result2.details?.results?.[index];
+        const step = result.details?.results?.[index];
         if (!step) {
           return {
             agent: task.agent,
@@ -15378,8 +15824,8 @@ function registerPromptTemplateDelegationBridge(options) {
         messages,
         ...parallelResults ? { parallelResults } : {},
         ...contentText ? { contentText } : {},
-        isError: result2.isError === true,
-        errorText: result2.isError ? contentText : undefined
+        isError: result.isError === true,
+        errorText: result.isError ? contentText : undefined
       };
       emitBridgeEvent(options.events, PROMPT_TEMPLATE_SUBAGENT_RESPONSE_EVENT, response, settlement);
     } catch (error) {
@@ -15487,7 +15933,7 @@ function registerSlashSubagentBridge(options) {
       return;
     }
     try {
-      const result2 = await options.execute(requestId, params, controller.signal, (update) => {
+      const result = await options.execute(requestId, params, controller.signal, (update) => {
         const progress = update.details?.progress;
         const first = progress?.[0];
         const payload = {
@@ -15502,9 +15948,9 @@ function registerSlashSubagentBridge(options) {
       }, ctx);
       const response = {
         requestId,
-        result: result2,
-        isError: result2.isError === true,
-        errorText: result2.isError ? result2.content.find((c) => c.type === "text")?.text : undefined
+        result,
+        isError: result.isError === true,
+        errorText: result.isError ? result.content.find((c) => c.type === "text")?.text : undefined
       };
       emitBridgeEvent(options.events, SLASH_SUBAGENT_RESPONSE_EVENT, response, settlement);
     } catch (error) {
@@ -15542,8 +15988,166 @@ function registerSlashSubagentBridge(options) {
   };
 }
 
+// dist/builtin/subagents/src/tui/agent-browser.ts
+import {
+  Input,
+  matchesKey,
+  truncateToWidth,
+  visibleWidth,
+  wrapTextWithAnsi
+} from "@earendil-works/pi-tui";
+var sources = ["project", "user", "builtin"];
+var sourceLabels = { project: "Project agents", user: "User agents", builtin: "Built-in agents" };
+var clean = (text) => text.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "").replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
+
+class AgentBrowser {
+  theme;
+  close;
+  height;
+  search = new Input({ prompt: "Search: ", placeholder: "name, role, or source" });
+  index = 0;
+  detail = false;
+  scroll = 0;
+  agents;
+  get focused() {
+    return this.search.focused;
+  }
+  set focused(value) {
+    this.search.focused = value;
+  }
+  constructor(agents, theme, close, height, query = "") {
+    this.theme = theme;
+    this.close = close;
+    this.height = height;
+    this.agents = sources.flatMap((source) => agents.filter((agent) => agent.source === source).sort((a, b) => a.name.localeCompare(b.name)));
+    this.search.setValue(query);
+    this.search.handleInput("\x05");
+  }
+  invalidate() {}
+  matches() {
+    const query = this.search.getValue().toLowerCase().trim();
+    return this.agents.filter((agent) => `${agent.name} ${agent.description} ${agent.source}`.toLowerCase().includes(query));
+  }
+  handleInput(data) {
+    if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
+      if (this.detail) {
+        this.detail = false;
+        this.scroll = 0;
+      } else
+        this.close();
+      return true;
+    }
+    if (this.detail) {
+      if (matchesKey(data, "up"))
+        this.scroll = Math.max(0, this.scroll - 1);
+      else if (matchesKey(data, "down"))
+        this.scroll++;
+      else if (matchesKey(data, "pageDown"))
+        this.scroll += 10;
+      else if (matchesKey(data, "pageUp"))
+        this.scroll = Math.max(0, this.scroll - 10);
+      else if (matchesKey(data, "enter")) {
+        this.detail = false;
+        this.scroll = 0;
+      }
+      return true;
+    }
+    const agents = this.matches();
+    if (matchesKey(data, "up"))
+      this.index = Math.max(0, this.index - 1);
+    else if (matchesKey(data, "down"))
+      this.index = Math.min(Math.max(0, agents.length - 1), this.index + 1);
+    else if (matchesKey(data, "enter"))
+      this.detail = agents.length > 0;
+    else {
+      this.search.handleInput(data);
+      this.index = 0;
+    }
+    return true;
+  }
+  render(width) {
+    const theme = this.theme;
+    const budget = Math.max(4, this.height() - 6);
+    const framed = width >= 24 && budget >= 7;
+    const inner = Math.max(1, width - (framed ? 4 : 0));
+    const agents = this.matches();
+    const agent = agents[this.index];
+    const title = this.detail && agent ? agent.name : "Agents";
+    const heading = theme.bold(truncateToWidth(clean(title), Math.max(1, width - 6)));
+    const top = theme.fg("borderMuted", "╭─ ") + heading + theme.fg("borderMuted", ` ${"─".repeat(Math.max(0, width - visibleWidth(heading) - 5))}╮`);
+    const body = [];
+    let selectedRow = 0;
+    if (this.detail && agent) {
+      const section = (label, value) => {
+        body.push("", theme.fg("muted", theme.bold(label)), ...wrapTextWithAnsi(clean(value), inner));
+      };
+      body.push(theme.fg("dim", `${sourceLabels[agent.source]} · ${agent.defaultContext ?? "fresh"} context`));
+      section("Description", agent.description || "No description provided.");
+      section("Model", agent.model ?? "Inherits the current model");
+      if (agent.fallbackModels?.length)
+        section("Fallbacks", agent.fallbackModels.join(" → "));
+      section("Tools", agent.tools ? agent.tools.join(", ") || "None" : "Inherited tools");
+      if (agent.skills?.length)
+        section("Skills", agent.skills.join(", "));
+      section("Definition", agent.filePath);
+      section("System prompt", agent.systemPrompt || "No additional system prompt.");
+    } else {
+      if (!agents.length)
+        body.push(theme.fg("muted", "No matching agents."), theme.fg("dim", "Try a name, role, or source."));
+      for (const source of sources) {
+        const group = agents.filter((agent) => agent.source === source);
+        if (!group.length)
+          continue;
+        body.push(theme.fg("muted", theme.bold(`${sourceLabels[source]} (${group.length})`)));
+        for (const item of group) {
+          const selected = item === agent;
+          if (selected)
+            selectedRow = body.length;
+          const name = `${selected ? "›" : " "} ${clean(item.name)}`;
+          body.push(selected ? theme.fg("accent", theme.bold(name)) : name);
+          if (selected)
+            body.push(theme.fg("muted", `  ${clean(item.description)}`));
+        }
+        body.push("");
+      }
+    }
+    const pinned = this.detail ? [] : this.search.render(inner);
+    const room = Math.max(1, budget - (framed ? 3 : 2) - pinned.length);
+    this.scroll = Math.min(this.scroll, Math.max(0, body.length - room));
+    const offset = this.detail ? this.scroll : Math.max(0, selectedRow - room + Math.min(2, room));
+    const rows = [...pinned, ...body.slice(offset, offset + room)].map((line) => {
+      const text = truncateToWidth(line, inner);
+      if (!framed)
+        return text;
+      return theme.fg("borderMuted", "│ ") + text + " ".repeat(Math.max(0, inner - visibleWidth(text))) + theme.fg("borderMuted", " │");
+    });
+    const hint = this.detail ? "↑↓ scroll · Enter / Esc back" : "Type to filter · ↑↓ select · Enter details · Esc close";
+    return [
+      framed ? top : heading,
+      ...rows,
+      ...framed ? [theme.fg("borderMuted", `╰${"─".repeat(Math.max(0, width - 2))}╯`)] : [],
+      theme.fg("dim", hint)
+    ].map((line) => truncateToWidth(line, width));
+  }
+}
+
 // dist/builtin/subagents/src/slash/slash-commands.ts
-function registerSlashCommands(_pi, _state) {}
+function registerSlashCommands(pi, _state) {
+  pi.registerCommand("agents", {
+    description: "Browse available subagents and inspect their configuration",
+    handler: async (args, ctx) => {
+      if (!ctx.hasUI) {
+        ctx.ui.notify("Use subagent action=list to list agents outside interactive mode.", "info");
+        return;
+      }
+      const { agents } = discoverAgents(ctx.cwd, "both");
+      await ctx.ui.custom((tui, theme, _keys, done) => {
+        const browser = new AgentBrowser(agents, theme, () => done(), () => tui.terminal.rows, args.trim());
+        return browser;
+      }, { purpose: "navigation" });
+    }
+  });
+}
 
 // dist/builtin/subagents/src/slash/slash-live-state.ts
 var defaultStoreOwner = {};
@@ -15607,16 +16211,16 @@ function clearSlashSnapshots(owner) {
 }
 
 // dist/builtin/subagents/src/tui/render-layout.ts
-import { visibleWidth } from "@earendil-works/pi-tui";
+import { visibleWidth as visibleWidth2 } from "@earendil-works/pi-tui";
 function getTermWidth() {
   return process.stdout.columns || 120;
 }
 var segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
 function truncLine(text, maxWidth) {
-  if (visibleWidth(text) <= maxWidth)
+  if (visibleWidth2(text) <= maxWidth)
     return text;
   const targetWidth = maxWidth - 1;
-  let result2 = "";
+  let result = "";
   let currentWidth = 0;
   let activeStyles = [];
   let i = 0;
@@ -15624,7 +16228,7 @@ function truncLine(text, maxWidth) {
     const ansiMatch = text.slice(i).match(/^\x1b\[[0-9;]*m/);
     if (ansiMatch) {
       const code = ansiMatch[0];
-      result2 += code;
+      result += code;
       if (code === "\x1B[0m" || code === "\x1B[m") {
         activeStyles = [];
       } else {
@@ -15640,16 +16244,16 @@ function truncLine(text, maxWidth) {
     const textPortion = text.slice(i, end);
     for (const seg of segmenter.segment(textPortion)) {
       const grapheme = seg.segment;
-      const graphemeWidth = visibleWidth(grapheme);
+      const graphemeWidth = visibleWidth2(grapheme);
       if (currentWidth + graphemeWidth > targetWidth) {
-        return `${result2 + activeStyles.join("")}…`;
+        return `${result + activeStyles.join("")}…`;
       }
-      result2 += grapheme;
+      result += grapheme;
       currentWidth += graphemeWidth;
     }
     i = end;
   }
-  return `${result2 + activeStyles.join("")}…`;
+  return `${result + activeStyles.join("")}…`;
 }
 var PULSE_FRAMES = ["·", "•", "●", "•"];
 function pulseGlyph(frame) {
@@ -15657,8 +16261,8 @@ function pulseGlyph(frame) {
   return PULSE_FRAMES[index % PULSE_FRAMES.length];
 }
 // dist/builtin/subagents/src/tui/render-result.ts
-import { getMarkdownTheme, keyHintIfBound as keyHintIfBound2 } from "@bastani/atomic";
-import { Container as Container2, Markdown, Spacer, Text as Text2 } from "@earendil-works/pi-tui";
+import { getMarkdownTheme, keyHintIfBound as keyHintIfBound3 } from "@bastani/atomic";
+import { Container as Container2, Markdown, Spacer, Text as Text3 } from "@earendil-works/pi-tui";
 
 // dist/builtin/subagents/src/tui/render-event-formatting.ts
 function modelThinkingBadge(theme, model, thinking) {
@@ -15694,13 +16298,13 @@ function formatAgentRunningLabel(count) {
 }
 
 // dist/builtin/subagents/src/tui/render-progress.ts
-function isDoneResult(result2) {
-  const status = result2.progress?.status;
+function isDoneResult(result) {
+  const status = result.progress?.status;
   if (status === "completed")
     return true;
   if (status === "running" || status === "pending")
     return false;
-  if (result2.interrupted || result2.detached || result2.status !== "ok")
+  if (result.interrupted || result.detached || result.status !== "ok")
     return false;
   return true;
 }
@@ -15714,20 +16318,20 @@ function buildMultiProgressLabel(details, hasRunning) {
         statuses[progress.index] = progress.status;
     }
     for (let i = 0;i < details.results.length; i++) {
-      const result2 = details.results[i];
-      const progressFromArray = details.progress?.find((progress) => progress.index === i) || details.progress?.find((progress) => progress.agent === result2.agent && progress.status === "running");
-      const index = result2.progress?.index ?? progressFromArray?.index ?? i;
+      const result = details.results[i];
+      const progressFromArray = details.progress?.find((progress) => progress.index === i) || details.progress?.find((progress) => progress.agent === result.agent && progress.status === "running");
+      const index = result.progress?.index ?? progressFromArray?.index ?? i;
       if (index < 0 || index >= totalCount)
         continue;
-      const status = result2.progress?.status ?? (result2.interrupted || result2.status === "interrupted" ? "interrupted" : result2.detached || result2.status === "continued" ? "detached" : result2.status === "ok" ? "completed" : "failed");
+      const status = result.progress?.status ?? (result.status === "killed" ? "killed" : result.interrupted || result.status === "interrupted" ? "interrupted" : result.detached || result.status === "continued" ? "detached" : result.status === "ok" ? "completed" : "failed");
       statuses[index] = status;
     }
     const running = statuses.filter((status) => status === "running").length;
-    const done2 = statuses.filter((status) => status === "completed").length;
-    const cancelled = details.results.filter((result2) => isParentCancellation(result2.cause) && (result2.interrupted || result2.status === "interrupted")).length;
-    const headerLabel2 = hasRunning ? `${formatAgentRunningLabel(running)} · ${done2}/${totalCount} done` : cancelled > 0 ? `${done2}/${totalCount} done · ${cancelled} cancelled` : `${done2}/${totalCount} done`;
+    const done = statuses.filter((status) => status === "completed").length;
+    const cancelled = details.results.filter((result) => isParentCancellation(result.cause) && (result.interrupted || result.status === "interrupted")).length;
+    const headerLabel = hasRunning ? `${formatAgentRunningLabel(running)} · ${done}/${totalCount} done` : cancelled > 0 ? `${done}/${totalCount} done · ${cancelled} cancelled` : `${done}/${totalCount} done`;
     return {
-      headerLabel: headerLabel2,
+      headerLabel,
       itemTitle,
       totalCount,
       groupStartIndex: 0,
@@ -15788,11 +16392,11 @@ function hasEmptyTextOutputWithoutOutputTarget(task, output) {
     return false;
   return !extractOutputTarget(task);
 }
-function getToolCallLines(result2, expanded) {
-  if (result2.messages) {
-    return getDisplayItems(result2.messages).filter((item) => item.type === "tool").map((item) => formatToolCall(item.name, item.args, expanded));
+function getToolCallLines(result, expanded) {
+  if (result.messages) {
+    return getDisplayItems(result.messages).filter((item) => item.type === "tool").map((item) => formatToolCall(item.name, item.args, expanded));
   }
-  return result2.toolCalls?.map((toolCall) => expanded ? toolCall.expandedText : toolCall.text) ?? [];
+  return result.toolCalls?.map((toolCall) => expanded ? toolCall.expandedText : toolCall.text) ?? [];
 }
 function snapshotNowForProgress(progress, now) {
   if (now !== undefined)
@@ -15857,33 +16461,35 @@ function firstOutputLine(text) {
   return text.split(`
 `).find((line) => line.trim())?.trim() ?? "";
 }
-function resultStatusLine(result2, output) {
-  if (result2.detached)
-    return result2.detachedReason ? `Detached: ${result2.detachedReason}` : "Detached";
-  if (result2.status === "continued")
+function resultStatusLine(result, output) {
+  if (result.detached)
+    return result.detachedReason ? `Detached: ${result.detachedReason}` : "Detached";
+  if (result.status === "continued")
     return "Continued";
-  if (isParentCancellation(result2.cause) && (result2.interrupted || result2.status === "interrupted"))
+  if (result.status === "killed")
+    return "Killed (non-resumable)";
+  if (isParentCancellation(result.cause) && (result.interrupted || result.status === "interrupted"))
     return "Cancelled";
-  if (result2.interrupted || result2.status === "interrupted")
+  if (result.interrupted || result.status === "interrupted")
     return "Interrupted";
-  if (result2.status === "skipped")
-    return result2.error ? `Skipped: ${result2.error}` : "Skipped";
-  if (result2.status === "error")
-    return `Error: ${result2.error ?? (firstOutputLine(output) || "failed")}`;
-  if (hasEmptyTextOutputWithoutOutputTarget(result2.task, output))
+  if (result.status === "skipped")
+    return result.error ? `Skipped: ${result.error}` : "Skipped";
+  if (result.status === "error")
+    return `Error: ${result.error ?? (firstOutputLine(output) || "failed")}`;
+  if (hasEmptyTextOutputWithoutOutputTarget(result.task, output))
     return "Done (no text output)";
   return "Done";
 }
-function resultGlyph(result2, output, theme, running = result2.progress?.status === "running", pulseFrame) {
+function resultGlyph(result, output, theme, running = result.progress?.status === "running", pulseFrame) {
   if (running)
     return theme.fg("accent", pulseGlyph(pulseFrame));
-  if (result2.detached || result2.status === "continued")
+  if (result.detached || result.status === "continued")
     return theme.fg("warning", "■");
-  if (result2.interrupted || result2.status === "interrupted" || result2.status === "skipped")
+  if (result.status === "killed" || result.interrupted || result.status === "interrupted" || result.status === "skipped")
     return theme.fg("warning", "■");
-  if (result2.status === "error")
+  if (result.status === "error")
     return theme.fg("error", "✗");
-  if (hasEmptyTextOutputWithoutOutputTarget(result2.task, output))
+  if (hasEmptyTextOutputWithoutOutputTarget(result.task, output))
     return theme.fg("warning", "✓");
   return theme.fg("success", "✓");
 }
@@ -15936,6 +16542,7 @@ function renderSingleCompact(d, r, theme, now, pulseFrame) {
 function renderMultiCompact(d, theme, now, pulseFrame) {
   const hasRunning = d.progress?.some((p) => p.status === "running") || d.results.some((r) => r.progress?.status === "running");
   const failed = d.results.some((r) => r.status === "error" && r.progress?.status !== "running");
+  const hasKilled = d.results.some((r) => r.status === "killed" && r.progress?.status !== "running");
   const interruptedOrDetached = d.results.some((r) => (r.interrupted || r.detached || r.status === "interrupted" || r.status === "continued" || r.status === "skipped") && r.progress?.status !== "running");
   let totalSummary = d.progressSummary;
   if (!totalSummary) {
@@ -15955,8 +16562,12 @@ function renderMultiCompact(d, theme, now, pulseFrame) {
   }
   const multiLabel = buildMultiProgressLabel(d, hasRunning);
   const itemTitle = multiLabel.itemTitle;
-  const stats = statJoin(theme, [multiLabel.headerLabel, formatProgressStats(theme, totalSummary, true, now)]);
-  const glyph = hasRunning ? theme.fg("accent", pulseGlyph(pulseFrame)) : failed ? theme.fg("error", "✗") : interruptedOrDetached ? theme.fg("warning", "■") : theme.fg("success", "✓");
+  const stats = statJoin(theme, [
+    multiLabel.headerLabel,
+    !hasRunning && hasKilled ? theme.fg("warning", "killed (non-resumable)") : "",
+    formatProgressStats(theme, totalSummary, true, now)
+  ]);
+  const glyph = hasRunning ? theme.fg("accent", pulseGlyph(pulseFrame)) : failed ? theme.fg("error", "✗") : hasKilled || interruptedOrDetached ? theme.fg("warning", "■") : theme.fg("success", "✓");
   const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
   const c = new Container;
   const width = getTermWidth() - 4;
@@ -16011,10 +16622,10 @@ function renderMultiCompact(d, theme, now, pulseFrame) {
     const stepNumber = r.progress?.index !== undefined ? r.progress.index + 1 : progressFromArray?.index !== undefined ? progressFromArray.index + 1 : i + 1;
     const stepStats = formatProgressStats(theme, rProg, true, now);
     const modelDisplay = modelThinkingBadge(theme, r.model ?? rProg?.model, r.thinking ?? rProg?.thinking);
-    const glyph2 = rPending ? theme.fg("dim", "◦") : resultGlyph(r, output, theme, rRunning, pulseFrame);
+    const glyph = rPending ? theme.fg("dim", "◦") : resultGlyph(r, output, theme, rRunning, pulseFrame);
     const pendingLabel = rPending ? ` ${theme.fg("dim", "· pending")}` : "";
     const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
-    const line = `${glyph2} ${stepLabel}: ${themeBold(theme, agentName)}${modelDisplay}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
+    const line = `${glyph} ${stepLabel}: ${themeBold(theme, agentName)}${modelDisplay}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
     c.addChild(new Text(truncLine(`  ${line}`, width), 0, 0));
     if (rRunning && rProg && "status" in rProg) {
       const activity = compactCurrentActivity(rProg, now);
@@ -16061,10 +16672,10 @@ function progressRenderKey(progress) {
     progress.currentPath ?? ""
   ].join(":");
 }
-function subagentResultRenderKey(result2, options) {
-  const details = result2.details;
+function subagentResultRenderKey(result, options) {
+  const details = result.details;
   if (!details)
-    return `${options.isPartial ? "partial" : "final"}:${result2.content.length}`;
+    return `${options.isPartial ? "partial" : "final"}:${result.content.length}`;
   const progressKeys = [
     ...(details.progress ?? []).map(progressRenderKey),
     ...details.results.map((entry) => [
@@ -16088,22 +16699,90 @@ function subagentResultRenderKey(result2, options) {
   ].join("|");
 }
 
+// dist/builtin/subagents/src/tui/render-status.ts
+import { keyHintIfBound as keyHintIfBound2 } from "@bastani/atomic";
+import { stripTerminalSequences, Text as Text2, truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth3 } from "@earendil-works/pi-tui";
+var COMPACT_CHILD_LIMIT = 6;
+var statusStyles = {
+  pending: { glyph: "○", label: "Pending", color: "dim" },
+  running: { glyph: "∀", label: "Running", color: "accent" },
+  ok: { glyph: "✓", label: "Completed", color: "success" },
+  error: { glyph: "✗", label: "Failed", color: "error" },
+  interrupted: { glyph: "■", label: "Interrupted", color: "warning" },
+  killed: { glyph: "■", label: "Killed (non-resumable)", color: "warning" },
+  continued: { glyph: "■", label: "Continued", color: "warning" }
+};
+var displayText = (value) => stripTerminalSequences(value).replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
+function childStatusLines(child, expanded, theme, width) {
+  const style = statusStyles[child.status];
+  const name = displayText(child.path.split("/").at(-1) || child.taskName);
+  const label = expanded ? name : displayText(truncateToWidth2(name, Math.max(1, width - visibleWidth3(style.label) - 5), "…"));
+  const heading = `${theme.fg(style.color, style.glyph)} ${theme.fg("toolTitle", theme.bold(label))}${theme.fg("dim", " · ")}${theme.fg(style.color, style.label)}`;
+  const model = formatModelThinking(child.model, child.thinking);
+  const metadata = model ? [theme.fg("dim", `  ${displayText(model)}`)] : [];
+  if (!expanded)
+    return [heading, ...metadata];
+  return [
+    heading,
+    ...metadata,
+    theme.fg("dim", `  Path: ${displayText(child.path)}`),
+    theme.fg("dim", `  Parent: ${displayText(child.parentPath)} · Depth: ${child.depth}`),
+    theme.fg("dim", `  Task: ${displayText(child.taskName)}`),
+    theme.fg("dim", `  Residency: ${child.loaded ? "loaded" : "cold"}`),
+    ...child.cause ? [theme.fg("muted", `  Cause: ${displayText(child.cause)}`)] : [],
+    ...child.sessionFile ? [theme.fg("dim", `  Session: ${displayText(child.sessionFile)}`)] : []
+  ];
+}
+function statusLines(groups, expanded, theme, width) {
+  const total = groups.reduce((sum, group) => sum + group.children.length, 0);
+  const lines = total > 1 ? [theme.fg("muted", `${total} agents`)] : [];
+  let shown = 0;
+  for (const group of groups) {
+    const children = expanded ? group.children : group.children.slice(0, COMPACT_CHILD_LIMIT - shown);
+    if (!children.length && !expanded)
+      continue;
+    if (groups.length > 1 || !children.length)
+      lines.push(theme.fg("dim", `Run ${displayText(group.parentPath)}`));
+    lines.push(...children.length ? children.flatMap((child) => childStatusLines(child, expanded, theme, width)) : [theme.fg("muted", "  No subagents")]);
+    shown += children.length;
+  }
+  if (!lines.length)
+    lines.push(theme.fg("muted", "No subagents"));
+  if (shown < total)
+    lines.push(theme.fg("muted", `… ${total - shown} more agents`));
+  const hint = !expanded && keyHintIfBound2("app.tools.expand", "to expand");
+  if (hint)
+    lines.push(theme.fg("dim", hint));
+  return lines;
+}
+function renderSubagentStatus(groups, expanded, theme) {
+  return {
+    invalidate() {},
+    render(width) {
+      if (width <= 0)
+        return [];
+      return new Text2(statusLines(groups, expanded, theme, width).join(`
+`), 0, 0).render(width);
+    }
+  };
+}
+
 // dist/builtin/subagents/src/tui/render-result.ts
-function parentAskOutput(result2) {
-  if (!result2.details?.parentAskYielded)
+function parentAskOutput(result) {
+  if (!result.details?.parentAskYielded)
     return;
-  return result2.content.find((part) => part.type === "text")?.text;
+  return result.content.find((part) => part.type === "text")?.text;
 }
 function appendParentAskOutput(component, output, theme) {
   if (!output)
     return component;
   const container = new Container2;
   container.addChild(component);
-  container.addChild(new Text2(theme.fg("accent", output), 0, 0));
+  container.addChild(new Text3(theme.fg("accent", output), 0, 0));
   return container;
 }
-function renderLiveSubagentResult(result2, options, theme, context) {
-  const nextKey = subagentResultRenderKey(result2, options);
+function renderLiveSubagentResult(result, options, theme, context) {
+  const nextKey = subagentResultRenderKey(result, options);
   if (context.state.subagentResultSnapshotKey !== nextKey) {
     context.state.subagentResultSnapshotKey = nextKey;
     context.state.subagentResultSnapshotNow = Date.now();
@@ -16112,110 +16791,113 @@ function renderLiveSubagentResult(result2, options, theme, context) {
   context.state.subagentResultSnapshotNow ??= Date.now();
   context.state.subagentResultPulseFrame ??= 0;
   clearResultAnimationTimer(context);
-  return renderSubagentResult(result2, {
+  return renderSubagentResult(result, {
     ...options,
     now: context.state.subagentResultSnapshotNow,
     pulseFrame: context.state.subagentResultPulseFrame
   }, theme);
 }
-function renderSubagentResult(result2, options, theme) {
-  const d = result2.details;
+function renderSubagentResult(result, options, theme) {
+  const d = result.details;
+  if (d?.statusGroups)
+    return renderSubagentStatus(d.statusGroups, options.expanded, theme);
   const liveMultiProgress = d?.mode === "parallel" && (d?.progress?.length ?? 0) > 0;
   if (!d?.results.length && !liveMultiProgress) {
-    const t = result2.content[0];
+    const t = result.content[0];
     const text = t?.type === "text" ? t.text : "(no output)";
     const contextPrefix = d?.context === "fork" ? `${theme.fg("warning", "[fork]")} ` : "";
-    return new Text2(truncLine(`${contextPrefix}${text}`, getTermWidth() - 4), 0, 0);
+    return new Text3(truncLine(`${contextPrefix}${text}`, getTermWidth() - 4), 0, 0);
   }
   const expanded = options.expanded;
   const mdTheme = getMarkdownTheme();
-  const handoffOutput = parentAskOutput(result2);
+  const handoffOutput = parentAskOutput(result);
   if (d.mode === "single" && d.results.length === 1) {
     const r = d.results[0];
     if (!expanded)
       return appendParentAskOutput(renderSingleCompact(d, r, theme, options.now, options.pulseFrame), handoffOutput, theme);
     const isRunning = r.progress?.status === "running";
-    const icon2 = isRunning ? theme.fg("warning", "running") : d.parentAskYielded ? theme.fg("warning", "yielded") : r.detached || r.status === "continued" ? theme.fg("warning", "detached") : isParentCancellation(r.cause) && (r.interrupted || r.status === "interrupted") ? theme.fg("warning", "cancelled") : r.status === "ok" ? theme.fg("success", "ok") : theme.fg("error", "failed");
-    const contextBadge2 = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
+    const icon = isRunning ? theme.fg("warning", "running") : d.parentAskYielded ? theme.fg("warning", "yielded") : r.detached || r.status === "continued" ? theme.fg("warning", "detached") : r.status === "killed" ? theme.fg("warning", "killed (non-resumable)") : isParentCancellation(r.cause) && (r.interrupted || r.status === "interrupted") ? theme.fg("warning", "cancelled") : r.status === "ok" ? theme.fg("success", "ok") : theme.fg("error", "failed");
+    const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
     const output = r.truncation?.text || getSingleResultOutput(r);
     const progressInfo = isRunning && r.progress ? ` | ${r.progress.toolCount} tools, ${formatTokens(r.progress.tokens)} tok, ${formatDuration(displayProgressDurationMs(r.progress, options.now))}` : r.progressSummary ? ` | ${r.progressSummary.toolCount} tools, ${formatTokens(r.progressSummary.tokens)} tok, ${formatDuration(r.progressSummary.durationMs)}` : "";
-    const w2 = getTermWidth() - 4;
-    const fit2 = (text) => expanded ? text : truncLine(text, w2);
+    const w = getTermWidth() - 4;
+    const fit = (text) => expanded ? text : truncLine(text, w);
     const modelDisplay = modelThinkingBadge(theme, r.model, r.thinking);
     const toolCallLines = getToolCallLines(r, expanded);
-    const c2 = new Container2;
-    c2.addChild(new Text2(fit2(`${icon2} ${theme.fg("toolTitle", theme.bold(r.agent))}${modelDisplay}${contextBadge2}${progressInfo}`), 0, 0));
-    c2.addChild(new Spacer(1));
-    const taskMaxLen = Math.max(20, w2 - 8);
+    const c = new Container2;
+    c.addChild(new Text3(fit(`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${modelDisplay}${contextBadge}${progressInfo}`), 0, 0));
+    c.addChild(new Spacer(1));
+    const taskMaxLen = Math.max(20, w - 8);
     const taskPreview = expanded || r.task.length <= taskMaxLen ? r.task : `${r.task.slice(0, taskMaxLen)}...`;
-    c2.addChild(new Text2(fit2(theme.fg("dim", `Task: ${taskPreview}`)), 0, 0));
-    c2.addChild(new Spacer(1));
+    c.addChild(new Text3(fit(theme.fg("dim", `Task: ${taskPreview}`)), 0, 0));
+    c.addChild(new Spacer(1));
     if (isRunning && r.progress) {
       const progressSnapshotNow = snapshotNowForProgress(r.progress, options.now);
-      const toolLine = formatCurrentToolLine(r.progress, w2, expanded, progressSnapshotNow);
+      const toolLine = formatCurrentToolLine(r.progress, w, expanded, progressSnapshotNow);
       if (toolLine) {
-        c2.addChild(new Text2(fit2(theme.fg("warning", `> ${toolLine}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("warning", `> ${toolLine}`)), 0, 0));
       }
       const liveStatusLine = buildLiveStatusLine(r.progress, progressSnapshotNow);
       if (liveStatusLine) {
-        c2.addChild(new Text2(fit2(theme.fg("accent", liveStatusLine)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("accent", liveStatusLine)), 0, 0));
       }
-      const expandHint = keyHintIfBound2("app.tools.expand", "for live detail");
+      const expandHint = keyHintIfBound3("app.tools.expand", "for live detail");
       if (expandHint)
-        c2.addChild(new Text2(fit2(theme.fg("accent", `Press ${expandHint}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("accent", `Press ${expandHint}`)), 0, 0));
       if (r.artifactPaths) {
-        c2.addChild(new Text2(fit2(theme.fg("dim", `Artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("dim", `Artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
       }
       if (r.progress.recentTools?.length) {
         for (const t of r.progress.recentTools.slice(-3)) {
-          const maxArgsLen = Math.max(40, w2 - 24);
+          const maxArgsLen = Math.max(40, w - 24);
           const argsPreview = expanded || t.args.length <= maxArgsLen ? t.args : `${t.args.slice(0, maxArgsLen)}...`;
-          c2.addChild(new Text2(fit2(theme.fg("dim", `${t.tool}: ${argsPreview}`)), 0, 0));
+          c.addChild(new Text3(fit(theme.fg("dim", `${t.tool}: ${argsPreview}`)), 0, 0));
         }
       }
       for (const line of (r.progress.recentOutput ?? []).slice(-5)) {
-        c2.addChild(new Text2(fit2(theme.fg("dim", `  ${line}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("dim", `  ${line}`)), 0, 0));
       }
       if (toolLine || liveStatusLine || r.progress.recentTools?.length || r.progress.recentOutput?.length || r.artifactPaths) {
-        c2.addChild(new Spacer(1));
+        c.addChild(new Spacer(1));
       }
     }
     if (expanded) {
       for (const line of toolCallLines) {
-        c2.addChild(new Text2(fit2(theme.fg("muted", line)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("muted", line)), 0, 0));
       }
       if (toolCallLines.length)
-        c2.addChild(new Spacer(1));
+        c.addChild(new Spacer(1));
     }
     if (output)
-      c2.addChild(new Markdown(output, 0, 0, mdTheme));
-    c2.addChild(new Spacer(1));
+      c.addChild(new Markdown(output, 0, 0, mdTheme));
+    c.addChild(new Spacer(1));
     if (r.skills?.length) {
-      c2.addChild(new Text2(fit2(theme.fg("dim", `Skills: ${r.skills.join(", ")}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `Skills: ${r.skills.join(", ")}`)), 0, 0));
     }
     if (r.skillsWarning) {
-      c2.addChild(new Text2(fit2(theme.fg("warning", `Warning: ${r.skillsWarning}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("warning", `Warning: ${r.skillsWarning}`)), 0, 0));
     }
     if (r.attemptedModels && r.attemptedModels.length > 1) {
-      c2.addChild(new Text2(fit2(theme.fg("dim", `Fallbacks: ${r.attemptedModels.join(" → ")}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `Fallbacks: ${r.attemptedModels.join(" → ")}`)), 0, 0));
     }
-    c2.addChild(new Text2(fit2(theme.fg("dim", formatUsage(r.usage))), 0, 0));
+    c.addChild(new Text3(fit(theme.fg("dim", formatUsage(r.usage))), 0, 0));
     if (r.sessionFile) {
-      c2.addChild(new Text2(fit2(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`)), 0, 0));
     }
     if (!isRunning && r.artifactPaths) {
-      c2.addChild(new Spacer(1));
-      c2.addChild(new Text2(fit2(theme.fg("dim", `Artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
+      c.addChild(new Spacer(1));
+      c.addChild(new Text3(fit(theme.fg("dim", `Artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
     }
-    return appendParentAskOutput(c2, handoffOutput, theme);
+    return appendParentAskOutput(c, handoffOutput, theme);
   }
   if (!expanded)
     return appendParentAskOutput(renderMultiCompact(d, theme, options.now, options.pulseFrame), handoffOutput, theme);
   const hasRunning = d.progress?.some((p) => p.status === "running") || d.results.some((r) => r.progress?.status === "running");
   const ok = d.results.filter((r) => r.progress?.status === "completed" || r.status === "ok" && r.progress?.status !== "running").length;
   const hasEmptyWithoutTarget = d.results.some((r) => r.status === "ok" && r.progress?.status !== "running" && hasEmptyTextOutputWithoutOutputTarget(r.task, getSingleResultOutput(r)));
-  const hasCancelled = d.results.some((result3) => isParentCancellation(result3.cause) && (result3.interrupted || result3.status === "interrupted"));
-  const icon = hasRunning ? theme.fg("warning", "running") : d.parentAskYielded ? theme.fg("warning", "yielded") : hasEmptyWithoutTarget ? theme.fg("warning", "warning") : ok === d.results.length ? theme.fg("success", "ok") : d.results.some((result3) => result3.status === "error") ? theme.fg("error", "failed") : hasCancelled ? theme.fg("warning", "cancelled") : theme.fg("error", "failed");
+  const hasCancelled = d.results.some((result) => isParentCancellation(result.cause) && (result.interrupted || result.status === "interrupted"));
+  const hasKilled = d.results.some((result) => result.status === "killed");
+  const icon = hasRunning ? theme.fg("warning", "running") : d.parentAskYielded ? theme.fg("warning", "yielded") : hasKilled && !hasCancelled && !d.results.some((result) => result.status === "error") ? theme.fg("warning", "killed (non-resumable)") : hasEmptyWithoutTarget ? theme.fg("warning", "warning") : ok === d.results.length ? theme.fg("success", "ok") : d.results.some((result) => result.status === "error") ? theme.fg("error", "failed") : hasCancelled ? theme.fg("warning", "cancelled") : theme.fg("error", "failed");
   const totalSummary = d.progressSummary || d.results.reduce((acc, r) => {
     const prog = r.progress || r.progressSummary;
     if (prog) {
@@ -16232,7 +16914,7 @@ function renderSubagentResult(result2, options, theme) {
   const w = getTermWidth() - 4;
   const fit = (text) => expanded ? text : truncLine(text, w);
   const c = new Container2;
-  c.addChild(new Text2(fit(`${icon} ${theme.fg("toolTitle", theme.bold(modeLabel))}${contextBadge} · ${multiLabel.headerLabel}${summaryStr}`), 0, 0));
+  c.addChild(new Text3(fit(`${icon} ${theme.fg("toolTitle", theme.bold(modeLabel))}${contextBadge} · ${multiLabel.headerLabel}${summaryStr}`), 0, 0));
   const progressSpan = d.progress?.length ? Math.max(...d.progress.map((p) => p.index + 1)) : 0;
   const resultsSpan = Math.max(d.results.length, progressSpan, d.mode === "parallel" ? d.totalSteps ?? 0 : 0);
   const displayStart = multiLabel.showActiveGroupOnly ? multiLabel.groupStartIndex : 0;
@@ -16260,20 +16942,20 @@ function renderSubagentResult(result2, options, theme) {
       if (runningProg) {
         const runningStats = ` | ${runningProg.toolCount} tools, ${formatDuration(displayProgressDurationMs(runningProg, options.now))}`;
         const runningBadge = modelThinkingBadge(theme, runningProg.model, runningProg.thinking);
-        c.addChild(new Text2(fit(`${theme.fg("warning", "running")} ${rowLabel}: ${theme.bold(theme.fg("warning", agentName))}${runningBadge}${runningStats}`), 0, 0));
+        c.addChild(new Text3(fit(`${theme.fg("warning", "running")} ${rowLabel}: ${theme.bold(theme.fg("warning", agentName))}${runningBadge}${runningStats}`), 0, 0));
         const progressSnapshotNow = snapshotNowForProgress(runningProg, options.now);
         const liveStatusLine = buildLiveStatusLine(runningProg, progressSnapshotNow);
         if (liveStatusLine) {
-          c.addChild(new Text2(fit(theme.fg("accent", `    ${liveStatusLine}`)), 0, 0));
+          c.addChild(new Text3(fit(theme.fg("accent", `    ${liveStatusLine}`)), 0, 0));
         }
-        const expandHint = keyHintIfBound2("app.tools.expand", "for live detail");
+        const expandHint = keyHintIfBound3("app.tools.expand", "for live detail");
         if (expandHint)
-          c.addChild(new Text2(fit(theme.fg("accent", `    Press ${expandHint}`)), 0, 0));
+          c.addChild(new Text3(fit(theme.fg("accent", `    Press ${expandHint}`)), 0, 0));
         c.addChild(new Spacer(1));
         continue;
       }
-      c.addChild(new Text2(fit(theme.fg("dim", `  ${rowLabel}: ${agentName}`)), 0, 0));
-      c.addChild(new Text2(theme.fg("dim", `    status: pending`), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `  ${rowLabel}: ${agentName}`)), 0, 0));
+      c.addChild(new Text3(theme.fg("dim", `    status: pending`), 0, 0));
       c.addChild(new Spacer(1));
       continue;
     }
@@ -16282,66 +16964,66 @@ function renderSubagentResult(result2, options, theme) {
     const rRunning = rProg?.status === "running";
     const stepNumber = typeof rProg?.index === "number" ? rProg.index + 1 : i + 1;
     const resultOutput = getSingleResultOutput(r);
-    const statusIcon = rRunning ? theme.fg("warning", "running") : r.status === "error" ? theme.fg("error", "failed") : isParentCancellation(r.cause) && (r.interrupted || r.status === "interrupted") ? theme.fg("warning", "cancelled") : r.status === "skipped" || r.status === "interrupted" || r.status === "continued" ? theme.fg("warning", r.status) : hasEmptyTextOutputWithoutOutputTarget(r.task, resultOutput) ? theme.fg("warning", "warning") : theme.fg("success", "done");
+    const statusIcon = rRunning ? theme.fg("warning", "running") : r.status === "error" ? theme.fg("error", "failed") : isParentCancellation(r.cause) && (r.interrupted || r.status === "interrupted") ? theme.fg("warning", "cancelled") : r.status === "killed" || r.status === "skipped" || r.status === "interrupted" || r.status === "continued" ? theme.fg("warning", r.status) : hasEmptyTextOutputWithoutOutputTarget(r.task, resultOutput) ? theme.fg("warning", "warning") : theme.fg("success", "done");
     const stats = rProg ? ` | ${rProg.toolCount} tools, ${formatDuration(displayProgressDurationMs(rProg, options.now))}` : "";
     const modelDisplay = modelThinkingBadge(theme, r.model ?? rProg?.model, r.thinking ?? rProg?.thinking);
     const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
     const stepHeader = rRunning ? `${statusIcon} ${stepLabel}: ${theme.bold(theme.fg("warning", r.agent))}${modelDisplay}${stats}` : `${statusIcon} ${stepLabel}: ${theme.bold(r.agent)}${modelDisplay}${stats}`;
     const toolCallLines = getToolCallLines(r, expanded);
-    c.addChild(new Text2(fit(stepHeader), 0, 0));
+    c.addChild(new Text3(fit(stepHeader), 0, 0));
     const taskMaxLen = Math.max(20, w - 12);
     const taskPreview = expanded || r.task.length <= taskMaxLen ? r.task : `${r.task.slice(0, taskMaxLen)}...`;
-    c.addChild(new Text2(fit(theme.fg("dim", `    task: ${taskPreview}`)), 0, 0));
+    c.addChild(new Text3(fit(theme.fg("dim", `    task: ${taskPreview}`)), 0, 0));
     const outputTarget = extractOutputTarget(r.task);
     if (outputTarget) {
-      c.addChild(new Text2(fit(theme.fg("dim", `    output: ${outputTarget}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `    output: ${outputTarget}`)), 0, 0));
     }
     if (r.skills?.length) {
-      c.addChild(new Text2(fit(theme.fg("dim", `    skills: ${r.skills.join(", ")}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `    skills: ${r.skills.join(", ")}`)), 0, 0));
     }
     if (r.skillsWarning) {
-      c.addChild(new Text2(fit(theme.fg("warning", `    Warning: ${r.skillsWarning}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("warning", `    Warning: ${r.skillsWarning}`)), 0, 0));
     }
     if (r.attemptedModels && r.attemptedModels.length > 1) {
-      c.addChild(new Text2(fit(theme.fg("dim", `    fallbacks: ${r.attemptedModels.join(" → ")}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `    fallbacks: ${r.attemptedModels.join(" → ")}`)), 0, 0));
     }
     if (rRunning && rProg) {
       if (rProg.skills?.length) {
-        c.addChild(new Text2(fit(theme.fg("accent", `    skills: ${rProg.skills.join(", ")}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("accent", `    skills: ${rProg.skills.join(", ")}`)), 0, 0));
       }
       const progressSnapshotNow = snapshotNowForProgress(rProg, options.now);
       const toolLine = formatCurrentToolLine(rProg, w, expanded, progressSnapshotNow);
       if (toolLine) {
-        c.addChild(new Text2(fit(theme.fg("warning", `    > ${toolLine}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("warning", `    > ${toolLine}`)), 0, 0));
       }
       const liveStatusLine = buildLiveStatusLine(rProg, progressSnapshotNow);
       if (liveStatusLine) {
-        c.addChild(new Text2(fit(theme.fg("accent", `    ${liveStatusLine}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("accent", `    ${liveStatusLine}`)), 0, 0));
       }
-      const expandHint = keyHintIfBound2("app.tools.expand", "for live detail");
+      const expandHint = keyHintIfBound3("app.tools.expand", "for live detail");
       if (expandHint)
-        c.addChild(new Text2(fit(theme.fg("accent", `    Press ${expandHint}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("accent", `    Press ${expandHint}`)), 0, 0));
       if (r.artifactPaths) {
-        c.addChild(new Text2(fit(theme.fg("dim", `    artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("dim", `    artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
       }
       if (rProg.recentTools?.length) {
         for (const t of rProg.recentTools.slice(-3)) {
           const maxArgsLen = Math.max(40, w - 30);
           const argsPreview = expanded || t.args.length <= maxArgsLen ? t.args : `${t.args.slice(0, maxArgsLen)}...`;
-          c.addChild(new Text2(fit(theme.fg("dim", `      ${t.tool}: ${argsPreview}`)), 0, 0));
+          c.addChild(new Text3(fit(theme.fg("dim", `      ${t.tool}: ${argsPreview}`)), 0, 0));
         }
       }
       const recentLines = (rProg.recentOutput ?? []).slice(-5);
       for (const line of recentLines) {
-        c.addChild(new Text2(fit(theme.fg("dim", `      ${line}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("dim", `      ${line}`)), 0, 0));
       }
     }
     if (!rRunning && r.artifactPaths) {
-      c.addChild(new Text2(fit(theme.fg("dim", `    artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
+      c.addChild(new Text3(fit(theme.fg("dim", `    artifacts: ${shortenPath(r.artifactPaths.outputPath)}`)), 0, 0));
     }
     if (expanded && !rRunning) {
       for (const line of toolCallLines) {
-        c.addChild(new Text2(fit(theme.fg("muted", `      ${line}`)), 0, 0));
+        c.addChild(new Text3(fit(theme.fg("muted", `      ${line}`)), 0, 0));
       }
       if (toolCallLines.length)
         c.addChild(new Spacer(1));
@@ -16350,7 +17032,7 @@ function renderSubagentResult(result2, options, theme) {
   }
   if (d.artifacts) {
     c.addChild(new Spacer(1));
-    c.addChild(new Text2(fit(theme.fg("dim", `Artifacts dir: ${shortenPath(d.artifacts.dir)}`)), 0, 0));
+    c.addChild(new Text3(fit(theme.fg("dim", `Artifacts dir: ${shortenPath(d.artifacts.dir)}`)), 0, 0));
   }
   return appendParentAskOutput(c, handoffOutput, theme);
 }
@@ -16371,7 +17053,7 @@ function loadConfig() {
 }
 
 // dist/builtin/subagents/src/extension/notification-content.ts
-var HEADER_STATUSES = ["completed", "failed", "interrupted"];
+var HEADER_STATUSES = ["completed", "failed", "interrupted", "killed"];
 function isHeaderLineTerminator(character) {
   return character === "\r" || character === "\u2028" || character === "\u2029";
 }
@@ -16463,11 +17145,13 @@ function parseSubagentNotifyContent(content) {
 var DEFAULT_PROMPT_GUIDANCE = [
   `**Subagent orchestration**: Use subagents for focused specialist work inside workflows or as bounded delegation when a workflow would be unnecessary overhead.
   - Unless the user explicitly chooses inline execution for the specified task, workflows are the default for non-trivial structured work with verifiable objectives; use a workflow for implementation, review, or retry pipelines and let its stages delegate specialists.
-  - Explicit requests such as "inline", "do this directly", or "don't use a workflow", and equivalent wording, override that default even for complex tasks. Do not create or launch a hidden/nested workflow or pressure the user to reapprove the choice. Preserve appropriate testing, review and evidence inline, and unrelated safety and authorization constraints. Apply the preference only to the specified task. Quoted examples and questions about inline code are not execution-mode instructions.
+  - Explicit requests such as "quickly", "inline", "do this directly", or "don't use a workflow", and equivalent wording, override that default even for complex tasks. Treat "quickly" as an inline execution choice, not a request for a faster workflow. Do not create or launch a hidden/nested workflow or pressure the user to reapprove the choice. Preserve appropriate testing, review and evidence inline, and unrelated safety and authorization constraints. Apply the preference only to the specified task. Quoted examples and questions about inline code are not execution-mode instructions; neither are descriptions of software that should run quickly.
   - On a switch from an active workflow to inline, notify the controlling session to safely hold/stop the affected run, reconcile completed work and in-flight side effects, then continue inline without duplicate execution. Do not claim completed work was undone.
   - Use a single subagent for a focused specialty or parallel tasks for independent work. Keep substantial-overlap tasks together rather than duplicating investigation across agents.
-  - Delegate noisy or context-heavy command investigation when isolation helps, but run concise commands inline when that is simpler.
-  - Foreground execution is the only subagent execution mode; do not duplicate a delegated job while waiting. Workflow stages may still run their own durable work in the background.
+  - Keep immediately blocking work local unless specialist expertise, context isolation, or an explicit user request justifies delegation. Delegate independent work that can usefully overlap your own next steps; do not spawn a child merely to wait immediately. Delegate noisy or context-heavy command investigation when isolation helps, but run concise commands inline when that is simpler.
+  - Background subagents are supported in owner-bound sessions: omitted wait or wait:{kind:"background"} yields after admission while the child continues. Use wait:{kind:"foreground",budgetMs:30000} for foreground-first observation. A yielded observation never means the task stopped. Do not duplicate delegated work; observe the existing task or await its completion notice. The UI shows compact status below the prompt, and /tasks opens inspection only when invoked.
+  - Choose foreground-first or background observation for each authorized call based on whether the next action needs the result; do not ask the user merely to select a mode. Foreground observation automatically yields on budget expiry while the same task continues. Wait for terminal completion before starting dependent work. Execution mode does not bypass tool permissions, delegation boundaries, or owner lifetime.
+  - Continue useful independent work after spawning without duplicating the child's task. Wait when its result becomes a dependency; otherwise rely on completion notices. Avoid repeated short waits or status polls. Omit the wait budget to use owner policy unless a concrete responsiveness need calls for an override.
   - Use the debugger subagent for actual failures that need reproduction, root-cause diagnosis, and a validated fix; additional debugger or research delegates are optional when they add a distinct useful angle.
   - Let each named agent use its declared model and fallback policy: omit the explicit model argument unless the user requests an exact model or a documented task requirement needs one, and record the reason for any override before launch. Do not choose an ad hoc model merely for diversity.
   - If an agent has no declared model or fallback policy, consult packages/coding-agent/docs/models/model-selection.md for the role's Pareto-efficient recommendations and packages/coding-agent/docs/models/evals.md for the measured per-evaluation scores by task type, then use workflow({ action: "models" }) when available to inspect the configured catalog. Pin only a returned fullId and only append a thinking level listed for that entry. If the catalog tool is unavailable, the catalog is empty, or no recommended model is present, leave the child unpinned and state the limitation rather than inventing a model. Do not inspect credentials or infer why a model is absent.
@@ -16546,15 +17230,23 @@ var ControlOverrides = Type.Object({
   }))
 });
 var SubagentParams = Type.Object({
+  wait: Type.Optional(Type.Object({
+    kind: Type.String({
+      enum: ["background", "foreground"],
+      description: "Wait policy kind. 'background' yields immediately; 'foreground' waits up to budgetMs."
+    }),
+    budgetMs: Type.Optional(Type.Number({ description: "Foreground wait budget in milliseconds (kind='foreground' only)." }))
+  }, { additionalProperties: false })),
+  budgetMs: Type.Optional(Type.Number({ description: "Foreground wait budget in milliseconds." })),
   agent: Type.Optional(Type.String({ description: "Agent name (SINGLE mode) or target for management get/update/delete" })),
   task: Type.Optional(Type.String({ description: "Task (SINGLE mode, optional for self-contained agents)" })),
   action: Type.Optional(Type.String({
     enum: [...SUBAGENT_ACTIONS],
     description: "Management/control action. Omit for execution mode."
   })),
-  id: Type.Optional(Type.String({ description: "Run id or prefix for action='status' or action='interrupt'." })),
+  id: Type.Optional(Type.String({ description: "Run id or prefix for action='status' or action='kill'." })),
   runId: Type.Optional(Type.String({
-    description: "Target run ID for action='interrupt'. Defaults to the most recently active controllable run. Prefer id for new calls."
+    description: "Target run ID for action='kill'. Prefer id for new calls."
   })),
   config: Type.Optional(Type.Unsafe({
     anyOf: [{ type: "object", additionalProperties: true }, { type: "string" }],
@@ -16566,7 +17258,7 @@ var SubagentParams = Type.Object({
   })),
   concurrency: Type.Optional(Type.Integer({
     minimum: 1,
-    description: "Top-level PARALLEL mode only: max concurrent tasks. Defaults to config.parallel.concurrency or 4."
+    description: "Top-level PARALLEL mode only: max concurrent tasks. Defaults to config.parallel.concurrency or 3."
   })),
   group: Type.Optional(GroupSchema),
   worktree: Type.Optional(Type.Boolean({
@@ -16618,10 +17310,13 @@ MANAGEMENT (use action field, omit agent/task/tasks):
 • { action: "delete", agent: "code-analysis.custom-agent" }
 CONTROL:
 • { action: "status", id: "..." } - inspect an in-process run by id or prefix
-• { action: "interrupt", id?: "..." } - soft-interrupt the current child turn; the child is terminal for continuation, so follow-up work starts a fresh launch`;
+• { action: "kill", id: "..." } - terminally stop the selected child; killed children cannot be resumed, so follow-up work starts a fresh launch`;
 
 // dist/builtin/subagents/src/extension/tool-rendering.ts
-import { Container as Container3, Text as Text3 } from "@earendil-works/pi-tui";
+import { keyHintIfBound as keyHintIfBound4 } from "@bastani/atomic";
+import { Container as Container3, Text as Text4, truncateToWidth as truncateToWidth3 } from "@earendil-works/pi-tui";
+var renderRequests = new WeakMap;
+var displayText2 = (text) => text.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "").replace(/[\x00-\x1f\x7f-\x9f]/g, " ");
 function effectiveParallelTaskCount(tasks) {
   if (!tasks || tasks.length === 0)
     return 0;
@@ -16631,25 +17326,88 @@ function effectiveParallelTaskCount(tasks) {
   }, 0);
 }
 function renderSubagentToolCall(args, theme, context) {
+  renderRequests.set(context.state, args);
   const burst = getBurstDisplay(context.toolCallId);
   if (burst && !burst.owner)
     return new Container3;
   if (args.action) {
-    const target = args.agent || "";
-    return new Text3(`${theme.fg("toolTitle", theme.bold("subagent "))}${args.action}${target ? ` ${theme.fg("accent", target)}` : ""}`, 0, 0);
+    const target = args.agent || args.id || args.runId || "";
+    return new Text4(`${theme.fg("toolTitle", theme.bold("subagent "))}${args.action}${target ? ` ${theme.fg(args.action === "status" ? "dim" : "accent", displayText2(target))}` : ""}`, 0, 0);
   }
   if (burst) {
-    return new Text3(`${theme.fg("toolTitle", theme.bold("subagent "))}parallel (${burst.taskCount})`, 0, 0);
+    return new Text4(`${theme.fg("toolTitle", theme.bold("subagent "))}parallel (${burst.taskCount})`, 0, 0);
   }
   const isParallel = (args.tasks?.length ?? 0) > 0;
   const parallelCount = effectiveParallelTaskCount(args.tasks);
-  return new Text3(isParallel ? `${theme.fg("toolTitle", theme.bold("subagent "))}parallel (${parallelCount})` : `${theme.fg("toolTitle", theme.bold("subagent "))}${theme.fg("accent", args.agent || "?")}`, 0, 0);
+  return new Text4(isParallel ? `${theme.fg("toolTitle", theme.bold("subagent "))}parallel (${parallelCount})` : `${theme.fg("toolTitle", theme.bold("subagent "))}${theme.fg("accent", displayText2(args.agent || "?"))}${args.task ? `
+${theme.fg("muted", displayText2(truncateToWidth3(displayText2(args.task), 100)))}` : ""}`, 0, 0);
 }
-function renderSubagentToolResult(result2, options, theme, context) {
+function renderSubagentToolResult(result, options, theme, context) {
   const burst = getBurstDisplay(context.toolCallId);
   if (burst && !burst.owner)
     return new Container3;
-  return renderLiveSubagentResult(burst?.result ?? result2, options, theme, context);
+  result = burst?.result ?? result;
+  if (result.details?.taskError)
+    return new Text4(theme.fg("error", `✗ ${displayText2(result.details.taskError)}`), 0, 0);
+  if (result.details?.taskRecords && !result.details.taskResponse) {
+    const lines = result.details.taskRecords.flatMap((task) => {
+      const state = task.execution.kind === "settled" ? subagentTaskResultLabel(task.execution.result) : task.execution.kind;
+      return [
+        theme.bold(`${displayText2(task.agentName ?? "bash")} · ${state}`),
+        ...task.kind === "agent" ? [
+          theme.fg("dim", displayText2(formatModelThinking(task.model, task.thinking) || "model / thinking unavailable"))
+        ] : [],
+        theme.fg("muted", displayText2(task.title)),
+        ...options.expanded ? [theme.fg("dim", task.ref.taskId)] : [],
+        ...task.execution.kind === "settled" && task.execution.result.kind === "failed" ? [theme.fg("error", displayText2(task.execution.result.message))] : []
+      ];
+    });
+    return new Text4([...lines, theme.fg("dim", "/tasks to inspect output and manage tasks")].join(`
+`), 0, 0);
+  }
+  const response = result.details?.taskResponse;
+  const request = renderRequests.get(context.state);
+  if (response) {
+    const outcomes = response.kind === "parallel" ? response.slots.map((slot) => slot.outcome) : [response];
+    const labels = request && !burst ? [
+      ...request.agent ? [{ agent: request.agent, task: request.task ?? "" }] : [],
+      ...(request.tasks ?? []).flatMap((task) => Array.from({ length: Math.min(50, Math.max(1, task.count ?? 1)) }, () => task))
+    ] : [];
+    const lines = outcomes.map((outcome, index) => {
+      if (outcome.kind === "unstarted")
+        return theme.fg("error", outcome.reason.kind === "rejected" ? `✗ ${index + 1}. Not started · ${displayText2(outcome.reason.error.message)}` : `○ ${index + 1}. Skipped`);
+      const observation = outcome.observation;
+      const state = observation.kind === "yielded" ? request?.action === "wait" ? "Still running in background" : "Launched in background" : observation.result.kind === "completed" ? "Completed" : observation.result.kind === "failed" ? "Failed" : subagentTaskResultLabel(observation.result) === "killed (non-resumable)" ? "Killed (non-resumable)" : "Stopped";
+      const icon = observation.kind === "yielded" ? "∀" : observation.result.kind === "completed" ? "✓" : observation.result.kind === "failed" ? "✗" : "○";
+      const color = observation.kind === "yielded" ? "accent" : observation.result.kind === "failed" ? "error" : observation.result.kind === "completed" ? "success" : "warning";
+      const identity = labels[index];
+      const name = outcomes.length > 1 ? `${index + 1}. ${identity ? displayText2(identity.agent) : "Agent"} · ` : "";
+      const summary = theme.fg(color, `${icon} ${name}${state}`);
+      const task = result.details?.taskRecords?.find((task) => task.ref.taskId === observation.taskId);
+      const model = theme.fg("dim", `
+   ${displayText2(formatModelThinking(task?.model, task?.thinking) || "model / thinking unavailable")}`);
+      const metadata = options.expanded ? theme.fg("dim", `
+   ${observation.taskId}${identity?.task ? ` · ${displayText2(identity.task)}` : ""}`) : "";
+      const error = observation.kind === "settled" && observation.result.kind === "failed" ? `
+   ${theme.fg("error", displayText2(observation.result.message))}` : "";
+      return summary + model + metadata + error;
+    });
+    const heading = outcomes.length > 1 ? [theme.bold(`${outcomes.length} agent tasks`)] : [];
+    return new Text4([
+      ...heading,
+      ...lines.map((line, index) => outcomes.length > 1 ? `${index === lines.length - 1 ? "└─" : "├─"} ${line}` : line),
+      theme.fg("dim", "/tasks to inspect output and manage tasks")
+    ].join(`
+`), 0, 0);
+  }
+  const text = result.content.find((part) => part.type === "text");
+  if (text?.type === "text" && text.text.startsWith("Executable agents:")) {
+    const count = text.text.split(`
+`).filter((line) => line.startsWith("- ") && line !== "- (none)").length;
+    return new Text4(options.expanded ? text.text : `${theme.bold(`${count} available agents`)}
+${theme.fg("dim", ["/agents to browse", keyHintIfBound4("app.tools.expand", "Expand")].filter(Boolean).map((hint, index) => index ? `(${hint})` : hint).join(" · "))}`, 0, 0);
+  }
+  return renderLiveSubagentResult(burst?.result ?? result, options, theme, context);
 }
 // dist/builtin/subagents/src/extension/api-lifecycle.ts
 function getWeakMap(key) {
@@ -16861,18 +17619,18 @@ function getSubagentSessionRoot(parentSessionFile) {
 function expandTilde2(p) {
   return p.startsWith("~/") ? path23.join(os8.homedir(), p.slice(2)) : p;
 }
-function isSlashResultRunning(result2) {
-  return result2.details?.progress?.some((entry) => entry.status === "running") || result2.details?.results.some((entry) => entry.progress?.status === "running") || false;
+function isSlashResultRunning(result) {
+  return result.details?.progress?.some((entry) => entry.status === "running") || result.details?.results.some((entry) => entry.progress?.status === "running") || false;
 }
-function isSlashResultError(result2) {
-  return result2.details?.results.some((entry) => entry.status === "error" && entry.progress?.status !== "running") || false;
+function isSlashResultError(result) {
+  return result.details?.results.some((entry) => entry.status === "error" && entry.progress?.status !== "running") || false;
 }
-function rebuildSlashResultContainer(container, result2, options, theme) {
+function rebuildSlashResultContainer(container, result, options, theme) {
   container.clear();
   container.addChild(new Spacer2(1));
-  const boxTheme = isSlashResultRunning(result2) ? "toolPendingBg" : isSlashResultError(result2) ? "toolErrorBg" : "toolSuccessBg";
+  const boxTheme = isSlashResultRunning(result) ? "toolPendingBg" : isSlashResultError(result) ? "toolErrorBg" : "toolSuccessBg";
   const box = new Box(1, 1, (text) => theme.bg(boxTheme, text));
-  box.addChild(renderSubagentResult(result2, options, theme));
+  box.addChild(renderSubagentResult(result, options, theme));
   container.addChild(box);
 }
 function createSlashResultComponent(details, options, theme, owner) {
@@ -16896,8 +17654,8 @@ function renderSubagentNotification(message, options, theme) {
   const content = typeof message.content === "string" ? message.content : "";
   const details = message.details ?? parseSubagentNotifyContent(content);
   if (!details)
-    return new Text4(content, 0, 0);
-  const icon = details.status === "completed" ? theme.fg("success", "✓") : details.status === "interrupted" ? theme.fg("warning", "■") : theme.fg("error", "✗");
+    return new Text5(content, 0, 0);
+  const icon = details.status === "completed" ? theme.fg("success", "✓") : details.status === "interrupted" || details.status === "killed" ? theme.fg("warning", "■") : theme.fg("error", "✗");
   const parts = [];
   if (details.taskInfo)
     parts.push(details.taskInfo);
@@ -16916,7 +17674,7 @@ function renderSubagentNotification(message, options, theme) {
   }
   if (!options.expanded && trimmedPreview.includes(`
 `)) {
-    const expandHint = keyHintIfBound3("app.tools.expand", "full notification");
+    const expandHint = keyHintIfBound5("app.tools.expand", "full notification");
     if (expandHint)
       text += `
   ${expandHint}`;
@@ -16929,7 +17687,7 @@ function renderSubagentNotification(message, options, theme) {
   container.addChild(new Spacer2(1));
   const boxTheme = details.status === "completed" ? "toolSuccessBg" : details.status === "failed" ? "toolErrorBg" : "toolPendingBg";
   const box = new Box(1, 1, (line) => theme.bg(boxTheme, line));
-  box.addChild(new Text4(text, 0, 0));
+  box.addChild(new Text5(text, 0, 0));
   container.addChild(box);
   return container;
 }
@@ -16945,16 +17703,16 @@ class SubagentControlNoticeComponent {
   render(width) {
     const eventLabel = this.details.event.type.replaceAll("_", " ");
     if (width < 3)
-      return [truncateToWidth(`Subagent ${eventLabel}`, width)];
+      return [truncateToWidth4(`Subagent ${eventLabel}`, width)];
     const bodyWidth = Math.max(1, width - 2);
     const borderChar = "─";
     const header = ` ⚠ Subagent ${eventLabel}: ${this.details.event.agent} `;
-    const headerText = truncateToWidth(header, bodyWidth, "");
-    const headerPadding = Math.max(0, bodyWidth - visibleWidth2(headerText));
+    const headerText = truncateToWidth4(header, bodyWidth, "");
+    const headerPadding = Math.max(0, bodyWidth - visibleWidth4(headerText));
     const lines = [this.theme.fg("accent", `╭${headerText}${borderChar.repeat(headerPadding)}╮`)];
-    for (const line of wrapTextWithAnsi(formatSubagentControlNotice(this.details), bodyWidth)) {
-      const text = truncateToWidth(line, bodyWidth, "");
-      const padding = Math.max(0, bodyWidth - visibleWidth2(text));
+    for (const line of wrapTextWithAnsi2(formatSubagentControlNotice(this.details), bodyWidth)) {
+      const text = truncateToWidth4(line, bodyWidth, "");
+      const padding = Math.max(0, bodyWidth - visibleWidth4(text));
       lines.push(this.theme.fg("accent", `│${text}${" ".repeat(padding)}│`));
     }
     lines.push(this.theme.fg("accent", `╰${borderChar.repeat(bodyWidth)}╯`));
@@ -17072,8 +17830,8 @@ function registerSubagentExtension(pi) {
       renderCall(args, theme, context) {
         return renderSubagentToolCall(args, theme, context);
       },
-      renderResult(result2, options, theme, context) {
-        return renderSubagentToolResult(result2, options, theme, context);
+      renderResult(result, options, theme, context) {
+        return renderSubagentToolResult(result, options, theme, context);
       }
     };
     pi.registerTool(tool);