open-agents-ai 0.187.179 → 0.187.181

package/dist/index.js

@@ -284371,6 +284371,7 @@ var oa_directory_exports = {};
 __export(oa_directory_exports, {
   OA_DIR: () => OA_DIR,
   buildContextRestorePrompt: () => buildContextRestorePrompt,
+  cleanPromptForDiary: () => cleanPromptForDiary,
   deleteSession: () => deleteSession,
   deleteUsageRecord: () => deleteUsageRecord,
   discoverContextFiles: () => discoverContextFiles,
@@ -284389,6 +284390,7 @@ __export(oa_directory_exports, {
   readIndexData: () => readIndexData,
   readIndexMeta: () => readIndexMeta,
   recordUsage: () => recordUsage,
+  renderSessionDiary: () => renderSessionDiary,
   resolveSettings: () => resolveSettings,
   saveGlobalSettings: () => saveGlobalSettings,
   savePendingTask: () => savePendingTask,
@@ -284671,22 +284673,59 @@ function saveSessionContext(repoRoot, entry) {
   ctx3.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   writeFileSync26(filePath, JSON.stringify(ctx3, null, 2) + "\n", "utf-8");
   try {
-    const diaryLines = ["# Session Diary", ""];
-    for (const e2 of ctx3.entries.slice(-10)) {
-      const date = e2.savedAt ? new Date(e2.savedAt).toISOString().slice(0, 16).replace("T", " ") : "unknown";
-      const status = e2.completed ? "\u2713" : "\u25CB";
-      const task = (e2.task || "untitled").slice(0, 120);
-      diaryLines.push(`## ${date} \u2014 ${task} ${status}`);
-      if (e2.filesModified?.length) {
-        diaryLines.push(`Files: ${e2.filesModified.slice(0, 5).join(", ")}${e2.filesModified.length > 5 ? ` (+${e2.filesModified.length - 5} more)` : ""}`);
-      }
-      if (e2.summary) diaryLines.push(`Summary: ${e2.summary.slice(0, 200)}`);
-      diaryLines.push("");
-    }
-    writeFileSync26(join71(contextDir, "session-diary.md"), diaryLines.join("\n"), "utf-8");
+    writeFileSync26(
+      join71(contextDir, "session-diary.md"),
+      renderSessionDiary(ctx3.entries.slice(-10)),
+      "utf-8"
+    );
   } catch {
   }
 }
+function cleanPromptForDiary(raw) {
+  if (!raw) return "";
+  let text = String(raw);
+  text = text.replace(/^\[Previous sessions exist[^\]]*\]\s*\n*/m, "");
+  text = text.replace(/^[\s\S]*?\n---\s*\n\s*NEW TASK:\s*/m, "");
+  text = text.replace(/^NEW TASK:\s*/m, "");
+  text = text.replace(/^<system>[\s\S]*?<\/system>\s*\n*/m, "");
+  text = text.replace(/\s+/g, " ").trim();
+  return text || "(empty prompt)";
+}
+function renderSessionDiary(entries) {
+  const lines = ["# Session Diary", ""];
+  if (entries.length === 0) {
+    lines.push("_(no sessions recorded yet)_", "");
+    return lines.join("\n");
+  }
+  for (const e2 of entries) {
+    const date = e2.savedAt ? new Date(e2.savedAt).toISOString().slice(0, 16).replace("T", " ") : "unknown time";
+    const status = e2.completed ? "\u2713" : "\u25CB";
+    const cleanPrompt = cleanPromptForDiary(e2.task);
+    const slug = cleanPrompt.length > 80 ? cleanPrompt.slice(0, 77) + "..." : cleanPrompt;
+    lines.push(`## ${date} ${status} ${slug || "untitled"}`);
+    lines.push("");
+    lines.push(`- **Prompt:** ${cleanPrompt || "(empty prompt)"}`);
+    if (e2.model) {
+      lines.push(`- **Model:** ${e2.model}`);
+    }
+    if (e2.filesModified && e2.filesModified.length > 0) {
+      const shown = e2.filesModified.slice(0, 5).join(", ");
+      const more = e2.filesModified.length > 5 ? ` (+${e2.filesModified.length - 5} more)` : "";
+      lines.push(`- **Files:** ${shown}${more}`);
+    }
+    if (typeof e2.toolCalls === "number" && e2.toolCalls > 0) {
+      lines.push(`- **Tools:** ${e2.toolCalls} call${e2.toolCalls === 1 ? "" : "s"}`);
+    }
+    if (e2.summary) {
+      const summary = e2.summary.replace(/\s+/g, " ").trim().slice(0, 280);
+      lines.push(`- **Summary:** ${summary}`);
+    }
+    lines.push("");
+  }
+  while (lines.length > 1 && lines[lines.length - 1] === "") lines.pop();
+  lines.push("");
+  return lines.join("\n");
+}
 function loadSessionContext(repoRoot) {
   const filePath = join71(repoRoot, OA_DIR, "context", CONTEXT_SAVE_FILE);
   try {
@@ -302317,6 +302356,13 @@ async function handleMcp(subcommand, ctx3) {
   }
   await showMcpMainMenu(ctx3);
 }
+function validateMcpConfigShape(parsed) {
+  if (!parsed || typeof parsed !== "object") return "Config must be a JSON object";
+  if (typeof parsed.command !== "string" && typeof parsed.url !== "string") {
+    return "Config must have either 'command' (stdio) or 'url' (http)";
+  }
+  return null;
+}
 async function showMcpMainMenu(ctx3) {
   const manager = ctx3.getMcpManager?.();
   if (!manager) return;
@@ -302354,19 +302400,76 @@ async function showMcpMainMenu(ctx3) {
   }
   items.push({ key: "hdr_actions", label: selectColors.dim("\u2500\u2500\u2500 Actions \u2500\u2500\u2500"), kind: "header" });
   skipKeys.push("hdr_actions");
-  items.push({ key: "act_add", label: c3.cyan("\u2795 Add new server"), detail: "Paste/enter a config", kind: "action" });
+  items.push({ key: "act_add", label: c3.cyan("\u2795 Add new server"), detail: "Inline name + JSON intake", kind: "action" });
   items.push({ key: "act_reload", label: c3.cyan("\u27F3 Reload all from config"), detail: "Re-read .oa/mcp.json + reconnect", kind: "action" });
-  items.push({ key: "act_open", label: c3.cyan("\u{1F4DD} Open .oa/mcp.json in editor"), detail: "External edit", kind: "action" });
+  items.push({ key: "act_open", label: c3.cyan("\u{1F4DD} Show .oa/mcp.json path"), detail: "For external editing", kind: "action" });
+  let pendingAdd = null;
+  const postMessages = [];
   const result = await tuiSelect({
     items,
     title: "MCP Server Registry",
-    skipKeys
+    skipKeys,
+    onEnter: (item, helpers) => {
+      if (item.key === "act_add") {
+        helpers.getInput("Server name (e.g. memory):", "").then(async (name10) => {
+          if (!name10 || name10.trim().length === 0) {
+            postMessages.push({ kind: "info", text: "Add cancelled \u2014 no name entered." });
+            helpers.render();
+            return;
+          }
+          const cfgStr = await helpers.getInput(
+            'Config JSON (e.g. {"command":"npx","args":["-y","@modelcontextprotocol/server-memory"]}):',
+            ""
+          );
+          if (!cfgStr || cfgStr.trim().length === 0) {
+            postMessages.push({ kind: "info", text: "Add cancelled \u2014 no config entered." });
+            helpers.render();
+            return;
+          }
+          let parsed;
+          try {
+            parsed = JSON.parse(cfgStr);
+          } catch (e2) {
+            postMessages.push({ kind: "error", text: `Invalid JSON: ${e2 instanceof Error ? e2.message : String(e2)}` });
+            helpers.render();
+            return;
+          }
+          const shapeErr = validateMcpConfigShape(parsed);
+          if (shapeErr) {
+            postMessages.push({ kind: "error", text: shapeErr });
+            helpers.render();
+            return;
+          }
+          pendingAdd = { name: name10.trim(), config: parsed };
+          helpers.resolve({ confirmed: true, key: "__pending_add__", index: -1 });
+        });
+        return true;
+      }
+      return false;
+    }
   });
-  if (!result || !result.confirmed || !result.key) return;
-  if (result.key === "act_add") {
-    await mcpAddServerInteractive(ctx3);
+  for (const msg of postMessages) {
+    if (msg.kind === "info") renderInfo(msg.text);
+    else if (msg.kind === "warn") renderWarning(msg.text);
+    else renderError(msg.text);
+  }
+  if (pendingAdd) {
+    const { name: name10, config } = pendingAdd;
+    try {
+      const c22 = await manager.addServer(name10, config);
+      await ctx3.refreshMcpTools?.();
+      if (c22.status === "connected") {
+        renderInfo(`\u2714 ${name10} added and connected (${c22.tools.length} tools)`);
+      } else {
+        renderWarning(`\u26A0 ${name10} saved to .oa/mcp.json but not connected: ${c22.error ?? "unknown"}`);
+      }
+    } catch (e2) {
+      renderError(`Add failed: ${e2 instanceof Error ? e2.message : String(e2)}`);
+    }
+    await showMcpMainMenu(ctx3);
     return;
   }
+  if (!result || !result.confirmed || !result.key) return;
   if (result.key === "act_reload") {
     renderInfo("Reloading MCP servers...");
     await manager.disconnectAll().catch(() => {
@@ -302450,15 +302553,76 @@ async function showMcpDetailMenu(ctx3, serverName) {
   }
   items.push({ key: "hdr_actions", label: selectColors.dim("\u2500\u2500\u2500 Actions \u2500\u2500\u2500"), kind: "header" });
   skipKeys.push("hdr_actions");
-  items.push({ key: "act_edit", label: c3.cyan("\u270E Edit config"), detail: "Modify command/args/env/url/headers", kind: "action" });
+  items.push({ key: "act_edit", label: c3.cyan("\u270E Edit config"), detail: "Modify command/args/env/url/headers (inline)", kind: "action" });
   items.push({ key: "act_reconnect", label: c3.cyan("\u27F3 Reconnect"), detail: "Disconnect + reconnect this server", kind: "action" });
   items.push({ key: "act_delete", label: c3.red("\u{1F5D1} Delete"), detail: "Remove from config + disconnect", kind: "action" });
   items.push({ key: "act_back", label: c3.dim("\u2190 Back to server list"), kind: "action" });
+  let pendingEdit = null;
+  const postMessages = [];
   const result = await tuiSelect({
     items,
     title: `MCP: ${serverName}`,
-    skipKeys
+    skipKeys,
+    onEnter: (item, helpers) => {
+      if (item.key === "act_edit") {
+        const currentJson = JSON.stringify(persisted ?? {});
+        helpers.getInput(
+          `New JSON config for ${serverName} (current shown \u2014 edit then Enter; Esc to cancel):`,
+          currentJson
+        ).then(async (newJson) => {
+          if (newJson === null || newJson.trim().length === 0) {
+            postMessages.push({ kind: "info", text: "Edit cancelled \u2014 no change." });
+            helpers.render();
+            return;
+          }
+          if (newJson.trim() === currentJson.trim()) {
+            postMessages.push({ kind: "info", text: "Edit cancelled \u2014 config unchanged." });
+            helpers.render();
+            return;
+          }
+          let parsed;
+          try {
+            parsed = JSON.parse(newJson);
+          } catch (e2) {
+            postMessages.push({ kind: "error", text: `Invalid JSON: ${e2 instanceof Error ? e2.message : String(e2)}` });
+            helpers.render();
+            return;
+          }
+          const shapeErr = validateMcpConfigShape(parsed);
+          if (shapeErr) {
+            postMessages.push({ kind: "error", text: shapeErr });
+            helpers.render();
+            return;
+          }
+          pendingEdit = parsed;
+          helpers.resolve({ confirmed: true, key: "__pending_edit__", index: -1 });
+        });
+        return true;
+      }
+      return false;
+    }
   });
+  for (const msg of postMessages) {
+    if (msg.kind === "info") renderInfo(msg.text);
+    else if (msg.kind === "warn") renderWarning(msg.text);
+    else renderError(msg.text);
+  }
+  if (pendingEdit) {
+    try {
+      await manager.disconnect(serverName);
+      const c22 = await manager.addServer(serverName, pendingEdit);
+      await ctx3.refreshMcpTools?.();
+      if (c22.status === "connected") {
+        renderInfo(`\u2714 ${serverName} updated and reconnected (${c22.tools.length} tools)`);
+      } else {
+        renderWarning(`\u26A0 ${serverName} saved but not connected: ${c22.error ?? "unknown"}`);
+      }
+    } catch (e2) {
+      renderError(`Save failed: ${e2 instanceof Error ? e2.message : String(e2)}`);
+    }
+    await showMcpDetailMenu(ctx3, serverName);
+    return;
+  }
   if (!result || !result.confirmed || !result.key) {
     await showMcpMainMenu(ctx3);
     return;
@@ -302467,10 +302631,6 @@ async function showMcpDetailMenu(ctx3, serverName) {
     await showMcpMainMenu(ctx3);
     return;
   }
-  if (result.key === "act_edit") {
-    await mcpEditServer(ctx3, serverName, persisted);
-    return;
-  }
   if (result.key === "act_reconnect") {
     renderInfo(`Reconnecting ${serverName}...`);
     try {
@@ -302503,126 +302663,6 @@ async function showMcpDetailMenu(ctx3, serverName) {
     return;
   }
 }
-async function mcpEditServer(ctx3, serverName, current) {
-  const manager = ctx3.getMcpManager?.();
-  if (!manager) return;
-  const ask2 = (prompt) => new Promise((res) => {
-    process.stdout.write(prompt);
-    let buf = "";
-    const onData = (d2) => {
-      const s2 = d2.toString();
-      if (s2.includes("\n")) {
-        process.stdin.removeListener("data", onData);
-        process.stdin.pause();
-        res((buf + s2).split("\n")[0]);
-      } else {
-        buf += s2;
-      }
-    };
-    process.stdin.resume();
-    process.stdin.on("data", onData);
-  });
-  process.stdout.write(`
-  ${c3.cyan("Current config for ")}${c3.bold(serverName)}:
-`);
-  process.stdout.write(`  ${c3.dim(JSON.stringify(current ?? {}, null, 2).split("\n").join("\n  "))}
-
-`);
-  process.stdout.write(`  ${c3.cyan("Paste a new JSON config (single line) or press Enter to keep current.")}
-`);
-  const newConfigJson = await ask2("  > ");
-  if (!newConfigJson || newConfigJson.trim().length === 0) {
-    renderInfo("No change.");
-    await showMcpDetailMenu(ctx3, serverName);
-    return;
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(newConfigJson);
-  } catch (e2) {
-    renderError(`Invalid JSON: ${e2 instanceof Error ? e2.message : String(e2)}`);
-    await showMcpDetailMenu(ctx3, serverName);
-    return;
-  }
-  if (!parsed || typeof parsed.command !== "string" && typeof parsed.url !== "string") {
-    renderError("Config must have either 'command' (stdio) or 'url' (http)");
-    await showMcpDetailMenu(ctx3, serverName);
-    return;
-  }
-  try {
-    await manager.disconnect(serverName);
-    const c22 = await manager.addServer(serverName, parsed);
-    await ctx3.refreshMcpTools?.();
-    if (c22.status === "connected") {
-      renderInfo(`\u2714 ${serverName} updated and reconnected (${c22.tools.length} tools)`);
-    } else {
-      renderWarning(`\u26A0 ${serverName} saved but not connected: ${c22.error}`);
-    }
-  } catch (e2) {
-    renderError(`Save failed: ${e2 instanceof Error ? e2.message : String(e2)}`);
-  }
-  await showMcpMainMenu(ctx3);
-}
-async function mcpAddServerInteractive(ctx3) {
-  const ask2 = (prompt) => new Promise((res) => {
-    process.stdout.write(prompt);
-    let buf = "";
-    const onData = (d2) => {
-      const s2 = d2.toString();
-      if (s2.includes("\n")) {
-        process.stdin.removeListener("data", onData);
-        process.stdin.pause();
-        res((buf + s2).split("\n")[0]);
-      } else {
-        buf += s2;
-      }
-    };
-    process.stdin.resume();
-    process.stdin.on("data", onData);
-  });
-  process.stdout.write(`
-  ${c3.cyan("Add MCP server")}
-`);
-  process.stdout.write(`  ${c3.dim("Tip: drag-drop a markdown file with an MCP config block onto the terminal for auto-intake.")}
-
-`);
-  const name10 = await ask2(`  ${c3.cyan("Server name:")} `);
-  if (!name10 || name10.trim().length === 0) {
-    renderInfo("Cancelled.");
-    return;
-  }
-  process.stdout.write(`  ${c3.cyan('Config JSON (one line, e.g. {"command":"npx","args":["-y","@modelcontextprotocol/server-memory"]}):')} 
-`);
-  const cfgStr = await ask2("  > ");
-  let parsed;
-  try {
-    parsed = JSON.parse(cfgStr);
-  } catch (e2) {
-    renderError(`Invalid JSON: ${e2 instanceof Error ? e2.message : String(e2)}`);
-    return;
-  }
-  if (!parsed || typeof parsed.command !== "string" && typeof parsed.url !== "string") {
-    renderError("Config must have either 'command' (stdio) or 'url' (http)");
-    return;
-  }
-  const manager = ctx3.getMcpManager?.();
-  if (!manager) {
-    renderError("MCP manager not available");
-    return;
-  }
-  try {
-    const c22 = await manager.addServer(name10.trim(), parsed);
-    await ctx3.refreshMcpTools?.();
-    if (c22.status === "connected") {
-      renderInfo(`\u2714 ${name10.trim()} added and connected (${c22.tools.length} tools)`);
-    } else {
-      renderWarning(`\u26A0 ${name10.trim()} saved but not connected: ${c22.error}`);
-    }
-  } catch (e2) {
-    renderError(`Add failed: ${e2 instanceof Error ? e2.message : String(e2)}`);
-  }
-  await showMcpMainMenu(ctx3);
-}
 async function handleUpdate(subcommand, ctx3) {
   const repoRoot = ctx3.repoRoot;
   if (subcommand === "auto") {
@@ -316645,7 +316685,7 @@ When done, either call task_complete with your answer, or use FINAL_VAR(variable
     try {
       saveSessionContext(repoRoot, {
         savedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        task: task.slice(0, 500),
+        task: cleanPromptForDiary(task).slice(0, 500),
         summary: result.summary.slice(0, 500),
         filesModified: Array.from(filesTouched).slice(0, 30),
         toolCalls: result.toolCalls,
@@ -319362,9 +319402,10 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
     },
     contextSave() {
       try {
+        const cleaned = (lastSubmittedPrompt || "(manual save)").replace(/^\[Previous sessions exist[^\]]*\]\s*/m, "").replace(/^NEW TASK:\s*/m, "").trim() || "(manual save)";
         const entry = {
           savedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          task: lastSubmittedPrompt || "(manual save)",
+          task: cleaned,
           summary: `Manual context save. ${sessionToolCallCount} tool calls, ${sessionFilesTouched.length} files modified.`,
           filesModified: [...sessionFilesTouched],
           toolCalls: sessionToolCallCount,

package/package.json

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