@aparte/engine 0.13.1 → 0.15.0

package/dist/index.js

@@ -1,13 +1,3 @@
-const CLOSE_TAG = "</artifact>";
-const OPEN_TAG = "<artifact";
-function partialOpenTagLength(text) {
-  const max = Math.min(text.length, OPEN_TAG.length - 1);
-  for (let k = max; k > 0; k--) {
-    if (text.endsWith(OPEN_TAG.slice(0, k))) return k;
-  }
-  return 0;
-}
-const INLINE_MAX_LINES = 15;
 function deriveArtifactKind(mimeType, fallback = "unknown") {
   const m = (mimeType || "").toLowerCase().trim();
   const ant = m.match(/^application\/vnd\.ant\.([a-z0-9-]+)/);
@@ -30,119 +20,6 @@ function deriveArtifactKind(mimeType, fallback = "unknown") {
   if (m.includes("markdown")) return "markdown";
   return fallback;
 }
-class ArtifactXmlStateMachine {
-  constructor(hint, idGen) {
-    this.hint = hint;
-    this.idGen = idGen ?? (() => `artifact-xml-${this.seq++}`);
-  }
-  state = "normal";
-  /** Buffers the opening tag until its `>` arrives (may span deltas). */
-  scanBuf = "";
-  /** Buffers the tail that might be the start of a split `</artifact>`. */
-  closeBuf = "";
-  segId = null;
-  content = "";
-  mime = "";
-  kind = "";
-  title = "";
-  seq = 0;
-  idGen;
-  /** Feed one text delta; returns the ordered micro-events it produced. */
-  feed(delta) {
-    const out = [];
-    let remaining = delta;
-    while (remaining.length > 0) {
-      if (this.state === "normal") {
-        const tagStart = remaining.indexOf(OPEN_TAG);
-        if (tagStart === -1) {
-          const held = partialOpenTagLength(remaining);
-          if (held > 0) {
-            const before = remaining.slice(0, remaining.length - held);
-            if (before) out.push({ type: "chat-text", text: before, reduced: true });
-            this.scanBuf = remaining.slice(remaining.length - held);
-            this.state = "scanning";
-          } else {
-            out.push({ type: "chat-text", text: remaining });
-          }
-          remaining = "";
-        } else {
-          const before = remaining.slice(0, tagStart);
-          if (before) out.push({ type: "chat-text", text: before, reduced: true });
-          this.scanBuf = "";
-          remaining = remaining.slice(tagStart);
-          this.state = "scanning";
-        }
-      } else if (this.state === "scanning") {
-        this.scanBuf += remaining;
-        remaining = "";
-        const cmp = Math.min(this.scanBuf.length, OPEN_TAG.length);
-        if (this.scanBuf.slice(0, cmp) !== OPEN_TAG.slice(0, cmp)) {
-          out.push({ type: "chat-text", text: this.scanBuf });
-          this.scanBuf = "";
-          this.state = "normal";
-          continue;
-        }
-        const gtIdx = this.scanBuf.indexOf(">");
-        if (gtIdx !== -1) {
-          const tag = this.scanBuf.slice(0, gtIdx + 1);
-          this.mime = /mimeType=['"]([^'"]+)['"]/.exec(tag)?.[1] ?? this.hint.mimeType;
-          this.title = /title=['"]([^'"]+)['"]/.exec(tag)?.[1] ?? this.hint.kind;
-          this.kind = deriveArtifactKind(this.mime, this.hint.kind);
-          this.segId = this.idGen();
-          this.content = "";
-          out.push({ type: "artifact-open", id: this.segId, mimeType: this.mime, kind: this.kind, title: this.title });
-          this.state = "in-artifact";
-          remaining = this.scanBuf.slice(gtIdx + 1);
-          this.scanBuf = "";
-        }
-      } else {
-        const combined = this.closeBuf + remaining;
-        const closeIdx = combined.indexOf(CLOSE_TAG);
-        if (closeIdx !== -1) {
-          this.content += combined.slice(0, closeIdx);
-          const inline = this.content.split("\n").length < INLINE_MAX_LINES;
-          out.push({ type: "artifact-close", id: this.segId, content: this.content, inline });
-          this.state = "normal";
-          this.closeBuf = "";
-          remaining = combined.slice(closeIdx + CLOSE_TAG.length);
-        } else {
-          const safeLen = Math.max(0, combined.length - CLOSE_TAG.length + 1);
-          this.content += combined.slice(0, safeLen);
-          this.closeBuf = combined.slice(safeLen);
-          remaining = "";
-          if (this.segId) out.push({ type: "artifact-chunk", id: this.segId, content: this.content });
-        }
-      }
-    }
-    return out;
-  }
-  /**
-   * Flush a truncated artifact: if the stream ended mid-body (model cut off
-   * before `</artifact>`), emit a close with whatever was buffered. Mirrors the
-   * `XML artifact finalize` block in `AparteClient._streamLoop`.
-   */
-  finalize() {
-    if (this.state === "scanning") {
-      const text = this.scanBuf;
-      this.scanBuf = "";
-      this.state = "normal";
-      return text ? [{ type: "chat-text", text }] : [];
-    }
-    if (this.state === "in-artifact" && this.segId) {
-      this.content += this.closeBuf;
-      const inline = this.content.split("\n").length < INLINE_MAX_LINES;
-      const ev = { type: "artifact-close", id: this.segId, content: this.content, inline };
-      this.state = "normal";
-      this.closeBuf = "";
-      return [ev];
-    }
-    return [];
-  }
-  /** Current parser state (for the adapter to decide finalize routing). */
-  get currentState() {
-    return this.state;
-  }
-}
 const DEFAULT_TOOL_TIMEOUT_MS = 5 * 60 * 1e3;
 const DEFAULT_MAX_TURNS = 10;
 const warnedUnknownEvents = /* @__PURE__ */ new Set();
@@ -173,8 +50,6 @@ async function runStreamAgent(opts) {
     messages.push(message);
     opts.onHistoryAppend?.(message);
   };
-  const pipeline = baseRequest["_meta"]?.["pipeline"];
-  let pipelineIndex = 0;
   let continueLoop = true;
   let turns = 0;
   let lastUsage;
@@ -211,21 +86,7 @@ async function runStreamAgent(opts) {
       append({ role: "tool_result", content: outcome.content, toolCallId: syntheticId });
       baseRequest = { ...baseRequest, toolChoice: "none", tools: void 0 };
     }
-    let phaseMessages = messages;
-    let phaseMeta = baseRequest["_meta"];
-    if (pipeline && pipelineIndex < pipeline.length) {
-      const phase = pipeline[pipelineIndex];
-      phaseMessages = [{ role: "system", content: phase.system }, ...messages];
-      if (phase.mode === "artifact") {
-        phaseMeta = { ...phaseMeta, artifactRaw: { mimeType: phase.mimeType, kind: phase.kind } };
-      } else {
-        const rest = { ...phaseMeta ?? {} };
-        delete rest["artifactRaw"];
-        delete rest["pipeline"];
-        phaseMeta = rest;
-      }
-    }
-    const request = { ...baseRequest, messages: phaseMessages, _meta: phaseMeta };
+    const request = { ...baseRequest, messages };
     let response;
     try {
       response = await transportCall(request);
@@ -243,25 +104,14 @@ async function runStreamAgent(opts) {
       break;
     }
     emitter({ type: "turn-start" });
-    const rawHint = request["_meta"]?.["artifactRaw"];
-    let rawSegId = null;
-    let rawContent = "";
-    if (rawHint) {
-      rawSegId = idGen("artifact-raw");
-      emitter({ type: "artifact-open", id: rawSegId, mimeType: rawHint.mimeType, kind: rawHint.kind, title: rawHint.kind });
-    }
-    const xmlHint = request["_meta"]?.["artifactXml"];
-    const xmlMachine = xmlHint && !rawHint ? new ArtifactXmlStateMachine(xmlHint, () => idGen("artifact-xml")) : null;
-    const emitXml = (events) => {
-      for (const ev of events) {
-        if (ev.type === "chat-text") emitter({ type: "text-delta", delta: ev.text, ...ev.reduced ? { reduced: true } : {} });
-        else if (ev.type === "artifact-open") emitter({ type: "artifact-open", id: ev.id, mimeType: ev.mimeType, kind: ev.kind, title: ev.title });
-        else if (ev.type === "artifact-chunk") emitter({ type: "artifact-chunk", id: ev.id, content: ev.content });
-        else emitter({ type: "artifact-close", id: ev.id, content: ev.content, inline: ev.inline });
-      }
-    };
     let precedingText = "";
     const toolCallsThisTurn = [];
+    let envelope = null;
+    const ensureEnvelope = () => {
+      if (envelope) return;
+      envelope = { role: "tool_call", content: "", toolCalls: toolCallsThisTurn, precedingText: precedingText.trim() || void 0 };
+      append(envelope);
+    };
     const iterator = response[Symbol.asyncIterator]();
     const bailOnAbort = async () => {
       if (!signal.aborted) return false;
@@ -283,15 +133,6 @@ async function runStreamAgent(opts) {
         }
         if (event.type === "text") {
           precedingText += event.delta;
-          if (rawSegId) {
-            rawContent += event.delta;
-            emitter({ type: "artifact-chunk", id: rawSegId, content: rawContent });
-            continue;
-          }
-          if (xmlMachine) {
-            emitXml(xmlMachine.feed(event.delta));
-            continue;
-          }
           emitter({ type: "text-delta", delta: event.delta });
           continue;
         }
@@ -312,7 +153,7 @@ async function runStreamAgent(opts) {
           const mimeType = input.mimeType ?? "text/plain";
           const kind = deriveArtifactKind(mimeType, "text");
           emitter({ type: "artifact-ready", id: `artifact-${event.id}`, mimeType, kind, title: input.title ?? kind, content: input.content ?? "" });
-          append({ role: "tool_call", content: "", toolCalls: [{ id: event.id, name: event.name, input: event.input }] });
+          ensureEnvelope();
           append({ role: "tool_result", content: "Artifact created successfully.", toolCallId: event.id });
           continue;
         }
@@ -338,11 +179,18 @@ async function runStreamAgent(opts) {
             continueLoop = false;
             break;
           }
-          const decision = await approvalResolver(
-            { id: event.id, name: event.name, input: event.input },
-            signal
-          );
-          if (signal.aborted) {
+          let decision;
+          if (!signal.aborted) {
+            try {
+              decision = await approvalResolver(
+                { id: event.id, name: event.name, input: event.input },
+                signal
+              );
+            } catch (err) {
+              if (!signal.aborted && err?.name !== "AbortError") throw err;
+            }
+          }
+          if (signal.aborted || !decision) {
             emitter({ type: "tool-aborted", toolCallId: event.id });
             continueLoop = false;
             break;
@@ -350,7 +198,7 @@ async function runStreamAgent(opts) {
           if (!decision.approved) {
             const rejection = decision.instruction ? `The user rejected this tool call and said: ${decision.instruction}` : "Tool execution was rejected by the user.";
             emitter({ type: "tool-rejected", toolCallId: event.id, reason: rejection });
-            pushToolCallEnvelope(messages, append, toolCallsThisTurn, precedingText);
+            ensureEnvelope();
             append({ role: "tool_result", content: rejection, toolCallId: event.id });
             break;
           }
@@ -371,47 +219,20 @@ async function runStreamAgent(opts) {
           break;
         } else {
           emitter({ type: "tool-resolved", toolCallId: event.id, result: outcome.content });
-          pushToolCallEnvelope(messages, append, toolCallsThisTurn, precedingText);
+          ensureEnvelope();
           append({ role: "tool_result", content: outcome.content, toolCallId: event.id });
         }
       }
-      if (xmlMachine) emitXml(xmlMachine.finalize());
       emitter({ type: "text-flush" });
-      if (rawSegId) {
-        const inline = rawContent.split("\n").length < 15;
-        emitter({ type: "artifact-close", id: rawSegId, content: rawContent, inline });
-      }
     } finally {
       await iterator.return?.(void 0).catch(() => {
       });
     }
-    if (toolCallsThisTurn.length === 0) {
-      if (pipeline && pipelineIndex < pipeline.length - 1) {
-        if (precedingText.trim()) {
-          append({ role: "assistant", content: precedingText.trim() });
-        }
-        pipelineIndex++;
-        emitter({ type: "phase-advance", index: pipelineIndex });
-      } else {
-        continueLoop = false;
-      }
-    }
+    if (toolCallsThisTurn.length === 0) continueLoop = false;
   }
   emitter({ type: "run-done", usage: lastUsage });
   return lastUsage;
 }
-function pushToolCallEnvelope(messages, append, toolCallsThisTurn, precedingText) {
-  const exists = messages.some(
-    (m) => m.role === "tool_call" && m.toolCalls?.some((tc) => toolCallsThisTurn.some((t) => t.id === tc.id))
-  );
-  if (exists) return;
-  append({
-    role: "tool_call",
-    content: "",
-    toolCalls: toolCallsThisTurn,
-    precedingText: precedingText.trim() || void 0
-  });
-}
 async function invokeToolHandler(handler, call, signal, toolTimeoutMs) {
   if (signal.aborted) return { status: "aborted" };
   const controller = new AbortController();
@@ -617,12 +438,45 @@ function compactConversation(input) {
   };
   return { compactedMessages, breakdown };
 }
+const read = (value) => typeof value === "function" ? value() : value;
+const textOf = (message) => {
+  if (typeof message.content === "string" && message.content.length > 0) return message.content;
+  return (message.segments ?? []).map((segment) => {
+    const content = segment.content;
+    return typeof content === "string" ? content : "";
+  }).join("\n");
+};
+function createCompactionSelector(options) {
+  const minKeep = Math.max(0, options.minKeep ?? 2);
+  return (messages) => {
+    const contextWindow = read(options.contextWindow);
+    if (!contextWindow || contextWindow <= 0) return { keep: messages, drop: [] };
+    const budget = computeHistoryBudget({
+      systemPrompt: read(options.systemPrompt) ?? "",
+      toolsArray: read(options.tools),
+      config: { ...options.config, contextWindow }
+    });
+    const windowBudget = splitHistoryBudget(budget.historyBudget, budget.config).window;
+    let used = 0;
+    let cut = messages.length;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const cost = estimateTokens(textOf(messages[i]));
+      const kept = messages.length - 1 - i;
+      if (used + cost > windowBudget && kept >= minKeep) break;
+      used += cost;
+      cut = i;
+    }
+    if (cut === 0) return { keep: messages, drop: [] };
+    return { keep: messages.slice(cut), drop: messages.slice(0, cut) };
+  };
+}
 export {
-  ArtifactXmlStateMachine,
   DEFAULT_COMPACTION_CONFIG,
   assembleCompacted,
   compactConversation,
   computeHistoryBudget,
+  createCompactionSelector,
+  deriveArtifactKind,
   estimateTokens,
   estimateTokensJson,
   runStreamAgent,