@ordewell/core 0.4.15 → 0.4.17

package/dist/index.mjs

@@ -13,7 +13,7 @@ import {
   resolveTaskMode,
   runnerModesFrom,
   validatePlanModification
-} from "./chunk-UEJ3SZQ7.mjs";
+} from "./chunk-QJ63PD5K.mjs";
 import {
   CHECKPOINT_TRUNCATE_LENGTH,
   UPDATABLE_FIELDS,
@@ -37,7 +37,7 @@ import {
   textHasTaskOps,
   truncateCheckpointSummary,
   validateTaskEdit
-} from "./chunk-YTJ7EOV6.mjs";
+} from "./chunk-DV3YIKRA.mjs";
 import {
   PLAN_ENVELOPE_KEY,
   PlanParseError,
@@ -63,7 +63,7 @@ import {
   updateTaskInPlan,
   validateModifiedPlan,
   warningsText
-} from "./chunk-N6HTBUKG.mjs";
+} from "./chunk-T4KGVP4N.mjs";
 import {
   resolveOrderLabel,
   taskOrderLabel
@@ -9040,6 +9040,8 @@ var StdioAgentAdapter = class {
   exited = null;
   /** Set for the duration of a turn. Outside one, events are buffered rather than dropped. */
   turnEmit = null;
+  /** Set for the duration of a turn. Pinged on every raw line, whether or not `handleLine` turns it into an event. */
+  turnActivity = null;
   /**
    * Events the agent produced before its first turn — in practice the startup
    * warnings that arrive during the handshake. Dropping them hid the one
@@ -9086,12 +9088,15 @@ var StdioAgentAdapter = class {
       windowsVerbatimArguments: launch.verbatim
     });
     this.process.stdout?.on("data", (chunk) => {
-      this.stdout.push(chunk.toString(), (line) => this.handleLine(line, (event) => {
-        if (this.turnEmit) this.turnEmit(event);
-        else if (!this.hadTurn && !TURN_SCOPED_EVENTS.has(event.type) && this.betweenTurns.length < BETWEEN_TURN_EVENT_CAP) {
-          this.betweenTurns.push(event);
-        }
-      }));
+      this.stdout.push(chunk.toString(), (line) => {
+        this.turnActivity?.();
+        this.handleLine(line, (event) => {
+          if (this.turnEmit) this.turnEmit(event);
+          else if (!this.hadTurn && !TURN_SCOPED_EVENTS.has(event.type) && this.betweenTurns.length < BETWEEN_TURN_EVENT_CAP) {
+            this.betweenTurns.push(event);
+          }
+        });
+      });
     });
     this.process.stderr?.on("data", (chunk) => {
       this.stderrTail = (this.stderrTail + chunk.toString()).slice(-STDERR_TAIL_CHARS);
@@ -9108,7 +9113,7 @@ ${err.message}`).slice(-STDERR_TAIL_CHARS);
     });
     await this.handshake(opts);
   }
-  async send(message, onEvent, signal) {
+  async send(message, onEvent, signal, onActivity) {
     if (!this.process) throw new Error(`${this.agentId} planner session is not started`);
     if (this.exited) {
       onEvent({ type: "error", message: this.exitMessage() });
@@ -9120,6 +9125,7 @@ ${err.message}`).slice(-STDERR_TAIL_CHARS);
         if (settled) return;
         settled = true;
         this.turnEmit = null;
+        this.turnActivity = null;
         this.hadTurn = true;
         signal?.removeEventListener("abort", onAbort);
         this.process?.removeListener("exit", onExit);
@@ -9141,6 +9147,7 @@ ${err.message}`).slice(-STDERR_TAIL_CHARS);
         finish();
       };
       this.turnEmit = emit;
+      this.turnActivity = onActivity ?? null;
       this.process.once("exit", onExit);
       this.process.once("error", onExit);
       if (signal?.aborted) {
@@ -9775,7 +9782,7 @@ ${this.stderrTail.trim()}` : ""}`);
     if (!created?.id) throw new Error("The OpenCode planner server did not return a session id.");
     this.sessionId = created.id;
   }
-  async send(message, onEvent, signal) {
+  async send(message, onEvent, signal, onActivity) {
     if (!this.baseUrl || !this.sessionId) throw new Error("OpenCode planner session is not started");
     if (this.exited) {
       onEvent({ type: "error", message: this.exitMessage() });
@@ -9795,7 +9802,8 @@ ${this.stderrTail.trim()}` : ""}`);
         if (part.type === "tool") this.emitPart(part, seen, onEvent);
       },
       (ask) => this.denyPermission(ask, seen, onEvent),
-      connected
+      connected,
+      onActivity
     );
     await Promise.race([streamReady, new Promise((r) => {
       const t = setTimeout(r, STREAM_CONNECT_TIMEOUT_MS);
@@ -9910,7 +9918,7 @@ ${part.text}` : part.text });
    * the settled POST repeats it — but permission requests arrive nowhere else,
    * so the stream is load-bearing for {@link denyPermission}.
    */
-  async streamEvents(signal, onPart, onPermission, onConnected) {
+  async streamEvents(signal, onPart, onPermission, onConnected, onActivity) {
     const response = await this.deps.fetch(`${this.baseUrl}/event`, { signal }).catch(() => null);
     const body = response?.body;
     if (!body) {
@@ -9924,6 +9932,7 @@ ${part.text}` : part.text });
     for (; ; ) {
       const { done, value } = await reader.read().catch(() => ({ done: true, value: void 0 }));
       if (done) return;
+      onActivity?.();
       buffer += decoder.decode(value, { stream: true });
       let newline;
       while ((newline = buffer.indexOf("\n")) >= 0) {
@@ -10318,7 +10327,7 @@ var CliAgentAiService = class {
         case "turn_end":
           return;
       }
-    }, signal);
+    }, signal, () => onProgress({ type: "liveness" }));
     for (const id of [...pendingCalls.keys()]) {
       settle(id, "The agent ended the turn without reporting this call's result.", false, "not_executed");
     }
@@ -10743,7 +10752,7 @@ function builtinSkillsDir() {
 }
 
 // src/services/SkillsService.ts
-var BUILTIN_SKILL_NAMES = ["grilling", "to-spec"];
+var BUILTIN_SKILL_NAMES = ["grilling", "to-spec", "improve-codebase-architecture"];
 var RETIRED_BUILTIN_SKILL_NAMES = ["grill-me"];
 function parseSkillFile(filePath, name, source) {
   const raw = fs4.readFileSync(filePath, "utf8");
@@ -11097,16 +11106,27 @@ var PlanEditError = class extends Error {
 function sessionRuntimeSettings(settings) {
   return { ...plannerRuntimeToggles(settings), modelAllowlist: settings.modelAllowlist };
 }
+var SKILL_TOKEN = /(^|\s)\/([a-z][a-z0-9_-]*)([,.!?;:]*)(?=\s|$)/gi;
 function resolveSkillInvocation(text, skillsService) {
-  const match = text.trim().match(/^\/([a-z][a-z0-9_-]*)$/im);
-  if (!match) return text;
-  const skillName = match[1].toLowerCase();
-  const skill = skillsService.findSkill(skillName);
-  if (!skill) {
-    const available = typeof skillsService.listSkills === "function" ? skillsService.listSkills().map((s) => s.name).join(", ") : "";
-    return `Unknown skill: ${skillName}. Available skills: ${available}`;
-  }
-  return skill.content;
+  const bareMatch = text.trim().match(/^\/([a-z][a-z0-9_-]*)$/im);
+  if (bareMatch) {
+    const skillName = bareMatch[1].toLowerCase();
+    const skill = skillsService.findSkill(skillName);
+    if (!skill) {
+      const available = typeof skillsService.listSkills === "function" ? skillsService.listSkills().map((s) => s.name).join(", ") : "";
+      return `Unknown skill: ${skillName}. Available skills: ${available}`;
+    }
+    return skill.content;
+  }
+  const expanded = /* @__PURE__ */ new Set();
+  return text.replace(SKILL_TOKEN, (full, lead, name, punct) => {
+    const skillName = name.toLowerCase();
+    if (expanded.has(skillName)) return full;
+    const skill = skillsService.findSkill(skillName);
+    if (!skill) return full;
+    expanded.add(skillName);
+    return `${lead}${skill.content}${punct}`;
+  });
 }
 var Session = class {
   /** Injected by a test; when present it is the service, forever. */
@@ -11278,6 +11298,9 @@ var Session = class {
     };
   }
   translateProgress(progress) {
+    if (progress.type === "liveness") {
+      this.broadcast({ type: "planner_liveness" });
+    }
     if (progress.type === "thinking" && progress.text) {
       this.broadcast({ type: "plan_thinking", text: progress.text });
     }