agent-companion 0.1.6 → 0.1.7

package/bridge/directIngest.mjs

@@ -28,6 +28,8 @@ const MAX_JSONL_TAIL_BYTES = 1_500_000;
 const MAX_JSONL_TAIL_LINES = 1200;
 const DIRECT_RUNNING_FRESH_WINDOW_SEC = 20;
 const DIRECT_RUNNING_STALE_TIMEOUT_SEC = 180;
+const INTERNAL_PLAN_MODE_SUFFIX =
+  "You are in PLAN MODE. Do not implement changes yet. Return only a concrete plan, then end with a single explicit approval question asking whether to proceed with implementation.";
 const PENDING_PATTERN =
   /input required|needs input|waiting for input|approval[_\s-]*required|awaiting approval|please approve|approve (?:this|the) plan|should i (?:proceed|implement|execute)|would you like me to (?:proceed|implement|execute)|ready to (?:implement|execute)|want me to (?:implement|execute)|proceed with implementation/i;
 
@@ -217,7 +219,7 @@ function parseCodexFile(file, nowMs) {
     }
 
     if (record.type === "event_msg" && record.payload?.type === "user_message") {
-      const message = String(record.payload?.message || "").trim();
+      const message = normalizeVisibleUserText(record.payload?.message || "");
       flushPendingAssistant();
       if (message && !isNoisePrompt(message) && !firstPrompt) firstPrompt = message;
       appendDirectTurn(chatTurns, {
@@ -271,7 +273,7 @@ function parseCodexFile(file, nowMs) {
     if (record.type === "response_item" && record.payload?.type === "message") {
       const role = record.payload?.role;
       if (role === "user") {
-        const text = extractCodexText(record.payload?.content);
+        const text = normalizeVisibleUserText(extractCodexText(record.payload?.content));
         flushPendingAssistant();
         if (text && !isNoisePrompt(text) && !firstPrompt) firstPrompt = text;
         appendDirectTurn(chatTurns, {
@@ -622,7 +624,7 @@ function formatCodexToolCall(item) {
 function extractClaudeUserText(message) {
   if (!message) return "";
   if (typeof message.content === "string") {
-    const text = sanitizeDirectText(message.content);
+    const text = normalizeVisibleUserText(message.content);
     return shouldIncludeDirectUserText(text) ? text : "";
   }
   if (!Array.isArray(message.content)) return "";
@@ -630,7 +632,7 @@ function extractClaudeUserText(message) {
   const collected = [];
   for (const part of message.content) {
     if (typeof part === "string") {
-      const text = sanitizeDirectText(part);
+      const text = normalizeVisibleUserText(part);
       if (shouldIncludeDirectUserText(text)) {
         collected.push(text);
       }
@@ -639,20 +641,20 @@ function extractClaudeUserText(message) {
     const partType = String(part?.type || "").trim().toLowerCase();
     if (partType && partType !== "text" && partType !== "input_text") continue;
     if (typeof part?.text === "string") {
-      const text = sanitizeDirectText(part.text);
+      const text = normalizeVisibleUserText(part.text);
       if (shouldIncludeDirectUserText(text)) {
         collected.push(text);
       }
     }
     if (typeof part?.content === "string" && part.content.trim()) {
-      const text = sanitizeDirectText(part.content);
+      const text = normalizeVisibleUserText(part.content);
       if (shouldIncludeDirectUserText(text)) {
         collected.push(text);
       }
     }
   }
 
-  return collected.join("\n\n").trim();
+  return dedupeCollectedText(collected).join("\n\n").trim();
 }
 
 function extractClaudeAssistantText(message) {
@@ -869,6 +871,37 @@ function sanitizeDirectText(value) {
     .trim();
 }
 
+function normalizeVisibleUserText(value) {
+  const text = sanitizeDirectText(value);
+  if (!text) return "";
+
+  return text
+    .replace(new RegExp(`(?:\\n\\s*)*${escapeRegExp(INTERNAL_PLAN_MODE_SUFFIX)}\\s*$`, "i"), "")
+    .trim();
+}
+
+function dedupeCollectedText(values) {
+  const deduped = [];
+  const seen = new Set();
+
+  for (const value of values) {
+    const text = String(value || "").trim();
+    if (!text) continue;
+
+    const normalized = normalizeComparableText(text);
+    if (!normalized || seen.has(normalized)) continue;
+
+    seen.add(normalized);
+    deduped.push(text);
+  }
+
+  return deduped;
+}
+
+function escapeRegExp(value) {
+  return String(value || "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 function getRecentJsonlFiles(rootDir, limit) {
   const now = Date.now();
   const cached = recentFilesCache.get(rootDir);

package/bridge/server.mjs

@@ -1333,11 +1333,7 @@ function normalizeCommandList(input, agentType, prompt) {
 }
 
 function buildPlanPrompt(prompt) {
-  const base = safeTrimmedText(prompt, 1500);
-  if (!base) return "";
-  const suffix =
-    "\n\nYou are in PLAN MODE. Do not implement changes yet. Return only a concrete plan, then end with a single explicit approval question asking whether to proceed with implementation.";
-  return safeTrimmedText(`${base}${suffix}`, 1900);
+  return safeTrimmedText(prompt, 1500);
 }
 
 function createLauncherRun(input) {
@@ -2527,13 +2523,19 @@ function mergeDirectSnapshot(snapshot) {
       .map((item) => item?.id)
       .filter((id) => typeof id === "string")
   );
+  const incomingDirectTurnSessionIds = new Set(
+    (Array.isArray(snapshot.chatTurns) ? snapshot.chatTurns : [])
+      .map((item) => safeTrimmedText(item?.sessionId, 160))
+      .filter(Boolean)
+  );
   state.chatTurns = (Array.isArray(state.chatTurns) ? state.chatTurns : []).filter((item) => {
     const sessionId = String(item?.sessionId || "");
-    const isDirectSession = sessionId.startsWith("codex:") || sessionId.startsWith("claude:");
     const isDirectTurn = safeTrimmedText(item?.source, 48).toUpperCase() === "DIRECT" || String(item?.id || "").startsWith("direct:");
-    if (!isDirectSession || !isDirectTurn) return true;
-    if (!incomingDirectSessionIds.has(sessionId)) return false;
-    return incomingDirectTurnIds.has(item.id);
+    if (!isDirectTurn) return true;
+    if (incomingDirectTurnIds.has(item.id)) return true;
+    if (incomingDirectTurnSessionIds.has(sessionId)) return false;
+    if (incomingDirectSessionIds.has(sessionId)) return false;
+    return true;
   });
 
   const existingTurns = new Map((Array.isArray(state.chatTurns) ? state.chatTurns : []).map((item) => [item.id, item]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-companion",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": false,
   "type": "module",
   "description": "Phone-to-computer companion for Codex and Claude Code.",