@lazyingart/agintiflow 0.20.171 → 0.20.173

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyingart/agintiflow",
-  "version": "0.20.171",
+  "version": "0.20.173",
   "type": "module",
   "description": "AgInTiFlow is a project-aware agent workspace for hybrid wet-dry R&D, hardware-aware intelligence, software automation, and industrial workflows.",
   "license": "Apache-2.0",

package/public/app.js

@@ -1782,6 +1782,131 @@ function renderPermissionApproval(entry) {
   `;
 }
 
+function renderPlanEvent(entry) {
+  const data = entry.data || {};
+  const plan = data.plan || entry.content || "";
+  return `
+    <article class="event-card event-plan">
+      <div class="event-card-meta">
+        <span>plan</span>
+        <span>${entry.at ? escapeHtml(new Date(entry.at).toLocaleString()) : ""}</span>
+      </div>
+      <div class="markdown-body">${renderMarkdown(plan)}</div>
+    </article>
+  `;
+}
+
+function renderWorkspaceChangeEvent(entry) {
+  const data = entry.data || {};
+  const toolName = data.toolName || data.action || "file.changed";
+  const isPatch = toolName === "apply_patch" || String(toolName).startsWith("apply_patch");
+  const diff = String(data.diff || "");
+  const maxDiffChars = 9000;
+  const diffBlock = diff
+    ? `<pre class="change-diff event-diff">${renderDiffHtml(diff, maxDiffChars)}</pre>${
+        diff.length > maxDiffChars ? `<div class="event-fold-note">... diff truncated for browser preview</div>` : ""
+      }`
+    : "";
+  const hashes =
+    data.beforeHash || data.afterHash
+      ? `<div class="event-card-meta"><span>before=${escapeHtml((data.beforeHash || "new").slice(0, 10))}</span><span>after=${escapeHtml((data.afterHash || "").slice(0, 10))}</span></div>`
+      : "";
+  return `
+    <article class="event-card ${isPatch ? "event-patch" : "event-write"}">
+      <div class="event-card-meta">
+        <span>${escapeHtml(isPatch ? "patch" : "write")}</span>
+        <span>${escapeHtml(toolName)}</span>
+        <span>${entry.at ? escapeHtml(new Date(entry.at).toLocaleString()) : ""}</span>
+      </div>
+      <strong class="event-path">${escapeHtml(data.path || entry.content || "")}</strong>
+      ${data.created ? `<div class="event-fold-note">created</div>` : ""}
+      ${hashes}
+      ${diffBlock || `<div class="event-fold-note">No diff preview recorded for this file event.</div>`}
+    </article>
+  `;
+}
+
+function renderToolEvent(entry) {
+  const data = entry.data || {};
+  const message = entry.message || entry.eventType || "";
+  const failed = message === "tool.failed" || data.ok === false || data.blocked || data.error;
+  const skipped = message === "tool.skipped";
+  const toolName = data.toolName || "tool";
+  const args = data.args || {};
+  const argPreview =
+    toolName === "run_command" && args.command
+      ? args.command
+      : args.path || args.url || args.query || args.q || (Object.keys(args).length ? JSON.stringify(args) : "");
+  const stdout = data.stdout ? outputPreviewText(data.stdout) : null;
+  const stderr = data.stderr ? outputPreviewText(data.stderr) : null;
+  return `
+    <article class="event-card ${failed ? "event-failed" : skipped ? "event-muted" : "event-tool"}">
+      <div class="event-card-meta">
+        <span>${escapeHtml(failed ? "tool failed" : skipped ? "tool skipped" : message === "tool.started" ? "tool" : "tool done")}</span>
+        <span>${entry.at ? escapeHtml(new Date(entry.at).toLocaleString()) : ""}</span>
+      </div>
+      <strong class="event-path">${escapeHtml(toolName)}</strong>
+      ${argPreview ? `<code class="event-inline-code">${escapeHtml(argPreview)}</code>` : ""}
+      ${data.error || data.reason ? `<div class="event-fold-note">${escapeHtml(data.error || data.reason)}</div>` : ""}
+      ${stdout ? `<div class="log-stream-title">stdout</div><pre class="event-output">${escapeHtml(stdout.text)}</pre>` : ""}
+      ${stdout?.hidden > 0 ? `<div class="event-fold-note">... ${stdout.hidden} more stdout line(s) folded</div>` : ""}
+      ${stderr ? `<div class="log-stream-title">stderr</div><pre class="event-output">${escapeHtml(stderr.text)}</pre>` : ""}
+      ${stderr?.hidden > 0 ? `<div class="event-fold-note">... ${stderr.hidden} more stderr line(s) folded</div>` : ""}
+    </article>
+  `;
+}
+
+function renderStatusEvent(entry) {
+  const data = entry.data || {};
+  const message = entry.message || entry.eventType || "event";
+  const label = entry.eventLabel || message.replace(/^[^.]+\./, "");
+  const content = data.result || data.error || data.reason || entry.content || "";
+  const failed = message === "session.failed";
+  return `
+    <article class="event-card ${failed ? "event-failed" : "event-muted"}">
+      <div class="event-card-meta">
+        <span>${escapeHtml(label)}</span>
+        <span>${entry.at ? escapeHtml(new Date(entry.at).toLocaleString()) : ""}</span>
+      </div>
+      ${content ? `<div class="chat-content">${escapeHtml(content)}</div>` : ""}
+    </article>
+  `;
+}
+
+function renderStructuredEvent(entry) {
+  const message = entry.message || entry.eventType || "";
+  if (message === "plan.created") return renderPlanEvent(entry);
+  if (message === "command.output") return renderCommandOutputLog(entry);
+  if (message === "file.changed") return renderWorkspaceChangeEvent(entry);
+  if (message === "tool.blocked" && entry.data?.permissionAdvice) return renderPermissionApproval(entry);
+  if (message === "tool.blocked") {
+    return `
+      <article class="event-card event-failed">
+        <div class="event-card-meta">
+          <span>permission</span>
+          <span>${entry.at ? escapeHtml(new Date(entry.at).toLocaleString()) : ""}</span>
+        </div>
+        <strong class="event-path">${escapeHtml(entry.data?.toolName || "blocked")}</strong>
+        <div class="chat-content">${escapeHtml(entry.data?.reason || entry.content || "Permission blocked.")}</div>
+      </article>
+    `;
+  }
+  if (message === "tool.started" || message === "tool.completed" || message === "tool.failed" || message === "tool.skipped") {
+    return renderToolEvent(entry);
+  }
+  if (
+    message === "budget.initialized" ||
+    message === "conversation.continued" ||
+    message === "conversation.queued_input_applied" ||
+    message === "session.finished" ||
+    message === "session.failed" ||
+    message === "session.stopped"
+  ) {
+    return renderStatusEvent(entry);
+  }
+  return "";
+}
+
 function renderLogs(run) {
   logsEl.dataset.mode = "active";
   const parts = [
@@ -1791,15 +1916,12 @@ function renderLogs(run) {
   ];
 
   for (const entry of run.logs || []) {
-    if (entry.message === "command.output") {
-      parts.push(renderCommandOutputLog(entry));
+    const structured = renderStructuredEvent(entry);
+    if (structured) {
+      parts.push(structured);
       continue;
     }
     parts.push(`<div class="log-line">${escapeHtml(`[${entry.at}] ${entry.kind}: ${entry.message}`)}</div>`);
-    if (entry.message === "tool.blocked" && entry.data?.permissionAdvice) {
-      parts.push(renderPermissionApproval(entry));
-      continue;
-    }
     if (entry.data && Object.keys(entry.data).length > 0) {
       parts.push(`<pre class="log-json">${escapeHtml(JSON.stringify(entry.data, null, 2))}</pre>`);
     }
@@ -2044,6 +2166,14 @@ function renderChat(chatEntries) {
 
   chatThreadEl.innerHTML = lastChatEntries
     .map((entry) => {
+      if (entry.role === "event") {
+        return renderStructuredEvent(entry) || `
+          <article class="chat-item event" data-event-type="${escapeHtml(entry.eventType || "")}">
+            <div class="chat-meta">${escapeHtml(entry.eventLabel || entry.eventType || "event")}${entry.at ? ` · ${new Date(entry.at).toLocaleString()}` : ""}</div>
+            <div class="chat-content">${escapeHtml(entry.content || "").replace(/\n/g, "<br>")}</div>
+          </article>
+        `;
+      }
       const role = entry.role === "assistant" ? "assistant" : "user";
       const label = role === "assistant" ? t("assistantLabel") : t("youLabel");
       const content =
@@ -2830,7 +2960,7 @@ async function refreshChat() {
   pendingInboxItems = data.inbox || [];
   pendingAfterFinishItems = loadAfterFinishQueue(currentSessionId);
   renderPendingMessages();
-  renderChat(data.chat || []);
+  renderChat(data.timeline || data.chat || []);
 }
 
 async function savePreferences() {

package/public/styles.css

@@ -1225,6 +1225,126 @@ button.danger {
   padding: 0 12px 8px;
 }
 
+.event-card {
+  width: auto;
+  max-width: 100%;
+  margin: 0 0 12px;
+  padding: 12px;
+  border: 1px solid rgba(20, 184, 166, 0.22);
+  border-radius: 16px;
+  background:
+    radial-gradient(circle at 0% 0%, rgba(20, 184, 166, 0.14), transparent 28%),
+    rgba(255, 255, 255, 0.46);
+  box-shadow: 0 10px 24px rgba(15, 23, 42, 0.07);
+}
+
+#logs .event-card {
+  background:
+    radial-gradient(circle at 0% 0%, rgba(20, 184, 166, 0.1), transparent 26%),
+    rgba(15, 23, 42, 0.52);
+  color: #e5e7eb;
+}
+
+.event-plan {
+  border-color: rgba(20, 184, 166, 0.34);
+  background:
+    radial-gradient(circle at 0% 0%, rgba(20, 184, 166, 0.18), transparent 28%),
+    linear-gradient(180deg, rgba(240, 253, 250, 0.9), rgba(255, 251, 235, 0.74));
+}
+
+#logs .event-plan {
+  background: rgba(15, 23, 42, 0.58);
+}
+
+.event-patch {
+  border-color: rgba(192, 132, 252, 0.38);
+}
+
+.event-write {
+  border-color: rgba(59, 130, 246, 0.28);
+}
+
+.event-failed {
+  border-color: rgba(248, 113, 113, 0.45);
+  background: rgba(127, 29, 29, 0.12);
+}
+
+#logs .event-failed {
+  background: rgba(127, 29, 29, 0.3);
+}
+
+.event-muted {
+  border-color: rgba(148, 163, 184, 0.24);
+  background: rgba(148, 163, 184, 0.1);
+}
+
+.event-card-meta {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-bottom: 8px;
+  color: var(--muted);
+  font-size: 0.78rem;
+  font-weight: 800;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+}
+
+#logs .event-card-meta {
+  color: #99f6e4;
+}
+
+.event-path {
+  display: block;
+  margin: 4px 0 8px;
+  font-family: "IBM Plex Mono", "SFMono-Regular", monospace;
+  font-size: 0.84rem;
+  overflow-wrap: anywhere;
+}
+
+.event-inline-code {
+  display: block;
+  width: fit-content;
+  max-width: 100%;
+  margin: 4px 0 8px;
+  padding: 6px 8px;
+  border-radius: 8px;
+  background: rgba(15, 23, 42, 0.08);
+  color: #78350f;
+  font-family: "IBM Plex Mono", "SFMono-Regular", monospace;
+  overflow-wrap: anywhere;
+  white-space: pre-wrap;
+}
+
+#logs .event-inline-code {
+  background: rgba(255, 255, 255, 0.08);
+  color: #fef3c7;
+}
+
+.event-output {
+  margin: 4px 0 10px;
+  padding: 10px;
+  border-radius: 10px;
+  background: rgba(15, 23, 42, 0.84);
+  color: #e5e7eb;
+  white-space: pre-wrap;
+  overflow: auto;
+}
+
+.event-fold-note {
+  margin: 4px 0 8px;
+  color: var(--muted);
+  font-size: 0.8rem;
+}
+
+#logs .event-fold-note {
+  color: #94a3b8;
+}
+
+.event-diff {
+  max-height: 360px;
+}
+
 .chat-panel {
   display: grid;
   gap: 12px;
@@ -1271,6 +1391,25 @@ button.danger {
   border-bottom-left-radius: 6px;
 }
 
+.chat-item.event {
+  justify-self: stretch;
+  width: auto;
+  max-width: 100%;
+  border-color: rgba(20, 184, 166, 0.28);
+  border-style: dashed;
+  background:
+    linear-gradient(90deg, rgba(20, 184, 166, 0.12), rgba(245, 158, 11, 0.08)),
+    rgba(255, 255, 255, 0.48);
+  box-shadow: none;
+}
+
+.chat-item.event[data-event-type="plan.created"] {
+  border-style: solid;
+  background:
+    radial-gradient(circle at 0% 0%, rgba(20, 184, 166, 0.16), transparent 28%),
+    linear-gradient(180deg, rgba(240, 253, 250, 0.88), rgba(255, 251, 235, 0.7));
+}
+
 .chat-meta {
   font-size: 0.8rem;
   color: var(--muted);

package/scripts/smoke-cli-chat.js

@@ -890,10 +890,16 @@ try {
   if (!latest.stdout.includes("  user>") || !latest.stdout.includes("aginti>") || latest.stdout.includes("user>   ")) {
     throw new Error("resume history should use prompt-style user>/aginti> labels");
   }
-  if (!latest.stdout.includes("resume note=showing chat transcript only")) {
-    throw new Error("bare aginti resume did not clarify that tool/run events are separate from chat history");
+  if (!latest.stdout.includes(" plan ")) {
+    throw new Error("bare aginti resume did not replay saved plan/run context");
   }
-  if (latest.stdout.includes("showing=") || latest.stdout.includes("…")) {
+  if (!latest.stdout.includes(" write ") || !latest.stdout.includes("+Created by AgInTiFlow mock mode.")) {
+    throw new Error("bare aginti resume did not replay formatted file-change diff context");
+  }
+  if (latest.stdout.includes("resume note=showing chat transcript only")) {
+    throw new Error("bare aginti resume regressed to chat-only history");
+  }
+  if (latest.stdout.includes("showing=")) {
     throw new Error("resume history should render full saved messages instead of compact previews");
   }
 

package/scripts/smoke-web-api.js

@@ -257,6 +257,11 @@ try {
   if (fileRun.status !== "finished") throw new Error(`mock file run failed: ${fileRun.error || "unknown error"}`);
   const hello = await fs.readFile(path.join(runtimeDir, "notes", "hello.md"), "utf8");
   if (!hello.includes("Created by AgInTiFlow mock mode.")) throw new Error("mock file run did not create requested path");
+  const fileChat = await fetchJson(`/api/sessions/${encodeURIComponent(fileRunStart.sessionId)}/chat`);
+  const fileChange = fileChat.timeline?.find((entry) => entry.role === "event" && entry.eventType === "file.changed");
+  if (!fileChange?.data?.diff || !fileChange.data.diff.includes("+Created by AgInTiFlow mock mode.")) {
+    throw new Error("chat timeline did not preserve structured file-change diff data");
+  }
 
   const safeRunStart = await fetchJson("/api/runs", {
     method: "POST",
@@ -303,6 +308,15 @@ try {
   const chat = await fetchJson(`/api/sessions/${encodeURIComponent(runStart.sessionId)}/chat`);
   if (!Array.isArray(chat.chat) || chat.chat.length < 2) throw new Error("chat history was not persisted");
   if (!Array.isArray(chat.inbox)) throw new Error("chat endpoint did not include shared inbox state");
+  if (!Array.isArray(chat.events) || !chat.events.some((entry) => entry.type === "plan.created")) {
+    throw new Error("chat endpoint did not include saved plan events");
+  }
+  if (
+    !Array.isArray(chat.timeline) ||
+    !chat.timeline.some((entry) => entry.role === "event" && entry.eventType === "plan.created" && String(entry.content || "").trim())
+  ) {
+    throw new Error("chat endpoint did not return a resume-ready timeline with the saved plan");
+  }
 
   const queued = await fetchJson(`/api/sessions/${encodeURIComponent(runStart.sessionId)}/inbox`, {
     method: "POST",

package/scripts/smoke-web-ui.js

@@ -56,7 +56,7 @@ async function waitForRunState(page, status, timeout = 20000) {
   );
 }
 
-async function waitForTerminalRunState(page, timeout = 30000) {
+async function waitForTerminalRunState(page, timeout = 90000) {
   await page.waitForFunction(
     () => ["finished", "failed", "stopped"].includes(document.querySelector("#run-state")?.dataset.status || ""),
     null,
@@ -92,6 +92,7 @@ try {
   if (await page.locator("#run-defaults-card").evaluate((node) => node.open)) throw new Error("run defaults should start folded");
   await page.locator("#commandCwd").fill(runtimeDir.slice(0, Math.max(runtimeDir.lastIndexOf("/"), 1)));
   await page.waitForFunction(() => document.querySelectorAll("#command-cwd-suggestions option").length > 0);
+  await page.locator("#commandCwd").fill(runtimeDir);
   if ((await page.locator(".project-status-chip").count()) < 4) throw new Error("project folder status did not render structured chips");
   await page.locator("#run-defaults-card summary").click();
   if (await page.locator("#veniceModeToggle").isChecked()) throw new Error("Venice quick mode should default off");
@@ -143,6 +144,14 @@ try {
   await page.selectOption("#routingMode", "manual");
   await page.selectOption("#provider", "mock");
   await page.selectOption("#model", "mock-agent");
+  await page.selectOption("#enableScs", "off");
+  if (await page.locator("#aapsModeToggle").isChecked()) await page.locator("label:has(#aapsModeToggle)").click();
+  await page.selectOption("#taskProfile", "auto");
+  await page.evaluate(() => {
+    const input = document.querySelector("#allowShellTool");
+    input.checked = false;
+    input.dispatchEvent(new Event("change", { bubbles: true }));
+  });
   await page.fill("#maxSteps", "4");
   await page.selectOption("#dynamicSteps", "off");
   await page.fill("#chat-input", "Say hello from the web UI composer in one concise sentence.");
@@ -151,18 +160,24 @@ try {
   if (firstPayload.goal !== "Say hello from the web UI composer in one concise sentence.") {
     throw new Error("composer text was not used as the first run goal");
   }
-  if (firstPayload.enableScs !== "auto" || firstPayload.taskProfile !== "aaps") {
+  if (firstPayload.enableScs !== "off" || firstPayload.taskProfile !== "auto") {
     throw new Error(`CLI mode payload mismatch: ${runPayloads.at(-1) || ""}`);
   }
   if (firstPayload.dynamicSteps !== "off") {
     throw new Error(`dynamic steps payload mismatch: ${runPayloads.at(-1) || ""}`);
   }
+  if (firstPayload.allowShellTool !== false) {
+    throw new Error(`shell tool should be disabled for deterministic renderer smoke: ${runPayloads.at(-1) || ""}`);
+  }
   if (firstPayload.veniceMode !== false || firstPayload.routeProvider !== "deepseek" || firstPayload.mainProvider !== "deepseek") {
     throw new Error(`default route/main payload mismatch after Venice off: ${runPayloads.at(-1) || ""}`);
   }
   await waitForRunState(page, "running");
+  await page.waitForSelector(".event-plan", { timeout: 12000 });
+  if (!(await page.locator(".event-plan .markdown-body").first().innerText()).trim()) {
+    throw new Error("web run log did not render the plan as a formatted event card");
+  }
   if (!(await page.locator("#stop-run").isVisible())) throw new Error("stop button did not appear while run was active");
-  await page.click("#stop-run");
   await waitForTerminalRunState(page);
   if (await page.locator("#stop-run").isVisible()) throw new Error("stop button stayed visible after terminal run state");
   if (!(await page.locator(".toast").first().isVisible().catch(() => false))) {
@@ -173,6 +188,27 @@ try {
   await waitForRunState(page, "idle");
   const resetSubmit = await page.locator("#chat-submit").innerText();
   if (!/start new run/i.test(resetSubmit)) throw new Error("new session did not reset composer to start mode");
+  if (await page.locator("#aapsModeToggle").isChecked()) await page.locator("label:has(#aapsModeToggle)").click();
+  await page.selectOption("#taskProfile", "code");
+  await page.selectOption("#enableScs", "off");
+  await page.fill("#chat-input", "Create notes/web-ui-format.md with a short formatted event smoke message.");
+  await page.click("#chat-submit");
+  await waitForTerminalRunState(page);
+  try {
+    await page.waitForFunction(
+      () =>
+        [...document.querySelectorAll(".event-write .change-diff")].some((node) =>
+          (node.textContent || "").includes("+Created by AgInTiFlow mock mode.")
+        ),
+      null,
+      { timeout: 30000 }
+    );
+  } catch (error) {
+    const state = await page.locator("#run-state").evaluate((node) => node.dataset.status || "").catch(() => "unknown");
+    const logsTail = (await page.locator("#logs").innerText().catch(() => "")).slice(-1200);
+    const chatTail = (await page.locator("#chat-thread").innerText().catch(() => "")).slice(-1200);
+    throw new Error(`web UI did not render formatted file-change diff event; state=${state}\nlogs tail:\n${logsTail}\nchat tail:\n${chatTail}`);
+  }
 
   await page.click("#open-settings");
   await page.waitForSelector("#settings-modal[open]");
@@ -208,6 +244,8 @@ try {
           "running-status-toast",
           "terminal-stop-button-hidden",
           "new-session-resets-scope",
+          "formatted-plan-event-card",
+          "formatted-file-diff-event-card",
           "settings-provider-dropdowns",
           "settings-wrapper-dropdowns",
         ],

package/scripts/smoke-webapp-command.js

@@ -51,6 +51,26 @@ async function killPort(port) {
   }
 }
 
+async function stopChild(child) {
+  if (!child || child.exitCode !== null) return;
+  try {
+    child.stdin?.write("/exit\n");
+  } catch {
+    // The CLI may have closed stdin after the final prompt; fall back to process signals.
+  }
+  const exited = await Promise.race([
+    new Promise((resolve) => child.once("exit", () => resolve(true))),
+    delay(2000).then(() => false),
+  ]);
+  if (exited || child.exitCode !== null) return;
+  child.kill("SIGTERM");
+  const terminated = await Promise.race([
+    new Promise((resolve) => child.once("exit", () => resolve(true))),
+    delay(2000).then(() => false),
+  ]);
+  if (!terminated && child.exitCode === null) child.kill("SIGKILL");
+}
+
 async function runCase({ port, env = {}, expectHeader, label }) {
   const output = { stdout: "", stderr: "" };
   const child = spawn(process.execPath, [path.join(repoRoot, "bin/aginti-cli.js"), "chat", "--provider", "mock", "--routing", "manual", "--port", String(port)], {
@@ -109,8 +129,9 @@ async function runCase({ port, env = {}, expectHeader, label }) {
     child.stdin.write(`/webapp ${active.port}\n`);
     await waitFor(() => latestWebappEvent(output.stdout, "started|reused")?.port === active.port, child, `${label} /webapp restart after stop`, output);
   } finally {
-    child.kill("SIGTERM");
+    await stopChild(child);
     await killPort(port);
+    await delay(250);
   }
 }
 
@@ -133,5 +154,6 @@ try {
 } finally {
   await killPort(autoPort);
   await killPort(manualPort);
-  await fs.rm(runtimeDir, { recursive: true, force: true });
+  await delay(250);
+  await fs.rm(runtimeDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
 }

package/src/interactive-cli.js

@@ -2207,6 +2207,131 @@ function printHistoryEntry(entry) {
   printHistoryBlock(role, entry.content, { time, bg });
 }
 
+function timestampMs(value = "") {
+  const parsed = Date.parse(String(value || ""));
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+
+function isReplayableResumeEvent(event = {}) {
+  const type = String(event.type || "");
+  const data = event.data || {};
+  if (type === "plan.created") return Boolean(data.plan);
+  if (
+    [
+      "budget.initialized",
+      "conversation.continued",
+      "conversation.queued_input_applied",
+      "file.changed",
+      "session.failed",
+      "session.finished",
+      "session.stopped",
+      "tool.blocked",
+      "tool.failed",
+      "tool.skipped",
+      "tool.started",
+    ].includes(type)
+  ) {
+    return true;
+  }
+  if (type === "tool.completed") {
+    const toolName = String(data.toolName || "");
+    return ["run_command", "write_file", "apply_patch", "create_artifact"].includes(toolName) || data.ok === false || data.blocked || data.error;
+  }
+  return false;
+}
+
+function resumeTimelineItems(chat = [], events = [], { limit = 0 } = {}) {
+  const shownChat = limit > 0 ? chat.slice(-limit) : chat;
+  const firstChatTime = limit > 0 && shownChat.length > 0 ? timestampMs(shownChat[0].at) : 0;
+  const chatItems = shownChat.map((entry, index) => ({
+    kind: "chat",
+    entry,
+    order: index * 2,
+    at: timestampMs(entry.at),
+  }));
+  const eventItems = events
+    .map((event, index) => ({ event, index }))
+    .filter(({ event }) => isReplayableResumeEvent(event))
+    .filter(({ event }) => !firstChatTime || timestampMs(event.timestamp) >= firstChatTime)
+    .map(({ event, index }) => ({
+      kind: "event",
+      event,
+      order: index * 2 + 1,
+      at: timestampMs(event.timestamp),
+    }));
+  return [...chatItems, ...eventItems].sort((left, right) => (left.at || 0) - (right.at || 0) || left.order - right.order);
+}
+
+function printResumeEvent(event = {}) {
+  const type = String(event.type || "");
+  const data = event.data || {};
+  if (type === "plan.created") {
+    printWrapped(`${label("plan", ansi.systemBg)} `, data.plan || "");
+    return true;
+  }
+  if (type === "tool.started") {
+    outputLine(`${label("tool", ansi.statusBg)} ${toolStatusDetails(data)}`);
+    return true;
+  }
+  if (type === "tool.completed" || type === "tool.failed" || type === "tool.skipped") {
+    const failed = type === "tool.failed" || data.ok === false || data.blocked || data.error;
+    if (data.diff) {
+      printWorkspaceChange(data);
+      return true;
+    }
+    if (data.toolName === "run_command") {
+      printCommandOutputLog({
+        command: data.args?.command || data.command || "",
+        stdout: data.stdout || "",
+        stderr: data.stderr || "",
+        diagnosticHint: data.diagnosticHint || "",
+        commandPolicy: data.commandPolicy,
+        blocked: Boolean(data.blocked),
+        error: data.error || data.reason || "",
+        permissionAdvice: data.permissionAdvice || null,
+      });
+    }
+    outputLine(`${label(failed ? "fail" : "done", failed ? ansi.red : ansi.systemBg)} ${toolStatusDetails(data)}`);
+    return true;
+  }
+  if (type === "tool.blocked") {
+    outputLine(`${label("perm", ansi.red)} ${compactLine(data.reason || data.permissionAdvice?.summary || data.toolName || "Permission blocked.", 104)}`);
+    if (data.permissionAdvice?.suggestedCommand) outputLine(`${color(" | ", ansi.red)} rerun: ${compactLine(data.permissionAdvice.suggestedCommand, 120)}`);
+    if (data.permissionAdvice?.trustedHostCommand) outputLine(`${color(" | ", ansi.red)} host: ${compactLine(data.permissionAdvice.trustedHostCommand, 120)}`);
+    return true;
+  }
+  if (type === "file.changed") {
+    if (data.diff) printWorkspaceChange(data);
+    else outputLine(`${label("write", ansi.systemBg)} ${compactLine(formatWorkspaceChange(data).summary, 92)}`);
+    return true;
+  }
+  if (type === "budget.initialized") {
+    outputLine(`${label("state", ansi.systemBg)} budget=${data.currentMaxSteps || data.initialMaxSteps || data.maxSteps || "unknown"} steps`);
+    return true;
+  }
+  if (type === "conversation.continued") {
+    outputLine(`${label("state", ansi.systemBg)} continued=${compactLine(data.prompt || "", 76)}`);
+    return true;
+  }
+  if (type === "conversation.queued_input_applied") {
+    outputLine(`${label("state", ansi.systemBg)} queued_input_applied=${data.priority === "asap" ? "asap" : "normal"}`);
+    return true;
+  }
+  if (type === "session.finished") {
+    outputLine(`${label("state", ansi.systemBg)} status=finished${data.result ? ` result=${compactLine(data.result, 86)}` : ""}`);
+    return true;
+  }
+  if (type === "session.failed") {
+    outputLine(`${label("state", ansi.red)} status=failed${data.error ? ` error=${compactLine(data.error, 86)}` : ""}`);
+    return true;
+  }
+  if (type === "session.stopped") {
+    outputLine(`${label("state", ansi.systemBg)} status=stopped${data.reason ? ` reason=${compactLine(data.reason, 86)}` : ""}`);
+    return true;
+  }
+  return false;
+}
+
 async function printResumeHistory(state, { limit = 0 } = {}) {
   if (!state.sessionId) return;
   const paths = projectPaths(process.cwd());
@@ -2215,23 +2340,24 @@ async function printResumeHistory(state, { limit = 0 } = {}) {
   const events = await store.loadEvents().catch(() => []);
   const chat = Array.isArray(saved?.chat) ? saved.chat.filter((entry) => entry?.content) : [];
   promptHistory.seedFromChat(chat, state.sessionId);
-  const metadata = `chat=${chat.length}${events.length > 0 ? ` events=${events.length}` : ""}`;
-  if (chat.length === 0) {
+  const timeline = resumeTimelineItems(chat, events, { limit });
+  const replayedEvents = timeline.filter((item) => item.kind === "event").length;
+  const metadata = `chat=${chat.length}${events.length > 0 ? ` events=${events.length}` : ""}${replayedEvents > 0 ? ` replay=${replayedEvents}` : ""}`;
+  if (timeline.length === 0) {
     printSystemLine(`resume history session=${state.sessionId} ${metadata}`);
-    if (events.length > 0) {
-      printSystemLine("resume note=showing chat transcript only; model/tool/run events are saved in events.jsonl and artifacts/");
-    }
     return;
   }
 
-  const shown = limit > 0 ? chat.slice(-limit) : chat;
   printSystemLine(
-    `resume history session=${state.sessionId} ${metadata}${limit > 0 ? ` showing=${shown.length}/${chat.length}` : ""}`
+    `resume history session=${state.sessionId} ${metadata}${limit > 0 ? ` showing=${timeline.length}/${chat.length + events.length}` : ""}`
   );
-  if (events.length > chat.length) {
-    printSystemLine("resume note=showing chat transcript only; model/tool/run events are saved in events.jsonl and artifacts/");
+  if (events.length > replayedEvents) {
+    printSystemLine("resume note=showing chat plus key run events; full raw events remain in events.jsonl and artifacts/.");
+  }
+  for (const item of timeline) {
+    if (item.kind === "chat") printHistoryEntry(item.entry);
+    else printResumeEvent(item.event);
   }
-  for (const entry of shown) printHistoryEntry(entry);
 }
 
 function toolStatusDetails(data = {}) {

package/web.js

@@ -102,6 +102,140 @@ function mapEventLogs(events) {
   }));
 }
 
+function compactText(value = "", limit = 120) {
+  const text = String(value || "").replace(/\s+/g, " ").trim();
+  return text.length <= limit ? text : `${text.slice(0, Math.max(limit - 1, 1)).trim()}...`;
+}
+
+function toolTimelineSummary(data = {}) {
+  const tool = data.toolName || "unknown";
+  const args = data.args || {};
+  if (tool === "run_command" && args.command) return `${tool}: ${compactText(args.command, 92)}`;
+  if ((tool === "write_file" || tool === "apply_patch" || tool === "read_file" || tool === "open_workspace_file") && args.path) {
+    return `${tool}: ${compactText(args.path, 92)}`;
+  }
+  if ((tool === "open_url" || tool === "web_research" || tool === "web_search") && (args.url || args.query || args.q)) {
+    return `${tool}: ${compactText(args.url || args.query || args.q, 92)}`;
+  }
+  return tool;
+}
+
+function timelineEntryForEvent(event = {}) {
+  const type = String(event.type || "");
+  const data = event.data || {};
+  const at = event.timestamp || "";
+  if (type === "plan.created" && data.plan) {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: "plan",
+      data,
+      content: data.plan,
+      markdown: true,
+      at,
+    };
+  }
+  if (type === "tool.started") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: "tool",
+      data,
+      content: toolTimelineSummary(data),
+      at,
+    };
+  }
+  if (type === "tool.completed" || type === "tool.failed" || type === "tool.skipped") {
+    const failed = type === "tool.failed" || data.ok === false || data.blocked || data.error;
+    const stdout = data.toolName === "run_command" && data.stdout ? `\nstdout: ${compactText(data.stdout, 180)}` : "";
+    const stderr = data.toolName === "run_command" && data.stderr ? `\nstderr: ${compactText(data.stderr, 180)}` : "";
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: failed ? "tool failed" : "tool done",
+      data,
+      content: `${toolTimelineSummary(data)}${stdout}${stderr}`,
+      at,
+    };
+  }
+  if (type === "tool.blocked") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: "permission",
+      data,
+      content: data.permissionAdvice?.summary || data.reason || data.toolName || "Permission blocked.",
+      at,
+    };
+  }
+  if (type === "file.changed") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: data.toolName === "apply_patch" ? "patch" : "write",
+      data,
+      content: [data.toolName || data.action || "file.changed", data.path || "", data.created ? "created" : "updated"]
+        .filter(Boolean)
+        .join(" "),
+      at,
+    };
+  }
+  if (type === "budget.initialized") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: "budget",
+      data,
+      content: `${data.currentMaxSteps || data.initialMaxSteps || data.maxSteps || "unknown"} steps`,
+      at,
+    };
+  }
+  if (type === "conversation.continued") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: "continued",
+      data,
+      content: data.prompt || "",
+      at,
+    };
+  }
+  if (type === "conversation.queued_input_applied") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: "queued input",
+      data,
+      content: data.priority === "asap" ? "ASAP queued input applied" : "Queued input applied",
+      at,
+    };
+  }
+  if (type === "session.finished" || type === "session.failed" || type === "session.stopped") {
+    return {
+      role: "event",
+      eventType: type,
+      eventLabel: type.replace("session.", ""),
+      data,
+      content: data.result || data.error || data.reason || type,
+      at,
+    };
+  }
+  return null;
+}
+
+function sessionTimelineFromChatAndEvents(chat = [], events = []) {
+  const chatItems = (Array.isArray(chat) ? chat : [])
+    .filter((entry) => entry?.content)
+    .map((entry, index) => ({ ...entry, order: index * 2, sortAt: Date.parse(entry.at || "") || 0 }));
+  const eventItems = (Array.isArray(events) ? events : [])
+    .map(timelineEntryForEvent)
+    .filter(Boolean)
+    .map((entry, index) => ({ ...entry, order: index * 2 + 1, sortAt: Date.parse(entry.at || "") || 0 }));
+  return [...chatItems, ...eventItems]
+    .sort((left, right) => (left.sortAt || 0) - (right.sortAt || 0) || left.order - right.order)
+    .map(({ sortAt: _sortAt, order: _order, ...entry }) => entry);
+}
+
 async function loadStoredRun(sessionId) {
   const meta = db.getSession(sessionId);
   if (!meta) return null;
@@ -606,11 +740,16 @@ function deriveChatFromState(state, meta) {
 
 async function loadChat(sessionId) {
   const store = sessionStore(sessionId);
-  const [state, meta] = await Promise.all([store.loadState(), Promise.resolve(db.getSession(sessionId))]);
+  const [state, meta, events] = await Promise.all([
+    store.loadState(),
+    Promise.resolve(db.getSession(sessionId)),
+    store.loadEvents().catch(() => []),
+  ]);
 
   if (!state && !meta) return null;
 
   const inbox = await store.loadInbox().catch(() => []);
+  const chat = deriveChatFromState(state, meta);
   return {
     sessionId,
     goal: state?.goal || meta?.goal || "",
@@ -619,7 +758,9 @@ async function loadChat(sessionId) {
     model: state?.model || meta?.model || "",
     status: meta?.status || "",
     inbox,
-    chat: deriveChatFromState(state, meta),
+    chat,
+    events: events.slice(-120),
+    timeline: sessionTimelineFromChatAndEvents(chat, events).slice(-220),
   };
 }