@ordewell/core 0.7.2 → 0.8.0

package/dist/plan-utils.js

@@ -46,6 +46,7 @@ __export(plan_utils_exports, {
   hasHiddenDetail: () => hasHiddenDetail,
   holdPrompt: () => holdPrompt,
   isTaskRunning: () => isTaskRunning,
+  loadedSkillTokens: () => loadedSkillTokens,
   markAction: () => markAction,
   markRequestFor: () => markRequestFor,
   namedRepos: () => namedRepos,
@@ -58,6 +59,7 @@ __export(plan_utils_exports, {
   reduceTaskLog: () => reduceTaskLog,
   replayTaskLog: () => replayTaskLog,
   runnerToolSubject: () => runnerToolSubject,
+  skillTokens: () => skillTokens,
   stopTurn: () => stopTurn,
   summarizeToolCall: () => summarizeToolCall,
   taskOrderLabel: () => taskOrderLabel,
@@ -81,6 +83,25 @@ var import_uuid2 = require("uuid");
 // src/models/Task.ts
 var import_uuid = require("uuid");
 
+// src/conversation/skillTokens.ts
+var SKILL_NAME_PATTERN = "[a-z0-9][a-z0-9_-]*";
+var SKILL_TOKEN = new RegExp(`(^|\\s)\\/(${SKILL_NAME_PATTERN})([,.!?;:]*)(?=\\s|$)`, "gi");
+function skillTokens(text2) {
+  const tokens = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const match of text2.matchAll(SKILL_TOKEN)) {
+    const name = match[2].toLowerCase();
+    if (seen.has(name)) continue;
+    seen.add(name);
+    const start = match.index + match[1].length;
+    tokens.push({ name, start, end: start + 1 + match[2].length });
+  }
+  return tokens;
+}
+function loadedSkillTokens(text2, loaded) {
+  return skillTokens(text2).filter((t) => loaded.includes(t.name));
+}
+
 // src/order-labels.ts
 function taskOrderLabel(task, parent) {
   return parent ? `${parent.order}.${task.order}` : String(task.order);
@@ -93,6 +114,7 @@ function titledTaskRef(task, parent) {
 }
 
 // src/models/Task.ts
+var SKILL_NAME = new RegExp(`^${SKILL_NAME_PATTERN}$`);
 var DEFAULT_RUNNERS = ["claude-code"];
 
 // src/taskRow/status.ts
@@ -258,63 +280,8 @@ function summarizeToolCall(tool, argsJson, toolLabel) {
   return display;
 }
 
-// src/services/SessionMessage.ts
-var CHECKPOINT_TRUNCATE_LENGTH = 120;
-function truncateCheckpointSummary(summary) {
-  const firstLine = summary.split("\n")[0].trim();
-  if (firstLine.length <= CHECKPOINT_TRUNCATE_LENGTH) return firstLine;
-  return firstLine.slice(0, CHECKPOINT_TRUNCATE_LENGTH - 1) + "\u2026";
-}
-
-// src/services/conflictFiles.ts
-function capConflictFiles(files, max = 5) {
-  return files.length <= max ? files.join(", ") : `${files.slice(0, max).join(", ")}, +${files.length - max} more`;
-}
-
-// src/models/Usage.ts
-var TOKEN_FIELDS = ["inputTokens", "outputTokens", "cachedInputTokens"];
-function addUsage(totals, record) {
-  const next = { ...totals };
-  for (const field of TOKEN_FIELDS) {
-    const reported = record[field];
-    if (reported !== void 0) next[field] = (totals[field] ?? 0) + reported;
-  }
-  if (record.reportedCost) {
-    const { amount, currency } = record.reportedCost;
-    next.reportedCost = { ...totals.reportedCost, [currency]: (totals.reportedCost?.[currency] ?? 0) + amount };
-  }
-  return next;
-}
-function addPlannerUsage(usage, record) {
-  const next = { ...usage, totals: addUsage(usage.totals, record) };
-  if (record.subagentId) {
-    next.bySubagent = { ...usage.bySubagent, [record.subagentId]: addUsage(usage.bySubagent?.[record.subagentId] ?? {}, record) };
-    return next;
-  }
-  if (record.inputTokens !== void 0) next.lastPromptTokens = record.inputTokens;
-  if (record.contextWindow !== void 0 && record.contextWindow > 0) next.contextWindow = record.contextWindow;
-  return next;
-}
-function isMeasured(totals) {
-  return totals.inputTokens !== void 0 || totals.outputTokens !== void 0 || totals.cachedInputTokens !== void 0 || Object.keys(totals.reportedCost ?? {}).length > 0;
-}
-function usageLine(usage) {
-  const contextFill = plannerContextFill(usage);
-  return {
-    totals: usage.totals,
-    ...usage.bySubagent ? { bySubagent: usage.bySubagent } : {},
-    ...contextFill ? { contextFill } : {}
-  };
-}
-function plannerContextFill(usage) {
-  if (usage.lastPromptTokens === void 0 || usage.contextWindow === void 0 || usage.contextWindow <= 0) return void 0;
-  return { usedTokens: usage.lastPromptTokens, windowTokens: usage.contextWindow };
-}
-
-// 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;
-
 // 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",
@@ -497,6 +464,16 @@ function normalizeAgentArgs(tool, args) {
 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 } : {} };
+}
+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",
@@ -548,6 +525,59 @@ function planMarker(content) {
   return { status: content.startsWith("Plan updated") ? "updated" : "generated", ...count ? { taskCount: Number(count[1]) } : {} };
 }
 
+// src/services/SessionMessage.ts
+var CHECKPOINT_TRUNCATE_LENGTH = 120;
+function truncateCheckpointSummary(summary) {
+  const firstLine = summary.split("\n")[0].trim();
+  if (firstLine.length <= CHECKPOINT_TRUNCATE_LENGTH) return firstLine;
+  return firstLine.slice(0, CHECKPOINT_TRUNCATE_LENGTH - 1) + "\u2026";
+}
+
+// src/services/conflictFiles.ts
+function capConflictFiles(files, max = 5) {
+  return files.length <= max ? files.join(", ") : `${files.slice(0, max).join(", ")}, +${files.length - max} more`;
+}
+
+// src/models/Usage.ts
+var TOKEN_FIELDS = ["inputTokens", "outputTokens", "cachedInputTokens"];
+function addUsage(totals, record) {
+  const next = { ...totals };
+  for (const field of TOKEN_FIELDS) {
+    const reported = record[field];
+    if (reported !== void 0) next[field] = (totals[field] ?? 0) + reported;
+  }
+  if (record.reportedCost) {
+    const { amount, currency } = record.reportedCost;
+    next.reportedCost = { ...totals.reportedCost, [currency]: (totals.reportedCost?.[currency] ?? 0) + amount };
+  }
+  return next;
+}
+function addPlannerUsage(usage, record) {
+  const next = { ...usage, totals: addUsage(usage.totals, record) };
+  if (record.subagentId) {
+    next.bySubagent = { ...usage.bySubagent, [record.subagentId]: addUsage(usage.bySubagent?.[record.subagentId] ?? {}, record) };
+    return next;
+  }
+  if (record.inputTokens !== void 0) next.lastPromptTokens = record.inputTokens;
+  if (record.contextWindow !== void 0 && record.contextWindow > 0) next.contextWindow = record.contextWindow;
+  return next;
+}
+function isMeasured(totals) {
+  return totals.inputTokens !== void 0 || totals.outputTokens !== void 0 || totals.cachedInputTokens !== void 0 || Object.keys(totals.reportedCost ?? {}).length > 0;
+}
+function usageLine(usage) {
+  const contextFill = plannerContextFill(usage);
+  return {
+    totals: usage.totals,
+    ...usage.bySubagent ? { bySubagent: usage.bySubagent } : {},
+    ...contextFill ? { contextFill } : {}
+  };
+}
+function plannerContextFill(usage) {
+  if (usage.lastPromptTokens === void 0 || usage.contextWindow === void 0 || usage.contextWindow <= 0) return void 0;
+  return { usedTokens: usage.lastPromptTokens, windowTokens: usage.contextWindow };
+}
+
 // src/conversation/lanes.ts
 function findLastIndex(items, match) {
   for (let i = items.length - 1; i >= 0; i--) if (match(items[i])) return i;
@@ -682,13 +712,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);
@@ -835,7 +867,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":
@@ -875,11 +909,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);
@@ -942,7 +992,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);
@@ -1126,6 +1176,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":
@@ -1208,7 +1260,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;
@@ -1371,6 +1424,7 @@ function newTaskFields(title, prompt) {
   hasHiddenDetail,
   holdPrompt,
   isTaskRunning,
+  loadedSkillTokens,
   markAction,
   markRequestFor,
   namedRepos,
@@ -1383,6 +1437,7 @@ function newTaskFields(title, prompt) {
   reduceTaskLog,
   replayTaskLog,
   runnerToolSubject,
+  skillTokens,
   stopTurn,
   summarizeToolCall,
   taskOrderLabel,