@vecteur/cli 0.5.6 → 0.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vecteur/cli",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "type": "module",
   "bin": {
     "vecteur": "bin/vecteur.js"

package/src/contract.js

@@ -1,5 +1,5 @@
 // GENERATED by scripts/gen-contract.mjs from owner TypeScript projections.
-export const OWNER_CONTRACT_IDENTITY = "api-sha256:8f81ea544eecd9e81da3fd56ad816ac24991cb0e68f3b1cb45180711eaf16056;run-wire-sha256:823acb39f2ff5bca7ea54db4beb4589d681bedc5673867a6e6dcdf5c212cf7db";
+export const OWNER_CONTRACT_IDENTITY = "api-sha256:8f81ea544eecd9e81da3fd56ad816ac24991cb0e68f3b1cb45180711eaf16056;run-wire-sha256:e474079a0453c07e8249eddfc6781bb0c053ee81d08b0c7988e0670ad14d302b";
 export const RECOVERY_ACTIONS = Object.freeze({"delete_project":{"label":"Delete a project","href":"/projects"},"upgrade_plan":{"label":"Upgrade your plan","href":"/dashboard/billing"},"wait_for_reset":{"label":"Wait until the UTC reset","href":null}});
 export const EVENT_KINDS = Object.freeze(["source","step_started","step_finished","tool_call","tool_result","synthesis","artifact","terminal","heartbeat","assistant_delta","knowledge_binding","engineering_projection","provider_attempt","clarification","clarification_evidence","input_rows"]);
 export const RETIRED_EVENT_KINDS = Object.freeze(["context_frame","cta","step_label"]);

package/src/format.js

@@ -90,17 +90,133 @@ const CAUSE_WORD = Object.freeze({
   answer_now: "stopped to answer now; what it printed stands",
 });
 
+/**
+ * THE ENGINEERING DOOR, SPOKEN BY THIS DOOR TOO (v2.4 S3; the web reads the same bytes in
+ * `frontend/src/run/door.ts`, and both readers are held to `tests/fixtures/door-observations.json`).
+ *
+ * A `python` call whose summary is `run <verb>` is a call of one published engineering method;
+ * its result's stdout is the bounded observation `laplace_ope/door_tail.py` prints. The reader is
+ * tolerant: the excerpt keeps a long stream's first and last lines around `[…]`, so every section
+ * is optional and the last `RESULT:` line is the headline of last resort.
+ */
+const DOOR_SUMMARY = /^run ([a-z][a-z0-9]*(?:_[a-z0-9]+)+)$/;
+const DOOR_HEAD = /^([a-z][a-z0-9_]*): ok\b/;
+const QUANTITY_LINE = /^ {2}(\S+) = (.*?)(?: {2}-- (.*))?$/;
+const SECTION_OPEN = /^(inputs \(as given\):|inputs the owner defaulted|not set \(|quantities:|validity:|warnings:|files:|RESULT:)/;
+const NUMBER = /^(-?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?|true|false|nan|-?inf)(?: (.+))?$/;
+
+function quantityParts(text) {
+  const trimmed = text.trim();
+  if (trimmed.startsWith("[") || trimmed.startsWith("{")) return { value: trimmed, unit: "" };
+  const number = NUMBER.exec(trimmed);
+  return number ? { value: number[1], unit: (number[2] ?? "").trim() } : { value: trimmed, unit: "" };
+}
+
+/** `{verb, headline: [{id, label, value, unit}], warnings}` of an observation, or null. */
+export function doorObservation(text) {
+  const lines = String(text ?? "").split("\n").map(line => line.replace(/\s+$/, ""));
+  const head = DOOR_HEAD.exec(lines.find(line => line.trim()) ?? "");
+  if (!head) return null;
+  const cut = new Set();
+  lines.forEach((line, index) => {
+    if (line.trim() === "[…]") [index - 1, index, index + 1].forEach(n => cut.add(n));
+  });
+  const quantities = [];
+  const warnings = [];
+  let resultLine = "";
+  let section = "";
+  for (const [index, line] of lines.entries()) {
+    if (index === 0 || cut.has(index)) continue;
+    const open = SECTION_OPEN.exec(line);
+    if (open) {
+      section = open[1];
+      if (section === "warnings:" && line.includes("none")) section = "";
+      if (section === "RESULT:") resultLine = line.slice("RESULT:".length).trim();
+      continue;
+    }
+    if (section === "quantities:") {
+      const row = QUANTITY_LINE.exec(line);
+      if (row) quantities.push({ id: row[1], label: row[3]?.trim() || row[1].replaceAll("_", " "), ...quantityParts(row[2]) });
+    } else if (section === "warnings:" && /^ {2}- /.test(line)) {
+      warnings.push(line.replace(/^ {2}- /, "").trim());
+    }
+  }
+  const byId = new Map(quantities.map(quantity => [quantity.id, quantity]));
+  const headline = [];
+  for (const part of resultLine.split(/; (?=\S+ = )/)) {
+    const row = /^(\S+) = (.*)$/.exec(part.trim());
+    if (!row) continue;
+    headline.push({ id: row[1], label: byId.get(row[1])?.label ?? row[1].replaceAll("_", " "), ...quantityParts(row[2]) });
+  }
+  // No parsable RESULT line: the last three physical quantities stand in (else the first three).
+  if (!headline.length) headline.push(...quantities.filter(quantity => quantity.unit).slice(-3));
+  if (!headline.length) headline.push(...quantities.slice(0, 3));
+  return { verb: head[1], headline, warnings };
+}
+
+/** The door calls of each row, by `step_id`: `{purpose, verb, observation, refusal}` in call order. */
+function doorCallsByStep(events) {
+  const results = new Map();
+  for (const event of events) {
+    if (event?.kind === "tool_result" && typeof event.payload?.call_id === "string") {
+      results.set(event.payload.call_id, event.payload);
+    }
+  }
+  const rows = new Map();
+  for (const event of events) {
+    const call = event?.kind === "tool_call" ? event.payload : null;
+    const verb = call?.tool === "python" ? DOOR_SUMMARY.exec(String(call.summary ?? "").trim())?.[1] : null;
+    if (!verb) continue;
+    const result = results.get(call.call_id);
+    const observation = result?.status === "ok" ? doorObservation(result.stdout_excerpt) : null;
+    if (result?.status === "ok" && observation?.verb !== verb) continue; // free code that opened with `# run x_y`
+    const refusal = result && result.status !== "ok"
+      ? String(result.stderr_excerpt || result.stdout_excerpt || "").trim().split("\n").filter(Boolean).slice(-3).join(" · ") : "";
+    const list = rows.get(call.step_id) ?? [];
+    list.push({ purpose: String(call.title ?? "").trim(), verb, observation, refusal, running: !result });
+    rows.set(call.step_id, list);
+  }
+  return rows;
+}
+
+function doorLine({ purpose, verb, observation, refusal, running }) {
+  const said = observation
+    ? observation.headline.map(quantity => `${quantity.label} ${quantity.value}${quantity.unit ? ` ${quantity.unit}` : ""}`).join(", ")
+    : (refusal ? `refused: ${refusal}` : running ? "running" : "computed");
+  const lines = [`  ▸ ${plainLine(purpose || verb)} — ${verb}: ${plainLine(said)}`];
+  for (const warning of (observation?.warnings ?? []).slice(0, 2)) lines.push(`      ! ${plainLine(warning)}`);
+  return lines.join("\n");
+}
+
 export function taskLines(events) {
+  const doors = doorCallsByStep(events);
+  // The conclusion is engineering work (it prints the answer from evidence); its text is the
+  // synthesis, so the row stays one line.
+  const concluded = new Set(events.filter((event) => event?.kind === "tool_call" && event.payload?.tool === "conclude")
+    .map((event) => event.payload.step_id));
+  // Only a run that called the door tells engineering rows from execution rows; any other run
+  // prints exactly as before.
+  const distinguishes = doors.size > 0 || concluded.size > 0;
   return events.flatMap((event) => {
     if (event?.kind !== "step_finished") return [];
     const row = event.payload;
     if (!row || typeof row !== "object" || typeof row.step_id !== "string") return [];
+    const outcome = CAUSE_WORD[row.cause] ?? row.status;
+    const result = typeof row.result_line === "string" && row.result_line.trim() ? row.result_line : "";
+    if (distinguishes) {
+      const calls = doors.get(row.step_id);
+      if (calls?.length) {
+        const rest = row.status === "computed" ? [] : [`      (${plainLine(row.title)} — ${outcome})`];
+        return [[...calls.map(doorLine), ...rest].join("\n")];
+      }
+      if (row.status === "asked" || concluded.has(row.step_id)) return [`  ▸ ${plainLine(`${row.title} — ${outcome}`)}`];
+      // Execution, compressed to one line: what ran, how it ended, what it printed.
+      return [`  · ${plainLine(`${row.title} — ${outcome}${result ? `: ${result}` : ""}`)}`];
+    }
     const attempts = Number.isInteger(row.attempts) && row.attempts > 0
       ? ` · ${row.attempts} ${row.attempts === 1 ? "attempt" : "attempts"}` : "";
-    const result = typeof row.result_line === "string" && row.result_line.trim()
-      ? `\n    ${plainLine(row.result_line)}` : "";
-    const outcome = CAUSE_WORD[row.cause] ?? row.status;
-    return [`  ${plainLine(`${row.title} — ${outcome}${attempts}`)}${result}`];
+    const printed = result ? `\n    ${plainLine(result)}` : "";
+    return [`  ${plainLine(`${row.title} — ${outcome}${attempts}`)}${printed}`];
   });
 }