open-agents-ai 0.187.381 → 0.187.383

package/dist/index.js

@@ -529838,6 +529838,92 @@ function loadPendingTask(repoRoot) {
     return null;
   }
 }
+function normalizeSessionText(raw, maxLen = 500) {
+  if (!raw) return "";
+  return String(raw).replace(/\s+/g, " ").trim().slice(0, maxLen);
+}
+function normalizeList(items, maxItems) {
+  if (!items || items.length === 0) return void 0;
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const item of items) {
+    const clean3 = normalizeSessionText(item, 300);
+    if (!clean3 || seen.has(clean3)) continue;
+    seen.add(clean3);
+    out.push(clean3);
+    if (out.length >= maxItems) break;
+  }
+  return out.length > 0 ? out : void 0;
+}
+function normalizeSessionContextEntry(entry) {
+  const normalized = {
+    ...entry,
+    savedAt: entry.savedAt || (/* @__PURE__ */ new Date()).toISOString(),
+    task: cleanPromptForDiary(entry.task).slice(0, 500),
+    summary: normalizeSessionText(entry.summary, 500),
+    filesModified: normalizeList(entry.filesModified, 30) ?? [],
+    toolCalls: Math.max(0, entry.toolCalls ?? 0),
+    completed: Boolean(entry.completed),
+    model: normalizeSessionText(entry.model, 160)
+  };
+  const toolsUsed = normalizeList(entry.toolsUsed, 12);
+  if (toolsUsed) normalized.toolsUsed = toolsUsed;
+  const provenance = normalizeSessionText(entry.provenance, 300);
+  if (provenance) normalized.provenance = provenance;
+  const assistantResponse = normalizeSessionText(entry.assistantResponse, 1200);
+  if (assistantResponse) normalized.assistantResponse = assistantResponse;
+  if (entry.source) normalized.source = entry.source;
+  return normalized;
+}
+function sameStringArray(a2, b) {
+  const left = a2 ?? [];
+  const right = b ?? [];
+  if (left.length !== right.length) return false;
+  for (let i2 = 0; i2 < left.length; i2++) {
+    if (left[i2] !== right[i2]) return false;
+  }
+  return true;
+}
+function lastMatchingIndex(items, predicate) {
+  for (let i2 = items.length - 1; i2 >= 0; i2--) {
+    if (predicate(items[i2])) return i2;
+  }
+  return -1;
+}
+function sameTask(a2, b) {
+  return cleanPromptForDiary(a2.task) === cleanPromptForDiary(b.task);
+}
+function parseIsoMs(value2) {
+  if (!value2) return null;
+  const ms = Date.parse(value2);
+  return Number.isFinite(ms) ? ms : null;
+}
+function isWithinReplaceWindow(a2, b) {
+  const left = parseIsoMs(a2.savedAt);
+  const right = parseIsoMs(b.savedAt);
+  if (left == null || right == null) return true;
+  return Math.abs(right - left) <= SAME_TASK_REPLACE_WINDOW_MS;
+}
+function isExactSessionDuplicate(a2, b) {
+  return sameTask(a2, b) && a2.summary === b.summary && (a2.assistantResponse ?? "") === (b.assistantResponse ?? "") && sameStringArray(a2.filesModified, b.filesModified) && sameStringArray(a2.toolsUsed, b.toolsUsed) && (a2.provenance ?? "") === (b.provenance ?? "") && a2.toolCalls === b.toolCalls && a2.completed === b.completed && a2.model === b.model;
+}
+function mergeSessionContextEntry(previous, incoming) {
+  return {
+    ...previous,
+    ...incoming,
+    savedAt: incoming.savedAt || previous.savedAt,
+    task: incoming.task || previous.task,
+    summary: incoming.summary || previous.summary,
+    assistantResponse: incoming.assistantResponse || previous.assistantResponse || incoming.summary || previous.summary,
+    filesModified: incoming.filesModified.length > 0 ? incoming.filesModified : previous.filesModified,
+    toolCalls: Math.max(previous.toolCalls ?? 0, incoming.toolCalls ?? 0),
+    toolsUsed: incoming.toolsUsed && incoming.toolsUsed.length > 0 ? incoming.toolsUsed : previous.toolsUsed,
+    provenance: incoming.provenance || previous.provenance,
+    completed: previous.completed || incoming.completed,
+    model: incoming.model || previous.model,
+    source: incoming.source || previous.source
+  };
+}
 function saveSessionContext(repoRoot, entry) {
   const contextDir = join75(repoRoot, OA_DIR, "context");
   mkdirSync32(contextDir, { recursive: true });
@@ -529852,7 +529938,33 @@ function saveSessionContext(repoRoot, entry) {
   } catch {
     ctx3 = { entries: [], maxEntries: MAX_CONTEXT_ENTRIES, updatedAt: "" };
   }
-  ctx3.entries.push(entry);
+  const normalizedEntry = normalizeSessionContextEntry(entry);
+  const exactIndex = lastMatchingIndex(
+    ctx3.entries,
+    (existing) => isExactSessionDuplicate(normalizeSessionContextEntry(existing), normalizedEntry)
+  );
+  if (exactIndex >= 0) {
+    ctx3.entries[exactIndex] = mergeSessionContextEntry(ctx3.entries[exactIndex], normalizedEntry);
+  } else {
+    const relatedIndex = lastMatchingIndex(ctx3.entries, (existing) => {
+      const normalizedExisting = normalizeSessionContextEntry(existing);
+      return sameTask(normalizedExisting, normalizedEntry) && isWithinReplaceWindow(normalizedExisting, normalizedEntry);
+    });
+    if (relatedIndex >= 0) {
+      const previous = normalizeSessionContextEntry(ctx3.entries[relatedIndex]);
+      const shouldDropPartialResave = previous.completed && !normalizedEntry.completed;
+      const shouldReplaceExisting = !previous.completed || previous.completed === normalizedEntry.completed && normalizedEntry.source === "manual";
+      if (!shouldDropPartialResave) {
+        if (shouldReplaceExisting) {
+          ctx3.entries[relatedIndex] = mergeSessionContextEntry(ctx3.entries[relatedIndex], normalizedEntry);
+        } else {
+          ctx3.entries.push(normalizedEntry);
+        }
+      }
+    } else {
+      ctx3.entries.push(normalizedEntry);
+    }
+  }
   if (ctx3.entries.length > ctx3.maxEntries) {
     ctx3.entries = ctx3.entries.slice(-ctx3.maxEntries);
   }
@@ -529912,6 +530024,9 @@ function renderSessionDiary(entries) {
     if (e2.provenance) {
       lines.push(`- **Provenance:** ${e2.provenance}`);
     }
+    if (e2.assistantResponse) {
+      lines.push(`- **Assistant:** ${e2.assistantResponse.replace(/\s+/g, " ").trim().slice(0, 280)}`);
+    }
     if (e2.summary) {
       const summary = e2.summary.replace(/\s+/g, " ").trim().slice(0, 280);
       lines.push(`- **Summary:** ${summary}`);
@@ -529935,22 +530050,35 @@ function buildContextRestorePrompt(repoRoot) {
   const ctx3 = loadSessionContext(repoRoot);
   if (!ctx3 || ctx3.entries.length === 0) return null;
   const recent = ctx3.entries.slice(-5);
-  const lines = recent.map((e2) => {
+  const chronology = recent.map((e2) => {
     const status = e2.completed ? "done" : "partial";
-    const summary = e2.summary ? e2.summary.slice(0, 120) : e2.task.slice(0, 120);
+    const summary = normalizeSessionText(e2.assistantResponse || e2.summary || e2.task, 140);
     const tools = e2.toolsUsed && e2.toolsUsed.length > 0 ? ` | tools: ${e2.toolsUsed.slice(0, 4).join(", ")}` : "";
     const files = e2.filesModified && e2.filesModified.length > 0 ? ` | files: ${e2.filesModified.slice(0, 3).join(", ")}` : "";
     return `[${status}] ${summary}${tools}${files}`;
   });
   const last2 = ctx3.entries[ctx3.entries.length - 1];
+  const lastCompleted = [...ctx3.entries].reverse().find((entry) => entry.completed);
+  const latestCompleted = lastCompleted ? `Latest completed task: ${normalizeSessionText(lastCompleted.assistantResponse || lastCompleted.summary || lastCompleted.task, 180)}` : "";
+  const recentDialogue = recent.slice(-3).map((entry) => {
+    const assistant = normalizeSessionText(entry.assistantResponse || entry.summary, 320) || "(no assistant reply captured)";
+    const user = cleanPromptForDiary(entry.task).slice(0, 220);
+    return `User: ${user}
+Assistant: ${assistant}`;
+  }).join("\n\n");
   const prov = last2.provenance ? `
 Provenance: ${last2.provenance} (file_read to expand)` : "";
   const kg = `
 KG summary: .oa/context/kg-summary-latest.md (file_read to expand)`;
   return `<session-recap>
-Previous work in this project:
-${lines.join("\n")}
-Do not repeat completed work.${prov}${kg}
+Project chronology (older to newer):
+${chronology.join("\n")}
+` + (latestCompleted ? `
+${latestCompleted}
+` : "\n") + `
+Most recent exchanges (older to newer):
+${recentDialogue}
+Continue from the latest exchange and do not repeat completed work.${prov}${kg}
 </session-recap>`;
 }
 function getLastTaskSummary(repoRoot) {
@@ -530236,7 +530364,7 @@ function deleteUsageRecord(kind, value2, repoRoot) {
     remove(join75(repoRoot, OA_DIR, USAGE_HISTORY_FILE));
   }
 }
-var OA_DIR, SUBDIRS, CONTEXT_FILES, PENDING_TASK_FILE, CONTEXT_SAVE_FILE, MAX_CONTEXT_ENTRIES, SESSIONS_DIR, SESSIONS_INDEX, SKIP_DIRS2, HOME_SKIP_DIRS, USAGE_HISTORY_FILE, MAX_HISTORY_RECORDS;
+var OA_DIR, SUBDIRS, CONTEXT_FILES, PENDING_TASK_FILE, CONTEXT_SAVE_FILE, MAX_CONTEXT_ENTRIES, SAME_TASK_REPLACE_WINDOW_MS, SESSIONS_DIR, SESSIONS_INDEX, SKIP_DIRS2, HOME_SKIP_DIRS, USAGE_HISTORY_FILE, MAX_HISTORY_RECORDS;
 var init_oa_directory = __esm({
   "packages/cli/src/tui/oa-directory.ts"() {
     "use strict";
@@ -530255,6 +530383,7 @@ var init_oa_directory = __esm({
     PENDING_TASK_FILE = "pending-task.json";
     CONTEXT_SAVE_FILE = "session-context.json";
     MAX_CONTEXT_ENTRIES = 20;
+    SAME_TASK_REPLACE_WINDOW_MS = 12 * 60 * 60 * 1e3;
     SESSIONS_DIR = "sessions";
     SESSIONS_INDEX = "sessions-index.json";
     SKIP_DIRS2 = /* @__PURE__ */ new Set([
@@ -532003,6 +532132,9 @@ var init_status_bar = __esm({
       // Since we're in alternate screen buffer, there's no native scrollback.
       // NOTE: _contentLines is now a reference to the ACTIVE view's buffer.
       _contentLines = [];
+      /** Last buffered visible-line fingerprint — suppresses accidental double inserts */
+      _lastBufferedFingerprint = "";
+      _lastBufferedAt = 0;
       _contentScrollOffset = 0;
       // 0 = live (bottom), >0 = scrolled back
       _contentMaxLines = 1e4;
@@ -532924,6 +533056,8 @@ var init_status_bar = __esm({
         this._contentLines.splice(0, this._contentLines.length);
         this._contentScrollOffset = 0;
         this._inProgressLine = "";
+        this._lastBufferedFingerprint = "";
+        this._lastBufferedAt = 0;
         this._autoScroll = true;
         this.fillContentArea();
         this.renderFooterAndPositionInput();
@@ -533615,9 +533749,10 @@ var init_status_bar = __esm({
                 self2._inProgressLine = combined.slice(lastNl + 1);
                 const completeLines = completed.split("\n");
                 for (const line of completeLines) {
-                  const visible = line.replace(/\x1B\[[0-9;]*[A-Za-z]/g, "");
-                  if (line.length === 0 || visible.length > 0) {
-                    self2.bufferContentLine(line);
+                  const sanitized = self2.sanitizeBufferedContentLine(line);
+                  const visible = stripAnsi(sanitized);
+                  if (sanitized.length === 0 || visible.length > 0) {
+                    self2.bufferContentLine(sanitized);
                   }
                 }
               }
@@ -533653,8 +533788,9 @@ ${CONTENT_BG_SEQ}`);
         this.writeDepth = Math.max(0, this.writeDepth - 1);
         if (this.writeDepth === 0) {
           if (this._inProgressLine.length > 0) {
-            const visible = this._inProgressLine.replace(/\x1B\[[0-9;]*[A-Za-z]/g, "");
-            if (visible.length > 0) this.bufferContentLine(this._inProgressLine);
+            const sanitized = this.sanitizeBufferedContentLine(this._inProgressLine);
+            const visible = stripAnsi(sanitized);
+            if (visible.length > 0) this.bufferContentLine(sanitized);
             this._inProgressLine = "";
           }
           this._bufferContent = false;
@@ -533707,7 +533843,15 @@ ${CONTENT_BG_SEQ}`);
         this.renderFooterAndPositionInput();
       }
       bufferContentLine(line) {
-        this._contentLines.push(line);
+        const sanitized = this.sanitizeBufferedContentLine(line);
+        const fingerprint = stripAnsi(sanitized).trim();
+        const now = Date.now();
+        if (fingerprint && fingerprint === this._lastBufferedFingerprint && now - this._lastBufferedAt < 50) {
+          return;
+        }
+        this._lastBufferedFingerprint = fingerprint;
+        this._lastBufferedAt = now;
+        this._contentLines.push(sanitized);
         if (this._contentLines.length > this._contentMaxLines) {
           this._contentLines.splice(0, this._contentLines.length - this._contentMaxLines);
           if (this._contentScrollOffset > 0) {
@@ -533719,6 +533863,10 @@ ${CONTENT_BG_SEQ}`);
         }
         if (this._autoScroll && !this._mouseSelecting) this._contentScrollOffset = 0;
       }
+      /** Keep SGR styling, drop replay-unsafe terminal control sequences from scrollback storage. */
+      sanitizeBufferedContentLine(line) {
+        return line.replace(/\r/g, "").replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, (seq) => seq.endsWith("m") ? seq : "");
+      }
       /**
        * Remove the last N lines from the content scrollback buffer and repaint.
        * Used by Esc-to-recall to erase the just-rendered user prompt.
@@ -544417,6 +544565,16 @@ async function handleSlashCommand(input, ctx3) {
     case "color":
     case "colors":
     case "theme": {
+      const colorAction = arg.toLowerCase();
+      if (cmd !== "theme" && ["toggle", "on", "off", "enable", "disable"].includes(colorAction)) {
+        const current = ctx3.getColors?.() ?? true;
+        const next = colorAction === "on" || colorAction === "enable" ? true : colorAction === "off" || colorAction === "disable" ? false : !current;
+        ctx3.setColors?.(next);
+        const save2 = hasLocal ? ctx3.saveLocalSettings.bind(ctx3) : ctx3.saveSettings.bind(ctx3);
+        save2({ colors: next });
+        renderInfo2(`Colors ${next ? "enabled" : "disabled"}.${hasLocal ? " (project-local)" : ""}`);
+        return "handled";
+      }
       await showColorMenu(ctx3);
       return "handled";
     }
@@ -547713,16 +547871,6 @@ sleep 1
       renderInfo2(`Emojis ${next ? "enabled" : "disabled"}.`);
       return "handled";
     }
-    case "colors":
-    case "color": {
-      const current = ctx3.getColors?.() ?? true;
-      const next = !current;
-      ctx3.setColors?.(next);
-      const save2 = hasLocal ? ctx3.saveLocalSettings.bind(ctx3) : ctx3.saveSettings.bind(ctx3);
-      save2({ colors: next });
-      renderInfo2(`Colors ${next ? "enabled" : "disabled"}.`);
-      return "handled";
-    }
     case "pause": {
       if (!ctx3.hasActiveTask?.()) {
         renderWarning2("No active task to pause.");
@@ -556995,7 +557143,6 @@ function loadMemoryContext(repoRoot) {
 }
 function loadSessionHistory2(repoRoot) {
   const sessions2 = loadRecentSessions(repoRoot, 5);
-  if (sessions2.length === 0) return "";
   const lines = ["Recent tasks in this project:"];
   for (const s2 of sessions2) {
     if (!s2.startedAt || !s2.task) continue;
@@ -557008,7 +557155,20 @@ function loadSessionHistory2(repoRoot) {
       lines.push(`  Summary: ${cleanSummary.slice(0, 120)}`);
     }
   }
-  return lines.join("\n");
+  const sessionCtx = loadSessionContext(repoRoot);
+  const exchanges = sessionCtx?.entries.slice(-2) ?? [];
+  if (exchanges.length > 0) {
+    if (lines.length > 1) lines.push("");
+    lines.push("Most recent user/assistant chronology:");
+    for (const entry of exchanges) {
+      const user = cleanForStorage(entry.task) || entry.task;
+      const assistant = cleanForStorage(entry.assistantResponse || entry.summary) || entry.assistantResponse || entry.summary;
+      if (!assistant) continue;
+      lines.push(`- User: ${user.slice(0, 120)}`);
+      lines.push(`  Assistant: ${assistant.slice(0, 160)}`);
+    }
+  }
+  return lines.length > 1 ? lines.join("\n") : "";
 }
 function getEnvironment(repoRoot) {
   return [
@@ -566858,11 +567018,13 @@ async function handleContextSave(ctx3) {
       savedAt: (/* @__PURE__ */ new Date()).toISOString(),
       task: typeof body?.task === "string" ? body.task : typeof body?.prompt === "string" ? body.prompt : typeof body?.task_id === "string" ? body.task_id : `manual-${Date.now()}`,
       summary: typeof body?.summary === "string" ? body.summary : "",
+      assistantResponse: typeof body?.assistant_response === "string" ? body.assistant_response : "",
       filesModified: Array.isArray(body?.files_modified) ? body.files_modified : [],
       toolCalls: typeof body?.tool_calls === "number" ? body.tool_calls : 0,
       completed: body?.completed !== false,
       // default true
-      model: typeof body?.model === "string" ? body.model : ""
+      model: typeof body?.model === "string" ? body.model : "",
+      source: "api"
     };
     saveSessionContext(repoRoot, entry);
     publishEvent("session.created", { task: entry.task.slice(0, 80) }, {
@@ -579633,7 +579795,6 @@ function startTask(task, config, repoRoot, voice, stream, taskStores, bruteForce
   const modelTier = getModelTier(config.model);
   const projectCtx = buildProjectContext(repoRoot, taskStores?.contextStores);
   let dynamicContext = formatContextForPrompt(projectCtx, modelTier);
-  let _autoJumpedThisStream = false;
   const environmentProvider = () => {
     try {
       let env2 = formatSnapshotForContext(collectSnapshot(repoRoot));
@@ -580247,6 +580408,7 @@ ${entry.fullContent}`
   let toolCallStartMs = 0;
   let streamStartMs = 0;
   let streamTextBuffer = "";
+  let lastAssistantText = "";
   let lastProvenancePath = null;
   let showLittleman = false;
   const littlemanBuffer = [];
@@ -580283,25 +580445,9 @@ ${entry.fullContent}`
     }
     if (statusBar?.isActive) {
       statusBar.beginContentWrite();
-      const alreadyBuffered = process.stdout.write.__oa_buffer_lines === true;
-      let postInterceptWrite = null;
-      if (!alreadyBuffered) {
-        postInterceptWrite = process.stdout.write;
-        const boundWrite = postInterceptWrite.bind(process.stdout);
-        process.stdout.write = ((chunk, ...args) => {
-          const text = typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk);
-          for (const line of text.split("\n")) {
-            if (line.replace(/\x1B\[[0-9;]*[A-Za-z]/g, "").length > 0) {
-              statusBar.bufferContentLine(line);
-            }
-          }
-          return boundWrite(chunk, ...args);
-        });
-      }
       try {
         fn();
       } finally {
-        if (postInterceptWrite) process.stdout.write = postInterceptWrite;
         statusBar.endContentWrite();
       }
     } else {
@@ -580444,7 +580590,6 @@ ${entry.fullContent}`
       case "stream_start":
         streamStartMs = Date.now();
         streamTextBuffer = "";
-        _autoJumpedThisStream = false;
         if (!isNeovimActive()) {
           if (stream?.enabled) {
             if (statusBar?.isActive) statusBar.beginContentWrite();
@@ -580463,15 +580608,6 @@ ${entry.fullContent}`
             writeToNeovimOutput(event.content);
           }
         } else if (stream?.enabled) {
-          if (statusBar?.isActive && statusBar.isScrolledBack && !_autoJumpedThisStream) {
-            if ((event.streamKind ?? "content") === "thinking") {
-              try {
-                statusBar.jumpToLive();
-              } catch {
-              }
-              _autoJumpedThisStream = true;
-            }
-          }
           stream.renderer.write(
             event.content ?? "",
             event.streamKind ?? "content"
@@ -580584,6 +580720,10 @@ ${entry.fullContent}`
         if (sudoCallback) sudoCallback(event.content ?? "");
         break;
       case "assistant_text":
+        if (event.content) {
+          const cleanAssistantText = cleanForStorage(event.content).trim();
+          if (cleanAssistantText) lastAssistantText = cleanAssistantText;
+        }
         if (_apiCallbacks?.onAssistantText && event.content) {
           _apiCallbacks.onAssistantText(event.content, event.turn ?? 0);
         }
@@ -580792,14 +580932,17 @@ When done, either call task_complete with your answer, or use FINAL_VAR(variable
     } catch {
     }
     try {
+      const assistantResponse = cleanForStorage(lastAssistantText || result.summary).slice(0, 1200);
       saveSessionContext(repoRoot, {
         savedAt: (/* @__PURE__ */ new Date()).toISOString(),
         task: cleanPromptForDiary(task).slice(0, 500),
         summary: result.summary.slice(0, 500),
+        assistantResponse,
         filesModified: Array.from(filesTouched).slice(0, 30),
         toolCalls: result.toolCalls,
         completed: result.completed,
-        model: config.model
+        model: config.model,
+        source: "task_complete"
       });
     } catch {
     }
@@ -581562,7 +581705,6 @@ ${opts.systemPromptAddition}` : `Working directory: ${repoRoot}`;
   let adminSessionKey = null;
   const callSubAgents = /* @__PURE__ */ new Map();
   const streamRenderer = new StreamRenderer();
-  let _autoJumpedThisStream = false;
   if (savedSettings.voice) {
     if (savedSettings.voiceModel) {
       voiceEngine.modelId = savedSettings.voiceModel;
@@ -583891,6 +584033,7 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
           summary: `Manual context save. ${sessionToolCallCount} tool calls, ${sessionFilesTouched.length} files modified.`,
           filesModified: [...sessionFilesTouched],
           toolCalls: sessionToolCallCount,
+          source: "manual",
           completed: false,
           model: currentConfig.model
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.381",
+  "version": "0.187.383",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",