@ordewell/core 0.7.1 → 0.8.0

package/dist/{chunk-Y36NIASW.mjs → chunk-BLLIBCCS.mjs}

@@ -1,18 +1,22 @@
 import {
   PlanParseError,
   TASK_OPS_ENVELOPE_KEY,
-  addTaskToPlan,
-  createTask,
   escapeControlCharsInStrings,
   extractObjectsWithKey,
+  stripTrailingCommas
+} from "./chunk-H5O74L77.mjs";
+import {
+  addTaskToPlan,
+  createTask,
   flattenTasks,
   inheritedOps,
+  inheritedSkills,
   opsFlag,
   removeTaskFromPlan,
   renumberTasks,
-  stripTrailingCommas,
+  skillNames,
   updateTaskInPlan
-} from "./chunk-LGQNXPBX.mjs";
+} from "./chunk-UUU46PVQ.mjs";
 import {
   taskOrderLabel,
   taskRef,
@@ -118,183 +122,8 @@ function normalizeAgentArgs(tool, args) {
   return out;
 }
 
-// src/services/terminalRender.ts
-var ANSI_OR_CTRL_RE = /\x1b\[[0-9;?]*[A-Za-z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)?|\x1b[()][AB012]|\x1b[=>]|[\x00-\x08\x0b-\x1f\x7f]/g;
-function flattenTerminalOutput(raw) {
-  return raw.replace(ANSI_OR_CTRL_RE, "").replace(/[─-▟]/g, "").replace(/\s+/g, "");
-}
-function renderTerminalOutput(raw) {
-  const rows = /* @__PURE__ */ new Map();
-  let row = 1;
-  let col = 1;
-  let savedRow = 1;
-  let savedCol = 1;
-  const cells = (r) => {
-    let line = rows.get(r);
-    if (!line) {
-      line = [];
-      rows.set(r, line);
-    }
-    return line;
-  };
-  const firstParam = (params, fallback = 1) => params[0] || fallback;
-  const eraseLine = (mode) => {
-    const line = cells(row);
-    if (mode === 2) {
-      rows.set(row, []);
-    } else if (mode === 1) {
-      for (let c = 0; c < col; c++) line[c] = " ";
-    } else {
-      line.length = Math.max(0, col - 1);
-    }
-  };
-  for (let i = 0; i < raw.length; ) {
-    const ch = raw[i];
-    if (ch === "\x1B") {
-      const kind = raw[i + 1];
-      if (kind === "[") {
-        let end = i + 2;
-        while (end < raw.length) {
-          const code = raw.charCodeAt(end);
-          if (code >= 64 && code <= 126) break;
-          end++;
-        }
-        if (end >= raw.length) break;
-        const final = raw[end];
-        const body = raw.slice(i + 2, end).replace(/^[?<>=!]+/, "");
-        const params = body.split(";").map((p) => Number.parseInt(p, 10) || 0);
-        switch (final) {
-          case "H":
-          case "f":
-            row = params[0] || 1;
-            col = params[1] || 1;
-            break;
-          case "G":
-            col = firstParam(params);
-            break;
-          case "d":
-            row = firstParam(params);
-            break;
-          case "A":
-            row = Math.max(1, row - firstParam(params));
-            break;
-          case "B":
-            row += firstParam(params);
-            break;
-          case "C":
-            col += firstParam(params);
-            break;
-          case "D":
-            col = Math.max(1, col - firstParam(params));
-            break;
-          case "E":
-            row += firstParam(params);
-            col = 1;
-            break;
-          case "F":
-            row = Math.max(1, row - firstParam(params));
-            col = 1;
-            break;
-          case "s":
-            savedRow = row;
-            savedCol = col;
-            break;
-          case "u":
-            row = savedRow;
-            col = savedCol;
-            break;
-          case "K":
-            eraseLine(params[0] || 0);
-            break;
-          case "J":
-            if ((params[0] || 0) === 2 || (params[0] || 0) === 3) rows.clear();
-            break;
-          case "X": {
-            const line = cells(row);
-            for (let c = 0; c < firstParam(params); c++) line[col - 1 + c] = " ";
-            break;
-          }
-          case "P": {
-            cells(row).splice(col - 1, firstParam(params));
-            break;
-          }
-          case "@": {
-            cells(row).splice(col - 1, 0, ...Array(firstParam(params)).fill(" "));
-            break;
-          }
-          default:
-            break;
-        }
-        i = end + 1;
-        continue;
-      }
-      if (kind === "]" || kind === "P" || kind === "^" || kind === "_") {
-        let end = i + 2;
-        while (end < raw.length && raw[end] !== "\x07" && !(raw[end] === "\x1B" && raw[end + 1] === "\\")) end++;
-        if (end >= raw.length) break;
-        i = raw[end] === "\x07" ? end + 1 : end + 2;
-        continue;
-      }
-      if (kind === "7") {
-        savedRow = row;
-        savedCol = col;
-      } else if (kind === "8") {
-        row = savedRow;
-        col = savedCol;
-      } else if (kind === "c") {
-        rows.clear();
-        row = 1;
-        col = 1;
-      }
-      i += kind === "(" || kind === ")" ? 3 : 2;
-      continue;
-    }
-    if (ch === "\r") {
-      col = 1;
-      i++;
-      continue;
-    }
-    if (ch === "\n") {
-      row++;
-      i++;
-      continue;
-    }
-    if (ch === "\b") {
-      col = Math.max(1, col - 1);
-      i++;
-      continue;
-    }
-    if (ch === "	") {
-      col += 8 - (col - 1) % 8;
-      i++;
-      continue;
-    }
-    if (ch < " " || ch === "\x7F") {
-      i++;
-      continue;
-    }
-    cells(row)[col - 1] = ch;
-    col++;
-    i++;
-  }
-  const populated = [...rows.keys()].sort((a, b) => a - b);
-  return populated.map((r) => cells(r).join("")).join("\n");
-}
-function renderCleanCapture(raw, doneToken) {
-  const rendered = renderTerminalOutput(raw).replace(/[\s─-▟]+$/gm, "");
-  if (!doneToken) return rendered.trim();
-  const lines2 = rendered.split("\n");
-  const flat = (s) => flattenTerminalOutput(s);
-  for (let i = 0; i < lines2.length; i++) {
-    const own = flat(lines2[i]).includes(doneToken);
-    if (own) return lines2.slice(0, i).join("\n").trim();
-    const window = flat(lines2[i]) + (i + 1 < lines2.length ? flat(lines2[i + 1]) : "");
-    if (window.includes(doneToken)) return lines2.slice(0, i + 1).join("\n").trim();
-  }
-  return rendered.trim();
-}
-
 // src/conversation/format.ts
+var ANSI_OR_CTRL_RE = /\x1b\[[0-9;?]*[A-Za-z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)?|\x1b[()][AB012]|\x1b[=>]|[\x00-\x08\x0b-\x1f\x7f]/g;
 var DISPLAY_NAMES = {
   read_file: "Read",
   read_files: "Read",
@@ -425,6 +254,31 @@ function diffSummary({ added, removed }) {
 function settledMessage(id, role, text2, turnId) {
   return { type: "message", id, role, text: text2, streaming: false, ...turnId ? { turnId } : {} };
 }
+function userMessage(id, text2, skills, turnId) {
+  const block = settledMessage(id, "user", text2, turnId);
+  return skills.length > 0 ? { ...block, skills: skills.map((s) => s.name) } : block;
+}
+function skillLoadNotice({ invokedBy, name, source, path, attaches }) {
+  return { invokedBy, name, source, path, ...attaches ? { attaches } : {} };
+}
+var LOAD_SKILL_TOOL = /(?:^|_)load_skill$/;
+function surfaceStep(step) {
+  if (!step.success || !LOAD_SKILL_TOOL.test(step.toolLabel ?? step.tool)) return step;
+  const name = loadedSkillName(step.args);
+  return { ...step, result: name ? `Loaded skill ${name}.` : "Loaded a skill." };
+}
+function loadedSkillName(args) {
+  try {
+    const parsed = JSON.parse(args);
+    const name = typeof parsed === "object" && parsed !== null && "name" in parsed ? parsed.name : void 0;
+    return typeof name === "string" ? name : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function skillLoadBlock(id, { invokedBy, name, source, path, attaches }, turnId) {
+  return { type: "skill_load", id, invokedBy, name, source, path, ...attaches ? { attaches } : {}, ...turnId ? { turnId } : {} };
+}
 function subagentBlock(id, { toolCallId, model, usage, turnId, ...fields }) {
   return {
     type: "subagent",
@@ -764,6 +618,8 @@ function unqueueMessage(view, { messageId }) {
 }
 function reduceTaskLog(view, event) {
   switch (event.type) {
+    case "task_skills":
+      return append(view, (id) => settledMessage(id, "system", `Skills: ${event.skills.map((s) => `${s.name} (${s.path})`).join(", ")}`));
     case "turn_start":
       return startTurn(view, event);
     case "turn_end":
@@ -1041,7 +897,8 @@ var UPDATABLE_FIELDS = [
   "userSteps",
   "autonomy",
   "sliceType",
-  "ops"
+  "ops",
+  "skills"
 ];
 function taskOpsProtocol(executionNote = "", tools = false) {
   const updateChanges = UPDATABLE_FIELDS.map((f) => f === "dependencies" ? '"dependencies"?:["<id or #order>"]' : `"${f}"?`).join(",");
@@ -1064,6 +921,7 @@ function taskOpsProtocol(executionNote = "", tools = false) {
     ...tools ? ["edit_plan checks the batch when you call it and answers with what it will change, or with the error to fix \u2014 call it again in the same reply. The edit is applied when your reply ends; edits you make in one reply join one batch."] : [],
     'Just declare the dependencies you want \u2014 display order is repaired for you afterwards, so a rewire or a newly added prerequisite never needs a "reorder" op. Only a task that is running or completed cannot be shifted, so an edit that would need one to move is rejected.' + executionNote,
     'Flipping "type" between "ai" and "user" is a content change, not just a label: an update to "user" needs "userSteps" in the SAME op, and an update to "ai" needs "prompt" in the SAME op \u2014 the model/mode/effort/autonomy fields (flipping to "user") or the userSteps (flipping to "ai") are cleared automatically.',
+    `"skills" in "changes" REPLACES the task's whole skill list. To add one, send the names the plan block shows in its skills:[...] plus the new one; to drop one, send the rest; [] removes them all.`,
     '"rearm" puts a failed OR completed task back to pending \u2014 verdict and output summary are cleared, any dependents it had blocked are released, and it may carry field changes (e.g. a corrected "prompt") applied in the same op. A running task cannot be re-armed. Never rearm a task just to relabel it \u2014 only when it should actually run again.'
   ];
 }
@@ -1159,8 +1017,22 @@ function updatableChanges(raw) {
     if (raw && key in raw) changes[key] = raw[key];
   }
   if ("ops" in changes) changes.ops = opsFlag(changes.ops);
+  if ("skills" in changes) changes.skills = skillNames(changes.skills);
   return changes;
 }
+function withSkillNames(subtasks) {
+  if (!Array.isArray(subtasks)) return subtasks;
+  return subtasks.map((sub) => {
+    if (typeof sub !== "object" || sub === null) return sub;
+    const { skills, ...rest } = sub;
+    const names = skillNames(skills);
+    return {
+      ...rest,
+      ...names ? { skills: names } : {},
+      ..."subtasks" in rest ? { subtasks: withSkillNames(rest.subtasks) } : {}
+    };
+  });
+}
 function findInTasks(tasks, id) {
   return flattenTasks(tasks).find((t) => t.id === id);
 }
@@ -1328,41 +1200,38 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
     }
     return { ids, bad };
   };
+  const prepareEdit = (op, opIndex, label, audience, refuseRunning = false) => {
+    const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, opIndex);
+    if ("error" in ref) return { error: `${label}: ${ref.error}` };
+    const target = findInTasks(tasks, ref.id);
+    if (!target) return { error: `${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)` };
+    if (refuseRunning && target.status === "in_progress") return { error: `${label}: "${target.title}" is running and cannot be re-armed` };
+    const changes = updatableChanges(op.changes);
+    if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
+      return { error: `${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]` };
+    }
+    const changesForCheck = { ...changes };
+    delete changesForCheck.dependencies;
+    const check = validateTaskEdit(audience, flattenTasks(tasks), target.id, changesForCheck, catalog);
+    if (!check.ok) return { error: `${label}: ${check.error}` };
+    for (const field of check.clear ?? []) changes[field] = void 0;
+    if ("dependencies" in changes) {
+      const { ids, bad } = resolveDeps(changes.dependencies, opIndex);
+      if (bad.length) return { error: `${label}: unknown dependencies: ${bad.join(", ")}` };
+      changes.dependencies = ids.filter((id) => id !== target.id);
+    }
+    return { target, changes, check };
+  };
   for (const [i, op] of ops.entries()) {
     const label = `op ${i + 1} (${op.op})`;
     switch (op.op) {
       case "update": {
-        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
-        if ("error" in ref) {
-          errors.push(`${label}: ${ref.error}`);
+        const prep = prepareEdit(op, i, label, "planner");
+        if ("error" in prep) {
+          errors.push(prep.error);
           break;
         }
-        const target = findInTasks(tasks, ref.id);
-        if (!target) {
-          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
-          break;
-        }
-        const changes = updatableChanges(op.changes);
-        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
-          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
-          break;
-        }
-        const changesForCheck = { ...changes };
-        delete changesForCheck.dependencies;
-        const check = validateTaskEdit("planner", flattenTasks(tasks), target.id, changesForCheck, catalog);
-        if (!check.ok) {
-          errors.push(`${label}: ${check.error}`);
-          break;
-        }
-        for (const field of check.clear ?? []) changes[field] = void 0;
-        if ("dependencies" in changes) {
-          const { ids, bad } = resolveDeps(changes.dependencies, i);
-          if (bad.length) {
-            errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
-            break;
-          }
-          changes.dependencies = ids.filter((id) => id !== target.id);
-        }
+        const { target, changes, check } = prep;
         if (Object.keys(changes).length === 0) {
           errors.push(`${label}: no valid changes provided`);
           break;
@@ -1392,6 +1261,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
         const newId = uuidv4();
         tasks = addTaskToPlan(tasks, {
           ...spec,
+          subtasks: withSkillNames(spec.subtasks),
           id: newId,
           dependencies: ids,
           assignedRunner: runner,
@@ -1459,7 +1329,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
           errors.push(`${label}: unknown task in merge list (already removed, merged, or split by an earlier op)`);
           break;
         }
-        const toMerge = resolved.map((t) => t).sort((a, b) => a.order - b.order);
+        const toMerge = [...new Map(resolved.map((t) => [t.id, t])).values()].sort((a, b) => a.order - b.order);
         if (toMerge.length < 2) {
           errors.push(`${label}: merge needs at least two tasks`);
           break;
@@ -1495,6 +1365,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
           autonomy: spec.autonomy ?? toMerge.find((t) => t.autonomy)?.autonomy,
           sliceType: spec.sliceType ?? toMerge.find((t) => t.sliceType)?.sliceType,
           ops: inheritedOps(toMerge, spec.ops),
+          skills: inheritedSkills(spec.skills, toMerge.flatMap((t) => t.skills ?? [])),
           userStoriesCovered: spec.userStoriesCovered ?? (toMerge.flatMap((t) => t.userStoriesCovered ?? []).length ? [...new Set(toMerge.flatMap((t) => t.userStoriesCovered ?? []))] : void 0)
         });
         const mergedId = mergedTask.id;
@@ -1576,6 +1447,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
             autonomy: spec.autonomy ?? target.autonomy,
             sliceType: spec.sliceType ?? target.sliceType,
             ops: inheritedOps([target], spec.ops),
+            skills: inheritedSkills(spec.skills, target.skills),
             userStoriesCovered: spec.userStoriesCovered ?? target.userStoriesCovered
           });
           newTasks.push(nt);
@@ -1597,41 +1469,12 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
         break;
       }
       case "rearm": {
-        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
-        if ("error" in ref) {
-          errors.push(`${label}: ${ref.error}`);
+        const prep = prepareEdit(op, i, label, "direct", true);
+        if ("error" in prep) {
+          errors.push(prep.error);
           break;
         }
-        const target = findInTasks(tasks, ref.id);
-        if (!target) {
-          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
-          break;
-        }
-        if (target.status === "in_progress") {
-          errors.push(`${label}: "${target.title}" is running and cannot be re-armed`);
-          break;
-        }
-        const changes = updatableChanges(op.changes);
-        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
-          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
-          break;
-        }
-        const changesForCheck = { ...changes };
-        delete changesForCheck.dependencies;
-        const check = validateTaskEdit("direct", flattenTasks(tasks), target.id, changesForCheck, catalog);
-        if (!check.ok) {
-          errors.push(`${label}: ${check.error}`);
-          break;
-        }
-        for (const field of check.clear ?? []) changes[field] = void 0;
-        if ("dependencies" in changes) {
-          const { ids, bad } = resolveDeps(changes.dependencies, i);
-          if (bad.length) {
-            errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
-            break;
-          }
-          changes.dependencies = ids.filter((id) => id !== target.id);
-        }
+        const { target, changes, check } = prep;
         tasks = updateTaskInPlan(tasks, target.id, { ...changes, status: "pending", verdict: void 0, outputSummary: void 0, awaitingReason: void 0 });
         for (const dep of flattenTasks(tasks)) {
           if (dep.status === "blocked" && dep.dependencies.includes(target.id)) {
@@ -1749,9 +1592,8 @@ function continuability(task) {
     return refuse("its work is waiting on a merge conflict. Resolve or repair the conflict instead.");
   }
   if (task.status !== "completed" && task.status !== "failed") return refuse("only a completed or failed task can be.");
-  if (task.transport?.kind !== "structured") return refuse("it ran in a terminal, so there is no saved session to resume. Use Retry instead.");
-  if (!task.transport.nativeSessionId) return refuse("its runner left no saved session to resume. Use Retry instead.");
-  return { ok: true, sessionId: task.transport.nativeSessionId };
+  if (!task.runnerSessionId) return refuse("its runner left no saved session to resume. Use Retry instead.");
+  return { ok: true, sessionId: task.runnerSessionId };
 }
 function canContinue(task) {
   return continuability(task).ok;
@@ -1776,7 +1618,8 @@ function serializeTask(t) {
     autonomy: t.autonomy || void 0,
     sliceType: t.sliceType || void 0,
     userStoriesCovered: t.userStoriesCovered || void 0,
-    ...t.ops ? { ops: true } : {}
+    ...t.ops ? { ops: true } : {},
+    ...t.skills?.length ? { skills: [...t.skills] } : {}
   };
 }
 function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [], awaitingApproval = 0, mergeGate = [], checkpoint = "") {
@@ -1786,7 +1629,6 @@ function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [],
     verdict: t.verdict ? { outcome: t.verdict.outcome, reason: t.verdict.reason, checks: t.verdict.checks || [] } : null,
     idleSince,
     ...isolation ? { isolation } : {},
-    ...t.transport ? { transport: t.transport.fallback ? { kind: t.transport.kind, fallback: t.transport.fallback } : { kind: t.transport.kind } } : {},
     ...t.status === "awaiting_user" && t.awaitingReason ? { awaitingReason: t.awaitingReason } : {},
     ...t.status === "awaiting_user" && t.awaitingReason === "checkpoint" && checkpoint ? { checkpoint } : {},
     ...queued.length > 0 ? { queued: queued.map((m) => ({ ...m })) } : {},
@@ -1796,14 +1638,39 @@ function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [],
     ...t.forcedPastGate?.length ? { forcedPastGate: [...t.forcedPastGate] } : {}
   };
 }
+function surfaceConversation(history) {
+  return history?.map(({ skill, ...m }) => skill ? { ...m, skill: skillLoadNotice(skill) } : m);
+}
+function surfaceQueued(queued) {
+  return queued?.map(({ skills, ...m }) => skills ? { ...m, skills: skills.map(skillLoadNotice) } : m);
+}
+function surfaceTask({ attemptSkills, subtasks, runnerSessionId: _runnerSessionId, ...task }) {
+  return {
+    ...task,
+    ...attemptSkills ? { attemptSkills: attemptSkills.map(({ name, source, path }) => ({ name, source, path })) } : {},
+    subtasks: (subtasks ?? []).map(surfaceTask)
+  };
+}
+function surfacePlan(plan) {
+  return {
+    ...plan,
+    tasks: plan.tasks.map(surfaceTask),
+    conversationHistory: surfaceConversation(plan.conversationHistory),
+    queuedMessages: surfaceQueued(plan.queuedMessages),
+    researchLog: plan.researchLog?.map((e) => "type" in e ? e : surfaceStep(e))
+  };
+}
+function surfacePlanState(state) {
+  return state.phase === "planning" ? { ...state, pendingTasks: state.pendingTasks.map(surfaceTask) } : { ...state, pendingTasks: state.pendingTasks.map(surfaceTask), executionLog: state.executionLog.map(surfaceTask) };
+}
 function serializePlan(plan) {
   return {
     tasks: plan.tasks.map(serializeTask),
     runners: plan.runners,
     generatedAt: plan.generatedAt,
-    conversationHistory: plan.conversationHistory,
+    conversationHistory: surfaceConversation(plan.conversationHistory),
     prdMarkdown: plan.prdMarkdown,
-    queuedMessages: plan.queuedMessages
+    queuedMessages: surfaceQueued(plan.queuedMessages)
   };
 }
 function executionSummary(tasks) {
@@ -1837,13 +1704,15 @@ function finalSegmentIndex(blocks, turnId, pastPlan = false) {
   }
   return -1;
 }
-function openTurn(view, turnId, prompt) {
+function openTurn(view, { turnId, prompt = "", skills = [] }) {
   const i = findLastIndex(view.blocks, (b) => b.type === "message" && b.role === "user");
   const sent = view.blocks[i];
-  if (sent?.type === "message" && sent.turnId === void 0 && sent.text === prompt) {
-    return { ...view, blocks: replaceAt(view.blocks, i, { ...sent, turnId }) };
-  }
-  return append(view, (id) => settledMessage(id, "user", prompt, turnId));
+  const adopted = sent?.type === "message" && sent.turnId === void 0 && sent.text === prompt;
+  const said = adopted ? { ...view, blocks: replaceAt(view.blocks, i, userMessage(sent.id, prompt, skills, turnId)) } : append(view, (id) => userMessage(id, prompt, skills, turnId));
+  if (skills.length === 0) return said;
+  const at = adopted ? i + 1 : findLastIndex(said.blocks, (b) => b.type === "message" && b.role === "user") + 1;
+  const loads = skills.map((skill, n) => skillLoadBlock(`b${said.nextId + n}`, skill, turnId));
+  return { ...said, blocks: [...said.blocks.slice(0, at), ...loads, ...said.blocks.slice(at)], nextId: said.nextId + loads.length };
 }
 function streamText(view, { turnId, segmentId, text: text2 }) {
   const i = findLastIndex(view.blocks, (b) => isUnsettledSegment(b, turnId) && b.segmentId === segmentId);
@@ -1990,7 +1859,9 @@ function reduceConversation(view, input) {
     case "local_entry":
       return append(view, (id) => settledMessage(id, input.role, input.text));
     case "planner_turn_started":
-      return input.prompt === void 0 ? view : openTurn(view, input.turnId, input.prompt);
+      return input.prompt === void 0 ? view : openTurn(view, input);
+    case "planner_skill_loaded":
+      return append(sealLane(view, null, -1), (id) => skillLoadBlock(id, input.skill, input.turnId));
     case "planner_text_delta":
       return streamText(view, input);
     case "planner_message":
@@ -2030,11 +1901,27 @@ function reduceConversation(view, input) {
 var USER = 0;
 var RESEARCH = 1;
 var SETTLED = 2;
-function fromEntry(entry) {
+function fromEntry(entry, loaded = []) {
   if (entry.kind === "plan_generated") return (id) => ({ type: "plan", id: id(), text: "", ...planMarker(entry.content) });
+  if (entry.kind === "skill_load" && entry.skill) {
+    const { skill } = entry;
+    return (id) => skillLoadBlock(id(), skillLoadNotice(skill));
+  }
+  if (entry.role === "user" && !entry.kind) return (id) => userMessage(id(), entry.content, loaded.map(skillLoadNotice));
   const role = entry.kind === "system" || entry.kind === "compaction" ? "system" : entry.role === "user" ? "user" : "planner";
   return (id) => settledMessage(id(), role, entry.content);
 }
+function loadsAfter(entries, index) {
+  const loads = [];
+  for (let i = index + 1; i < entries.length && entries[i].kind === "skill_load"; i++) {
+    const { skill } = entries[i];
+    if (skill?.invokedBy === "user") loads.push(skill);
+  }
+  return loads;
+}
+function rankOf(entry) {
+  return entry.role === "user" && (!entry.kind || entry.kind === "skill_load") ? USER : SETTLED;
+}
 function spawnBrief(step) {
   try {
     const args = JSON.parse(step.args);
@@ -2097,7 +1984,7 @@ function fromTranscript(conversationHistory, researchLog, plannerUsage) {
   const kept = compacted ? history.slice(1) : history;
   const cutoff = compacted ? kept[0]?.timestamp ?? compacted.timestamp : "";
   const placed = [
-    ...kept.map((entry) => ({ at: entry.timestamp, rank: entry.role === "user" && !entry.kind ? USER : SETTLED, build: fromEntry(entry) })),
+    ...kept.map((entry, i) => ({ at: entry.timestamp, rank: rankOf(entry), build: fromEntry(entry, loadsAfter(kept, i)) })),
     ...research(researchLog ?? []).filter((item) => item.at >= cutoff)
   ];
   placed.sort((a, b) => a.at < b.at ? -1 : a.at > b.at ? 1 : a.rank - b.rank);
@@ -2144,7 +2031,8 @@ var TURN_STREAM = /* @__PURE__ */ new Set([
   "research_step_done",
   "subagent_started",
   "subagent_finished",
-  "planner_turn_ended"
+  "planner_turn_ended",
+  "planner_skill_loaded"
 ]);
 function cutOff(gate, input) {
   if (gate.stopped === null || !TURN_STREAM.has(input.type)) return false;
@@ -2289,15 +2177,14 @@ export {
   plannerContextFill,
   mapAgentTool,
   normalizeAgentArgs,
-  flattenTerminalOutput,
-  renderTerminalOutput,
-  renderCleanCapture,
   toolHeadline,
   outputLines,
   outputPreview,
   diffStat,
   diffRows,
   diffSummary,
+  skillLoadNotice,
+  surfaceStep,
   EMPTY_TASK_LOG,
   runnerToolSubject,
   reduceTaskLog,
@@ -2330,6 +2217,8 @@ export {
   canContinue,
   serializeTask,
   serializeTaskStatus,
+  surfacePlan,
+  surfacePlanState,
   serializePlan,
   executionSummary,
   CHECKPOINT_TRUNCATE_LENGTH,
@@ -2359,4 +2248,4 @@ export {
   pastGateConfirmation,
   newTaskFields
 };
-//# sourceMappingURL=chunk-Y36NIASW.mjs.map
+//# sourceMappingURL=chunk-BLLIBCCS.mjs.map