@ordewell/core 0.7.1 → 0.8.0

package/dist/{plan-utils-CKgNtDwQ.d.mts → plan-utils-BMayhGBj.d.mts}

@@ -1,5 +1,6 @@
-import { bb as StructuredTurnEnd, bd as SubagentOutcome, bE as UsageRecord, k as ApprovalDecision, b9 as StructuredEvent, a$ as RunnerId, y as DiscoveredModel, bh as Task, ab as LegacyPlanState, aQ as QueuedMessage, bF as UsageTotals, bL as Verdict, bj as TaskIsolation, by as TaskTransport, r as AwaitingReason, aR as QueuedTaskMessage, T as IsolationHandoff, _ as IsolationMergeResult, aX as ResearchStep, l as ApprovalKind, q as ApprovalSource, aY as ResearchStepOutcome, w as ConversationMessage, aV as ResearchLogEntry, aB as PlannerUsage, bk as TaskIsolationState } from './Task-BnLxkVQF.mjs';
-import { R as RunnerModeInfo } from './ModeResolver-DZzJSdIU.mjs';
+import { ag as TaskSkillSnapshot, af as TaskSkillNotice, a8 as SubagentOutcome, ao as UsageRecord, W as RunnerId, c as DiscoveredModel, a9 as Task, L as LegacyPlanState, C as ConversationMessage, a0 as SkillLoadNotice, Q as QueuedMessage, ap as UsageTotals, av as Verdict, aa as TaskIsolation, a as AwaitingReason, g as IsolationHandoff, n as IsolationMergeResult, T as ResearchStep, z as PlanState, ah as TaskSnapshot, U as ResearchStepOutcome, O as ResearchLogEntry, G as PlannerUsage, ab as TaskIsolationState } from './Task-1Q19y7sZ.mjs';
+import { R as RunnerModeInfo } from './ModeResolver-DE-o2lRF.mjs';
+import { a5 as StructuredTurnEnd, h as ApprovalDecision, a4 as StructuredEvent, Y as QueuedTaskMessage, i as ApprovalKind, n as ApprovalSource } from './IRunner-XVUddYVX.mjs';
 import './order-labels.mjs';
 
 /**
@@ -12,8 +13,17 @@ import './order-labels.mjs';
  * without a format version.
  */
 type TaskLogEvent = 
-/** A turn began by delivering `message`; `messageId` names it when it had been queued, `forced` when it was force sent. */
+/**
+ * The task skills this attempt's prompt carried, as read at its spawn
+ * (ADR-0024): first in its log. The file keeps their bodies; a surface is
+ * sent notices ({@link taskLogForSurface}).
+ */
 {
+    type: 'task_skills';
+    skills: TaskSkillSnapshot[] | TaskSkillNotice[];
+}
+/** A turn began by delivering `message`; `messageId` names it when it had been queued, `forced` when it was force sent. */
+ | {
     type: 'turn_start';
     message: string;
     messageId?: string;
@@ -142,6 +152,8 @@ declare function trimToolOutput(output: string): {
  * keep: background-agent launches, which the subagent's own events already show.
  */
 declare function toTaskLogEvent(event: StructuredEvent): TaskLogEvent | null;
+/** A log as a surface is sent it, live or read back: everything but the skills' bodies. */
+declare function taskLogForSurface(events: readonly TaskLogEvent[]): TaskLogEvent[];
 /**
  * Merge runs of deltas into one event each. Deltas arrive a few characters at
  * a time; merged, a batch is one message on the wire and one line on disk,
@@ -285,8 +297,6 @@ type SerializedTaskStatus = {
     idleSince?: string | null;
     /** Absent unless the plan has an isolation run, so a shared-root plan's updates are unchanged. */
     isolation?: TaskIsolation;
-    /** Absent unless the task's plan asked for the structured transport (ADR-0018): what it ran on, or why it fell back. */
-    transport?: Pick<TaskTransport, 'kind' | 'fallback'>;
     /** What an `awaiting_user` task waits on, when it was saved (ADR-0018, W1). */
     awaitingReason?: AwaitingReason;
     /** The whole question of the checkpoint the task waits at; absent when it waits at none. */
@@ -339,14 +349,49 @@ type SerializedTask = {
     userStoriesCovered: Task['userStoriesCovered'];
     /** Set only on an ops task (ADR-0020). */
     ops?: true;
+    /** Task skills attached by name; absent when none. */
+    skills?: string[];
+};
+/** Skill loads go out as notices: their bodies are for the planner, and stay in the session. */
+type SerializedConversationMessage = Omit<ConversationMessage, 'skill'> & {
+    skill?: SkillLoadNotice;
+};
+type SerializedQueuedMessage = Omit<QueuedMessage, 'skills'> & {
+    skills?: SkillLoadNotice[];
+};
+/**
+ * A task as a surface is sent it: its attempt's skills are notices, whole in
+ * the session only, and its runner session id stays there too — no surface shows it,
+ * and only a continue reads the runner's own session id.
+ */
+type SurfaceTask<T extends Task = Task> = Omit<T, 'attemptSkills' | 'subtasks' | 'runnerSessionId'> & {
+    attemptSkills?: TaskSkillNotice[];
+    subtasks: SurfaceTask[];
+};
+/** A plan as the daemon and the VS Code webview are sent it: the session's own state, minus every skill body. */
+type SurfacePlan = Omit<LegacyPlanState, 'tasks' | 'conversationHistory' | 'queuedMessages'> & {
+    tasks: SurfaceTask[];
+    conversationHistory?: SerializedConversationMessage[];
+    queuedMessages?: SerializedQueuedMessage[];
 };
+/** The phase-tagged shape of {@link SurfacePlan}. */
+type SurfacePlanState = (Omit<Extract<PlanState, {
+    phase: 'planning';
+}>, 'pendingTasks'> & {
+    pendingTasks: SurfaceTask[];
+}) | (Omit<Extract<PlanState, {
+    phase: 'executing';
+}>, 'pendingTasks' | 'executionLog'> & {
+    pendingTasks: SurfaceTask[];
+    executionLog: SurfaceTask<TaskSnapshot>[];
+});
 type SerializedPlan = {
     tasks: SerializedTask[];
     runners: RunnerId[];
     generatedAt: string;
-    conversationHistory?: LegacyPlanState['conversationHistory'];
+    conversationHistory?: SerializedConversationMessage[];
     prdMarkdown?: string;
-    queuedMessages?: QueuedMessage[];
+    queuedMessages?: SerializedQueuedMessage[];
 };
 /** How a planner turn ended: the reply kind it settled on, a user stop, or a failure. */
 type PlannerTurnOutcome = 'message' | 'plan' | 'task_ops' | 'stopped' | 'error';
@@ -392,12 +437,18 @@ type SessionMessage =
 /**
  * A planner turn began. Emitted once per turn by whoever runs the turn,
  * before any other message carrying its `turnId`. `prompt` is the user's
- * message when the turn answers one.
+ * message, as typed, when the turn answers one; `skills` are what its
+ * `/name` tokens loaded, absent when none did.
  */
  | {
     type: 'planner_turn_started';
     turnId: string;
     prompt?: string;
+    skills?: SkillLoadNotice[];
+} | {
+    type: 'planner_skill_loaded';
+    turnId: string;
+    skill: SkillLoadNotice;
 }
 /**
  * A planner turn is over; nothing more carries its `turnId`. Emitted exactly
@@ -511,8 +562,6 @@ type SessionMessage =
     };
 } | {
     type: 'execution_stopped';
-} | {
-    type: 'queue_ready';
 } | {
     type: 'task_updated';
     taskId: string;
@@ -533,7 +582,7 @@ type SessionMessage =
  * A structured task's log as it happens (ADR-0018, P1): the next events of
  * the task's attempt `attempt`, in order — the same ones appended to that
  * attempt's file, so a surface folding these and one replaying the file
- * draw the same blocks. Terminal-transport tasks send none.
+ * draw the same blocks.
  */
  | {
     type: 'task_log';
@@ -607,6 +656,9 @@ type SessionNotice = {
 type SessionBroadcaster = (msg: SessionMessage) => void;
 declare function serializeTask(t: Task): SerializedTask;
 declare function serializeTaskStatus(t: Task, idleSince?: string | null, isolation?: TaskIsolation | null, queued?: readonly QueuedTaskMessage[], awaitingApproval?: number, mergeGate?: readonly string[], checkpoint?: string): SerializedTaskStatus;
+/** The one place a plan's skill bodies come off before it leaves the session: every wire path that carries plan state goes through here. */
+declare function surfacePlan(plan: LegacyPlanState): SurfacePlan;
+declare function surfacePlanState(state: PlanState): SurfacePlanState;
 declare function serializePlan(plan: LegacyPlanState): SerializedPlan;
 declare function executionSummary(tasks: readonly Task[]): {
     total: number;
@@ -641,7 +693,7 @@ declare function classifyOutcome(success: boolean, output: string): ResearchStep
  * the block exists, so a surface can key its own UI state on it — whether a
  * block is expanded is that UI state, and deliberately not part of a block.
  */
-type DisplayBlock = MessageBlock | ThinkingDisplayBlock | ToolBlock | SubagentBlock | ApprovalBlock | PlanBlock | UsageBlock;
+type DisplayBlock = MessageBlock | ThinkingDisplayBlock | ToolBlock | SubagentBlock | ApprovalBlock | PlanBlock | SkillLoadBlock | UsageBlock;
 /** `agent` is a task runner speaking in a structured task's log (ADR-0018); the planner is `planner`. */
 type MessageRole = 'user' | 'planner' | 'agent' | 'system' | 'error';
 interface MessageBlock {
@@ -658,6 +710,8 @@ interface MessageBlock {
      * it is the final segment, and never saved to the transcript.
      */
     segmentId?: string;
+    /** A user's message: the skills its `/name` tokens loaded, for a surface to mark those tokens (see `loadedSkillTokens`). */
+    skills?: readonly string[];
 }
 interface ThinkingDisplayBlock {
     type: 'thinking';
@@ -758,6 +812,12 @@ interface PlanBlock {
     /** While building: the segment whose envelope is streaming, which a retraction of that segment takes back. */
     segmentId?: string;
 }
+/** A skill loaded into the conversation: one line naming it and the SKILL.md that won. Its body is never shown. */
+interface SkillLoadBlock extends SkillLoadNotice {
+    type: 'skill_load';
+    id: string;
+    turnId?: string;
+}
 /** The token line. There is at most one, and it is always the last block. */
 interface UsageBlock {
     type: 'usage';
@@ -813,7 +873,7 @@ declare function reduceConversation(view: ConversationView, input: ConversationI
  * The research log interleaves with the transcript by time. Entries older than
  * a compaction's first kept message went with the turns it condensed.
  */
-declare function fromTranscript(conversationHistory: readonly ConversationMessage[] | undefined, researchLog: readonly ResearchLogEntry[] | undefined, plannerUsage?: PlannerUsage): ConversationView;
+declare function fromTranscript(conversationHistory: readonly SerializedConversationMessage[] | undefined, researchLog: readonly ResearchLogEntry[] | undefined, plannerUsage?: PlannerUsage): ConversationView;
 
 /**
  * What a surface draws for one attempt of a structured task (ADR-0018, O1b):
@@ -953,6 +1013,21 @@ declare function hasHiddenDetail(blocks: readonly DisplayBlock[]): boolean;
 /** The conversation line for a task starting, worded the same on every surface. */
 declare function taskStartedNotice(title: string, runner?: string): string;
 
+/** Where a skill name is invoked: `start` is its `/`, `end` is just past the name, before any punctuation. */
+interface SkillToken {
+    name: string;
+    start: number;
+    end: number;
+}
+/**
+ * The first `/name` token for each name in `text`, names lower-cased. Only
+ * the first counts because a skill loads once per message however often it is
+ * named, so a later repeat is plain text.
+ */
+declare function skillTokens(text: string): SkillToken[];
+/** The tokens in a sent message that loaded one of `loaded` — what a surface highlights in the user's bubble. */
+declare function loadedSkillTokens(text: string, loaded: readonly string[]): SkillToken[];
+
 /**
  * What a row's status means to a reader, before any surface picks a word,
  * icon or colour for it. `quiet` is a running task whose runner has printed
@@ -1144,4 +1219,4 @@ interface NewTaskFields {
  */
 declare function newTaskFields(title: string, prompt?: string): NewTaskFields | null;
 
-export { aheadOfDraft as $, type ApplyTaskOpsResult as A, type TaskRef as B, CHECKPOINT_TRUNCATE_LENGTH as C, type DiffRow as D, EMPTY_CONVERSATION as E, type TaskRowAction as F, type GatedConversation as G, type TaskRowContext as H, type TaskRowIsolation as I, type TaskRowKind as J, type TaskRowPlacement as K, type LocalEntry as L, type MergeGateView as M, NOT_STARTED as N, type OutputPreview as O, type PlanBlock as P, type TaskRowSubject as Q, type TaskRowView as R, type SerializedPlan as S, type TakenPrompt as T, type TaskStatusKind as U, type ThinkingDisplayBlock as V, type ToolBlock as W, type ToolHeadline as X, type ToolStatus as Y, type TurnGate as Z, type UsageBlock as _, type ApprovalBlock as a, applyTaskOps as a0, approvalLabel as a1, awaitingLabel as a2, canMergeTasks as a3, canSetDependencies as a4, canSplitTask as a5, capConflictFiles as a6, classifyOutcome as a7, coalesceTaskLog as a8, dependencyCandidates as a9, serializePlan as aA, serializeTask as aB, serializeTaskStatus as aC, stopTurn as aD, summarizeToolCall as aE, taskRowActions as aF, taskRowView as aG, taskStartedNotice as aH, taskStatusKind as aI, textHasTaskOps as aJ, titledRefs as aK, toTaskLogEvent as aL, toolHeadline as aM, trimToolOutput as aN, truncateCheckpointSummary as aO, unsendAll as aP, unsendLatest as aQ, dependentsNotice as aa, dependentsOf as ab, diffRows as ac, diffStat as ad, diffSummary as ae, digestTaskLog as af, drainNext as ag, executionSummary as ah, followTurn as ai, fromTranscript as aj, hasHiddenDetail as ak, holdPrompt as al, isTaskRunning as am, markAction as an, markRequestFor as ao, namedRepos as ap, newTaskFields as aq, opsEditable as ar, outputLines as as, outputPreview as at, parseTaskOpsJson as au, pastGateConfirmation as av, reduceConversation as aw, reduceTaskLog as ax, replayTaskLog as ay, runnerToolSubject as az, type ApprovalStatus as b, type ConversationInput as c, type ConversationView as d, type DiffRowKind as e, type DiffStat as f, type DisplayBlock as g, EMPTY_HOLD as h, EMPTY_TASK_LOG as i, type MessageBlock as j, type MessageRole as k, NO_TURN as l, type NewTaskFields as m, type PlanMarkerStatus as n, type PromptHold as o, type SerializedTask as p, type SerializedTaskStatus as q, type SessionBroadcaster as r, type SessionMessage as s, type SessionNotice as t, type SubagentBlock as u, type SubagentChild as v, type SubagentStatus as w, type TaskLogEvent as x, type TaskLogView as y, type TaskOp as z };
+export { type TaskRowView as $, type ApplyTaskOpsResult as A, type SubagentChild as B, CHECKPOINT_TRUNCATE_LENGTH as C, type DiffRow as D, EMPTY_CONVERSATION as E, type SubagentStatus as F, type GatedConversation as G, type SurfacePlan as H, type SurfacePlanState as I, type SurfaceTask as J, type TaskLogEvent as K, type LocalEntry as L, type MergeGateView as M, NOT_STARTED as N, type OutputPreview as O, type PlanBlock as P, type TaskLogView as Q, type TaskOp as R, type SerializedConversationMessage as S, type TakenPrompt as T, type TaskRef as U, type TaskRowAction as V, type TaskRowContext as W, type TaskRowIsolation as X, type TaskRowKind as Y, type TaskRowPlacement as Z, type TaskRowSubject as _, type ApprovalBlock as a, truncateCheckpointSummary as a$, type TaskStatusKind as a0, type ThinkingDisplayBlock as a1, type ToolBlock as a2, type ToolHeadline as a3, type ToolStatus as a4, type TurnGate as a5, type UsageBlock as a6, aheadOfDraft as a7, applyTaskOps as a8, approvalLabel as a9, opsEditable as aA, outputLines as aB, outputPreview as aC, parseTaskOpsJson as aD, pastGateConfirmation as aE, reduceConversation as aF, reduceTaskLog as aG, replayTaskLog as aH, runnerToolSubject as aI, serializePlan as aJ, serializeTask as aK, serializeTaskStatus as aL, skillTokens as aM, stopTurn as aN, summarizeToolCall as aO, surfacePlan as aP, surfacePlanState as aQ, taskLogForSurface as aR, taskRowActions as aS, taskRowView as aT, taskStartedNotice as aU, taskStatusKind as aV, textHasTaskOps as aW, titledRefs as aX, toTaskLogEvent as aY, toolHeadline as aZ, trimToolOutput as a_, awaitingLabel as aa, canMergeTasks as ab, canSetDependencies as ac, canSplitTask as ad, capConflictFiles as ae, classifyOutcome as af, coalesceTaskLog as ag, dependencyCandidates as ah, dependentsNotice as ai, dependentsOf as aj, diffRows as ak, diffStat as al, diffSummary as am, digestTaskLog as an, drainNext as ao, executionSummary as ap, followTurn as aq, fromTranscript as ar, hasHiddenDetail as as, holdPrompt as at, isTaskRunning as au, loadedSkillTokens as av, markAction as aw, markRequestFor as ax, namedRepos as ay, newTaskFields as az, type ApprovalStatus as b, unsendAll as b0, unsendLatest as b1, type ConversationInput as c, type ConversationView as d, type DiffRowKind as e, type DiffStat as f, type DisplayBlock as g, EMPTY_HOLD as h, EMPTY_TASK_LOG as i, type EditCatalog as j, type MessageBlock as k, type MessageRole as l, NO_TURN as m, type NewTaskFields as n, type PlanMarkerStatus as o, type PromptHold as p, type SerializedPlan as q, type SerializedQueuedMessage as r, type SerializedTask as s, type SerializedTaskStatus as t, type SessionBroadcaster as u, type SessionMessage as v, type SessionNotice as w, type SkillLoadBlock as x, type SkillToken as y, type SubagentBlock as z };

package/dist/{plan-utils--kQRzSE-.d.ts → plan-utils-Cv48fe7r.d.ts}

@@ -1,5 +1,6 @@
-import { bb as StructuredTurnEnd, bd as SubagentOutcome, bE as UsageRecord, k as ApprovalDecision, b9 as StructuredEvent, a$ as RunnerId, y as DiscoveredModel, bh as Task, ab as LegacyPlanState, aQ as QueuedMessage, bF as UsageTotals, bL as Verdict, bj as TaskIsolation, by as TaskTransport, r as AwaitingReason, aR as QueuedTaskMessage, T as IsolationHandoff, _ as IsolationMergeResult, aX as ResearchStep, l as ApprovalKind, q as ApprovalSource, aY as ResearchStepOutcome, w as ConversationMessage, aV as ResearchLogEntry, aB as PlannerUsage, bk as TaskIsolationState } from './Task-BnLxkVQF.js';
-import { R as RunnerModeInfo } from './ModeResolver-DkMYf4uS.js';
+import { ag as TaskSkillSnapshot, af as TaskSkillNotice, a8 as SubagentOutcome, ao as UsageRecord, W as RunnerId, c as DiscoveredModel, a9 as Task, L as LegacyPlanState, C as ConversationMessage, a0 as SkillLoadNotice, Q as QueuedMessage, ap as UsageTotals, av as Verdict, aa as TaskIsolation, a as AwaitingReason, g as IsolationHandoff, n as IsolationMergeResult, T as ResearchStep, z as PlanState, ah as TaskSnapshot, U as ResearchStepOutcome, O as ResearchLogEntry, G as PlannerUsage, ab as TaskIsolationState } from './Task-1Q19y7sZ.js';
+import { R as RunnerModeInfo } from './ModeResolver-EWlpmVAy.js';
+import { a5 as StructuredTurnEnd, h as ApprovalDecision, a4 as StructuredEvent, Y as QueuedTaskMessage, i as ApprovalKind, n as ApprovalSource } from './IRunner-CGCihlGQ.js';
 import './order-labels.js';
 
 /**
@@ -12,8 +13,17 @@ import './order-labels.js';
  * without a format version.
  */
 type TaskLogEvent = 
-/** A turn began by delivering `message`; `messageId` names it when it had been queued, `forced` when it was force sent. */
+/**
+ * The task skills this attempt's prompt carried, as read at its spawn
+ * (ADR-0024): first in its log. The file keeps their bodies; a surface is
+ * sent notices ({@link taskLogForSurface}).
+ */
 {
+    type: 'task_skills';
+    skills: TaskSkillSnapshot[] | TaskSkillNotice[];
+}
+/** A turn began by delivering `message`; `messageId` names it when it had been queued, `forced` when it was force sent. */
+ | {
     type: 'turn_start';
     message: string;
     messageId?: string;
@@ -142,6 +152,8 @@ declare function trimToolOutput(output: string): {
  * keep: background-agent launches, which the subagent's own events already show.
  */
 declare function toTaskLogEvent(event: StructuredEvent): TaskLogEvent | null;
+/** A log as a surface is sent it, live or read back: everything but the skills' bodies. */
+declare function taskLogForSurface(events: readonly TaskLogEvent[]): TaskLogEvent[];
 /**
  * Merge runs of deltas into one event each. Deltas arrive a few characters at
  * a time; merged, a batch is one message on the wire and one line on disk,
@@ -285,8 +297,6 @@ type SerializedTaskStatus = {
     idleSince?: string | null;
     /** Absent unless the plan has an isolation run, so a shared-root plan's updates are unchanged. */
     isolation?: TaskIsolation;
-    /** Absent unless the task's plan asked for the structured transport (ADR-0018): what it ran on, or why it fell back. */
-    transport?: Pick<TaskTransport, 'kind' | 'fallback'>;
     /** What an `awaiting_user` task waits on, when it was saved (ADR-0018, W1). */
     awaitingReason?: AwaitingReason;
     /** The whole question of the checkpoint the task waits at; absent when it waits at none. */
@@ -339,14 +349,49 @@ type SerializedTask = {
     userStoriesCovered: Task['userStoriesCovered'];
     /** Set only on an ops task (ADR-0020). */
     ops?: true;
+    /** Task skills attached by name; absent when none. */
+    skills?: string[];
+};
+/** Skill loads go out as notices: their bodies are for the planner, and stay in the session. */
+type SerializedConversationMessage = Omit<ConversationMessage, 'skill'> & {
+    skill?: SkillLoadNotice;
+};
+type SerializedQueuedMessage = Omit<QueuedMessage, 'skills'> & {
+    skills?: SkillLoadNotice[];
+};
+/**
+ * A task as a surface is sent it: its attempt's skills are notices, whole in
+ * the session only, and its runner session id stays there too — no surface shows it,
+ * and only a continue reads the runner's own session id.
+ */
+type SurfaceTask<T extends Task = Task> = Omit<T, 'attemptSkills' | 'subtasks' | 'runnerSessionId'> & {
+    attemptSkills?: TaskSkillNotice[];
+    subtasks: SurfaceTask[];
+};
+/** A plan as the daemon and the VS Code webview are sent it: the session's own state, minus every skill body. */
+type SurfacePlan = Omit<LegacyPlanState, 'tasks' | 'conversationHistory' | 'queuedMessages'> & {
+    tasks: SurfaceTask[];
+    conversationHistory?: SerializedConversationMessage[];
+    queuedMessages?: SerializedQueuedMessage[];
 };
+/** The phase-tagged shape of {@link SurfacePlan}. */
+type SurfacePlanState = (Omit<Extract<PlanState, {
+    phase: 'planning';
+}>, 'pendingTasks'> & {
+    pendingTasks: SurfaceTask[];
+}) | (Omit<Extract<PlanState, {
+    phase: 'executing';
+}>, 'pendingTasks' | 'executionLog'> & {
+    pendingTasks: SurfaceTask[];
+    executionLog: SurfaceTask<TaskSnapshot>[];
+});
 type SerializedPlan = {
     tasks: SerializedTask[];
     runners: RunnerId[];
     generatedAt: string;
-    conversationHistory?: LegacyPlanState['conversationHistory'];
+    conversationHistory?: SerializedConversationMessage[];
     prdMarkdown?: string;
-    queuedMessages?: QueuedMessage[];
+    queuedMessages?: SerializedQueuedMessage[];
 };
 /** How a planner turn ended: the reply kind it settled on, a user stop, or a failure. */
 type PlannerTurnOutcome = 'message' | 'plan' | 'task_ops' | 'stopped' | 'error';
@@ -392,12 +437,18 @@ type SessionMessage =
 /**
  * A planner turn began. Emitted once per turn by whoever runs the turn,
  * before any other message carrying its `turnId`. `prompt` is the user's
- * message when the turn answers one.
+ * message, as typed, when the turn answers one; `skills` are what its
+ * `/name` tokens loaded, absent when none did.
  */
  | {
     type: 'planner_turn_started';
     turnId: string;
     prompt?: string;
+    skills?: SkillLoadNotice[];
+} | {
+    type: 'planner_skill_loaded';
+    turnId: string;
+    skill: SkillLoadNotice;
 }
 /**
  * A planner turn is over; nothing more carries its `turnId`. Emitted exactly
@@ -511,8 +562,6 @@ type SessionMessage =
     };
 } | {
     type: 'execution_stopped';
-} | {
-    type: 'queue_ready';
 } | {
     type: 'task_updated';
     taskId: string;
@@ -533,7 +582,7 @@ type SessionMessage =
  * A structured task's log as it happens (ADR-0018, P1): the next events of
  * the task's attempt `attempt`, in order — the same ones appended to that
  * attempt's file, so a surface folding these and one replaying the file
- * draw the same blocks. Terminal-transport tasks send none.
+ * draw the same blocks.
  */
  | {
     type: 'task_log';
@@ -607,6 +656,9 @@ type SessionNotice = {
 type SessionBroadcaster = (msg: SessionMessage) => void;
 declare function serializeTask(t: Task): SerializedTask;
 declare function serializeTaskStatus(t: Task, idleSince?: string | null, isolation?: TaskIsolation | null, queued?: readonly QueuedTaskMessage[], awaitingApproval?: number, mergeGate?: readonly string[], checkpoint?: string): SerializedTaskStatus;
+/** The one place a plan's skill bodies come off before it leaves the session: every wire path that carries plan state goes through here. */
+declare function surfacePlan(plan: LegacyPlanState): SurfacePlan;
+declare function surfacePlanState(state: PlanState): SurfacePlanState;
 declare function serializePlan(plan: LegacyPlanState): SerializedPlan;
 declare function executionSummary(tasks: readonly Task[]): {
     total: number;
@@ -641,7 +693,7 @@ declare function classifyOutcome(success: boolean, output: string): ResearchStep
  * the block exists, so a surface can key its own UI state on it — whether a
  * block is expanded is that UI state, and deliberately not part of a block.
  */
-type DisplayBlock = MessageBlock | ThinkingDisplayBlock | ToolBlock | SubagentBlock | ApprovalBlock | PlanBlock | UsageBlock;
+type DisplayBlock = MessageBlock | ThinkingDisplayBlock | ToolBlock | SubagentBlock | ApprovalBlock | PlanBlock | SkillLoadBlock | UsageBlock;
 /** `agent` is a task runner speaking in a structured task's log (ADR-0018); the planner is `planner`. */
 type MessageRole = 'user' | 'planner' | 'agent' | 'system' | 'error';
 interface MessageBlock {
@@ -658,6 +710,8 @@ interface MessageBlock {
      * it is the final segment, and never saved to the transcript.
      */
     segmentId?: string;
+    /** A user's message: the skills its `/name` tokens loaded, for a surface to mark those tokens (see `loadedSkillTokens`). */
+    skills?: readonly string[];
 }
 interface ThinkingDisplayBlock {
     type: 'thinking';
@@ -758,6 +812,12 @@ interface PlanBlock {
     /** While building: the segment whose envelope is streaming, which a retraction of that segment takes back. */
     segmentId?: string;
 }
+/** A skill loaded into the conversation: one line naming it and the SKILL.md that won. Its body is never shown. */
+interface SkillLoadBlock extends SkillLoadNotice {
+    type: 'skill_load';
+    id: string;
+    turnId?: string;
+}
 /** The token line. There is at most one, and it is always the last block. */
 interface UsageBlock {
     type: 'usage';
@@ -813,7 +873,7 @@ declare function reduceConversation(view: ConversationView, input: ConversationI
  * The research log interleaves with the transcript by time. Entries older than
  * a compaction's first kept message went with the turns it condensed.
  */
-declare function fromTranscript(conversationHistory: readonly ConversationMessage[] | undefined, researchLog: readonly ResearchLogEntry[] | undefined, plannerUsage?: PlannerUsage): ConversationView;
+declare function fromTranscript(conversationHistory: readonly SerializedConversationMessage[] | undefined, researchLog: readonly ResearchLogEntry[] | undefined, plannerUsage?: PlannerUsage): ConversationView;
 
 /**
  * What a surface draws for one attempt of a structured task (ADR-0018, O1b):
@@ -953,6 +1013,21 @@ declare function hasHiddenDetail(blocks: readonly DisplayBlock[]): boolean;
 /** The conversation line for a task starting, worded the same on every surface. */
 declare function taskStartedNotice(title: string, runner?: string): string;
 
+/** Where a skill name is invoked: `start` is its `/`, `end` is just past the name, before any punctuation. */
+interface SkillToken {
+    name: string;
+    start: number;
+    end: number;
+}
+/**
+ * The first `/name` token for each name in `text`, names lower-cased. Only
+ * the first counts because a skill loads once per message however often it is
+ * named, so a later repeat is plain text.
+ */
+declare function skillTokens(text: string): SkillToken[];
+/** The tokens in a sent message that loaded one of `loaded` — what a surface highlights in the user's bubble. */
+declare function loadedSkillTokens(text: string, loaded: readonly string[]): SkillToken[];
+
 /**
  * What a row's status means to a reader, before any surface picks a word,
  * icon or colour for it. `quiet` is a running task whose runner has printed
@@ -1144,4 +1219,4 @@ interface NewTaskFields {
  */
 declare function newTaskFields(title: string, prompt?: string): NewTaskFields | null;
 
-export { aheadOfDraft as $, type ApplyTaskOpsResult as A, type TaskRef as B, CHECKPOINT_TRUNCATE_LENGTH as C, type DiffRow as D, EMPTY_CONVERSATION as E, type TaskRowAction as F, type GatedConversation as G, type TaskRowContext as H, type TaskRowIsolation as I, type TaskRowKind as J, type TaskRowPlacement as K, type LocalEntry as L, type MergeGateView as M, NOT_STARTED as N, type OutputPreview as O, type PlanBlock as P, type TaskRowSubject as Q, type TaskRowView as R, type SerializedPlan as S, type TakenPrompt as T, type TaskStatusKind as U, type ThinkingDisplayBlock as V, type ToolBlock as W, type ToolHeadline as X, type ToolStatus as Y, type TurnGate as Z, type UsageBlock as _, type ApprovalBlock as a, applyTaskOps as a0, approvalLabel as a1, awaitingLabel as a2, canMergeTasks as a3, canSetDependencies as a4, canSplitTask as a5, capConflictFiles as a6, classifyOutcome as a7, coalesceTaskLog as a8, dependencyCandidates as a9, serializePlan as aA, serializeTask as aB, serializeTaskStatus as aC, stopTurn as aD, summarizeToolCall as aE, taskRowActions as aF, taskRowView as aG, taskStartedNotice as aH, taskStatusKind as aI, textHasTaskOps as aJ, titledRefs as aK, toTaskLogEvent as aL, toolHeadline as aM, trimToolOutput as aN, truncateCheckpointSummary as aO, unsendAll as aP, unsendLatest as aQ, dependentsNotice as aa, dependentsOf as ab, diffRows as ac, diffStat as ad, diffSummary as ae, digestTaskLog as af, drainNext as ag, executionSummary as ah, followTurn as ai, fromTranscript as aj, hasHiddenDetail as ak, holdPrompt as al, isTaskRunning as am, markAction as an, markRequestFor as ao, namedRepos as ap, newTaskFields as aq, opsEditable as ar, outputLines as as, outputPreview as at, parseTaskOpsJson as au, pastGateConfirmation as av, reduceConversation as aw, reduceTaskLog as ax, replayTaskLog as ay, runnerToolSubject as az, type ApprovalStatus as b, type ConversationInput as c, type ConversationView as d, type DiffRowKind as e, type DiffStat as f, type DisplayBlock as g, EMPTY_HOLD as h, EMPTY_TASK_LOG as i, type MessageBlock as j, type MessageRole as k, NO_TURN as l, type NewTaskFields as m, type PlanMarkerStatus as n, type PromptHold as o, type SerializedTask as p, type SerializedTaskStatus as q, type SessionBroadcaster as r, type SessionMessage as s, type SessionNotice as t, type SubagentBlock as u, type SubagentChild as v, type SubagentStatus as w, type TaskLogEvent as x, type TaskLogView as y, type TaskOp as z };
+export { type TaskRowView as $, type ApplyTaskOpsResult as A, type SubagentChild as B, CHECKPOINT_TRUNCATE_LENGTH as C, type DiffRow as D, EMPTY_CONVERSATION as E, type SubagentStatus as F, type GatedConversation as G, type SurfacePlan as H, type SurfacePlanState as I, type SurfaceTask as J, type TaskLogEvent as K, type LocalEntry as L, type MergeGateView as M, NOT_STARTED as N, type OutputPreview as O, type PlanBlock as P, type TaskLogView as Q, type TaskOp as R, type SerializedConversationMessage as S, type TakenPrompt as T, type TaskRef as U, type TaskRowAction as V, type TaskRowContext as W, type TaskRowIsolation as X, type TaskRowKind as Y, type TaskRowPlacement as Z, type TaskRowSubject as _, type ApprovalBlock as a, truncateCheckpointSummary as a$, type TaskStatusKind as a0, type ThinkingDisplayBlock as a1, type ToolBlock as a2, type ToolHeadline as a3, type ToolStatus as a4, type TurnGate as a5, type UsageBlock as a6, aheadOfDraft as a7, applyTaskOps as a8, approvalLabel as a9, opsEditable as aA, outputLines as aB, outputPreview as aC, parseTaskOpsJson as aD, pastGateConfirmation as aE, reduceConversation as aF, reduceTaskLog as aG, replayTaskLog as aH, runnerToolSubject as aI, serializePlan as aJ, serializeTask as aK, serializeTaskStatus as aL, skillTokens as aM, stopTurn as aN, summarizeToolCall as aO, surfacePlan as aP, surfacePlanState as aQ, taskLogForSurface as aR, taskRowActions as aS, taskRowView as aT, taskStartedNotice as aU, taskStatusKind as aV, textHasTaskOps as aW, titledRefs as aX, toTaskLogEvent as aY, toolHeadline as aZ, trimToolOutput as a_, awaitingLabel as aa, canMergeTasks as ab, canSetDependencies as ac, canSplitTask as ad, capConflictFiles as ae, classifyOutcome as af, coalesceTaskLog as ag, dependencyCandidates as ah, dependentsNotice as ai, dependentsOf as aj, diffRows as ak, diffStat as al, diffSummary as am, digestTaskLog as an, drainNext as ao, executionSummary as ap, followTurn as aq, fromTranscript as ar, hasHiddenDetail as as, holdPrompt as at, isTaskRunning as au, loadedSkillTokens as av, markAction as aw, markRequestFor as ax, namedRepos as ay, newTaskFields as az, type ApprovalStatus as b, unsendAll as b0, unsendLatest as b1, type ConversationInput as c, type ConversationView as d, type DiffRowKind as e, type DiffStat as f, type DisplayBlock as g, EMPTY_HOLD as h, EMPTY_TASK_LOG as i, type EditCatalog as j, type MessageBlock as k, type MessageRole as l, NO_TURN as m, type NewTaskFields as n, type PlanMarkerStatus as o, type PromptHold as p, type SerializedPlan as q, type SerializedQueuedMessage as r, type SerializedTask as s, type SerializedTaskStatus as t, type SessionBroadcaster as u, type SessionMessage as v, type SessionNotice as w, type SkillLoadBlock as x, type SkillToken as y, type SubagentBlock as z };

package/dist/plan-utils.d.mts

@@ -1,7 +1,7 @@
-export { a as ApprovalBlock, b as ApprovalStatus, C as CHECKPOINT_TRUNCATE_LENGTH, c as ConversationInput, d as ConversationView, D as DiffRow, e as DiffRowKind, f as DiffStat, g as DisplayBlock, E as EMPTY_CONVERSATION, h as EMPTY_HOLD, i as EMPTY_TASK_LOG, G as GatedConversation, L as LocalEntry, j as MessageBlock, k as MessageRole, N as NOT_STARTED, l as NO_TURN, m as NewTaskFields, O as OutputPreview, P as PlanBlock, n as PlanMarkerStatus, o as PromptHold, u as SubagentBlock, v as SubagentChild, w as SubagentStatus, T as TakenPrompt, y as TaskLogView, B as TaskRef, F as TaskRowAction, H as TaskRowContext, I as TaskRowIsolation, J as TaskRowKind, K as TaskRowPlacement, Q as TaskRowSubject, R as TaskRowView, U as TaskStatusKind, V as ThinkingDisplayBlock, W as ToolBlock, X as ToolHeadline, Y as ToolStatus, Z as TurnGate, _ as UsageBlock, $ as aheadOfDraft, a1 as approvalLabel, a2 as awaitingLabel, a3 as canMergeTasks, a4 as canSetDependencies, a5 as canSplitTask, a6 as capConflictFiles, a9 as dependencyCandidates, aa as dependentsNotice, ab as dependentsOf, ac as diffRows, ad as diffStat, ae as diffSummary, ag as drainNext, ai as followTurn, aj as fromTranscript, ak as hasHiddenDetail, al as holdPrompt, am as isTaskRunning, an as markAction, ao as markRequestFor, ap as namedRepos, aq as newTaskFields, ar as opsEditable, as as outputLines, at as outputPreview, av as pastGateConfirmation, aw as reduceConversation, ax as reduceTaskLog, ay as replayTaskLog, az as runnerToolSubject, aD as stopTurn, aE as summarizeToolCall, aF as taskRowActions, aG as taskRowView, aH as taskStartedNotice, aI as taskStatusKind, aK as titledRefs, aM as toolHeadline, aO as truncateCheckpointSummary, aP as unsendAll, aQ as unsendLatest } from './plan-utils-CKgNtDwQ.mjs';
+export { a as ApprovalBlock, b as ApprovalStatus, C as CHECKPOINT_TRUNCATE_LENGTH, c as ConversationInput, d as ConversationView, D as DiffRow, e as DiffRowKind, f as DiffStat, g as DisplayBlock, E as EMPTY_CONVERSATION, h as EMPTY_HOLD, i as EMPTY_TASK_LOG, G as GatedConversation, L as LocalEntry, k as MessageBlock, l as MessageRole, N as NOT_STARTED, m as NO_TURN, n as NewTaskFields, O as OutputPreview, P as PlanBlock, o as PlanMarkerStatus, p as PromptHold, x as SkillLoadBlock, y as SkillToken, z as SubagentBlock, B as SubagentChild, F as SubagentStatus, T as TakenPrompt, Q as TaskLogView, U as TaskRef, V as TaskRowAction, W as TaskRowContext, X as TaskRowIsolation, Y as TaskRowKind, Z as TaskRowPlacement, _ as TaskRowSubject, $ as TaskRowView, a0 as TaskStatusKind, a1 as ThinkingDisplayBlock, a2 as ToolBlock, a3 as ToolHeadline, a4 as ToolStatus, a5 as TurnGate, a6 as UsageBlock, a7 as aheadOfDraft, a9 as approvalLabel, aa as awaitingLabel, ab as canMergeTasks, ac as canSetDependencies, ad as canSplitTask, ae as capConflictFiles, ah as dependencyCandidates, ai as dependentsNotice, aj as dependentsOf, ak as diffRows, al as diffStat, am as diffSummary, ao as drainNext, aq as followTurn, ar as fromTranscript, as as hasHiddenDetail, at as holdPrompt, au as isTaskRunning, av as loadedSkillTokens, aw as markAction, ax as markRequestFor, ay as namedRepos, az as newTaskFields, aA as opsEditable, aB as outputLines, aC as outputPreview, aE as pastGateConfirmation, aF as reduceConversation, aG as reduceTaskLog, aH as replayTaskLog, aI as runnerToolSubject, aM as skillTokens, aN as stopTurn, aO as summarizeToolCall, aS as taskRowActions, aT as taskRowView, aU as taskStartedNotice, aV as taskStatusKind, aX as titledRefs, aZ as toolHeadline, a$ as truncateCheckpointSummary, b0 as unsendAll, b1 as unsendLatest } from './plan-utils-BMayhGBj.mjs';
 export { taskOrderLabel, taskRef, titledTaskRef } from './order-labels.mjs';
-import './Task-BnLxkVQF.mjs';
+export { D as DEFAULT_RUNNERS } from './Task-1Q19y7sZ.mjs';
+import './ModeResolver-DE-o2lRF.mjs';
+import './IRunner-XVUddYVX.mjs';
 import 'child_process';
-import 'events';
 import 'zod/v4';
-import './ModeResolver-DZzJSdIU.mjs';

package/dist/plan-utils.d.ts

@@ -1,7 +1,7 @@
-export { a as ApprovalBlock, b as ApprovalStatus, C as CHECKPOINT_TRUNCATE_LENGTH, c as ConversationInput, d as ConversationView, D as DiffRow, e as DiffRowKind, f as DiffStat, g as DisplayBlock, E as EMPTY_CONVERSATION, h as EMPTY_HOLD, i as EMPTY_TASK_LOG, G as GatedConversation, L as LocalEntry, j as MessageBlock, k as MessageRole, N as NOT_STARTED, l as NO_TURN, m as NewTaskFields, O as OutputPreview, P as PlanBlock, n as PlanMarkerStatus, o as PromptHold, u as SubagentBlock, v as SubagentChild, w as SubagentStatus, T as TakenPrompt, y as TaskLogView, B as TaskRef, F as TaskRowAction, H as TaskRowContext, I as TaskRowIsolation, J as TaskRowKind, K as TaskRowPlacement, Q as TaskRowSubject, R as TaskRowView, U as TaskStatusKind, V as ThinkingDisplayBlock, W as ToolBlock, X as ToolHeadline, Y as ToolStatus, Z as TurnGate, _ as UsageBlock, $ as aheadOfDraft, a1 as approvalLabel, a2 as awaitingLabel, a3 as canMergeTasks, a4 as canSetDependencies, a5 as canSplitTask, a6 as capConflictFiles, a9 as dependencyCandidates, aa as dependentsNotice, ab as dependentsOf, ac as diffRows, ad as diffStat, ae as diffSummary, ag as drainNext, ai as followTurn, aj as fromTranscript, ak as hasHiddenDetail, al as holdPrompt, am as isTaskRunning, an as markAction, ao as markRequestFor, ap as namedRepos, aq as newTaskFields, ar as opsEditable, as as outputLines, at as outputPreview, av as pastGateConfirmation, aw as reduceConversation, ax as reduceTaskLog, ay as replayTaskLog, az as runnerToolSubject, aD as stopTurn, aE as summarizeToolCall, aF as taskRowActions, aG as taskRowView, aH as taskStartedNotice, aI as taskStatusKind, aK as titledRefs, aM as toolHeadline, aO as truncateCheckpointSummary, aP as unsendAll, aQ as unsendLatest } from './plan-utils--kQRzSE-.js';
+export { a as ApprovalBlock, b as ApprovalStatus, C as CHECKPOINT_TRUNCATE_LENGTH, c as ConversationInput, d as ConversationView, D as DiffRow, e as DiffRowKind, f as DiffStat, g as DisplayBlock, E as EMPTY_CONVERSATION, h as EMPTY_HOLD, i as EMPTY_TASK_LOG, G as GatedConversation, L as LocalEntry, k as MessageBlock, l as MessageRole, N as NOT_STARTED, m as NO_TURN, n as NewTaskFields, O as OutputPreview, P as PlanBlock, o as PlanMarkerStatus, p as PromptHold, x as SkillLoadBlock, y as SkillToken, z as SubagentBlock, B as SubagentChild, F as SubagentStatus, T as TakenPrompt, Q as TaskLogView, U as TaskRef, V as TaskRowAction, W as TaskRowContext, X as TaskRowIsolation, Y as TaskRowKind, Z as TaskRowPlacement, _ as TaskRowSubject, $ as TaskRowView, a0 as TaskStatusKind, a1 as ThinkingDisplayBlock, a2 as ToolBlock, a3 as ToolHeadline, a4 as ToolStatus, a5 as TurnGate, a6 as UsageBlock, a7 as aheadOfDraft, a9 as approvalLabel, aa as awaitingLabel, ab as canMergeTasks, ac as canSetDependencies, ad as canSplitTask, ae as capConflictFiles, ah as dependencyCandidates, ai as dependentsNotice, aj as dependentsOf, ak as diffRows, al as diffStat, am as diffSummary, ao as drainNext, aq as followTurn, ar as fromTranscript, as as hasHiddenDetail, at as holdPrompt, au as isTaskRunning, av as loadedSkillTokens, aw as markAction, ax as markRequestFor, ay as namedRepos, az as newTaskFields, aA as opsEditable, aB as outputLines, aC as outputPreview, aE as pastGateConfirmation, aF as reduceConversation, aG as reduceTaskLog, aH as replayTaskLog, aI as runnerToolSubject, aM as skillTokens, aN as stopTurn, aO as summarizeToolCall, aS as taskRowActions, aT as taskRowView, aU as taskStartedNotice, aV as taskStatusKind, aX as titledRefs, aZ as toolHeadline, a$ as truncateCheckpointSummary, b0 as unsendAll, b1 as unsendLatest } from './plan-utils-Cv48fe7r.js';
 export { taskOrderLabel, taskRef, titledTaskRef } from './order-labels.js';
-import './Task-BnLxkVQF.js';
+export { D as DEFAULT_RUNNERS } from './Task-1Q19y7sZ.js';
+import './ModeResolver-EWlpmVAy.js';
+import './IRunner-CGCihlGQ.js';
 import 'child_process';
-import 'events';
 import 'zod/v4';
-import './ModeResolver-DkMYf4uS.js';