ragent-cli 1.11.8 → 1.11.10

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "ragent-cli",
-      version: "1.11.8",
+      version: "1.11.10",
       description: "CLI agent for rAgent Live \u2014 browser-first terminal control plane for AI coding agents",
       main: "dist/index.js",
       bin: {
@@ -662,8 +662,30 @@ var ClaudeCodeParserV2 = class {
     return "";
   }
 };
+function mapCodexRole(role) {
+  const r = role?.toLowerCase();
+  if (r === "user") return "user";
+  if (r === "assistant") return "assistant";
+  return null;
+}
+function extractCodexText(content) {
+  if (!Array.isArray(content)) return "";
+  return content.filter(
+    (c) => (c.type === "input_text" || c.type === "output_text" || c.type === "text") && typeof c.text === "string"
+  ).map((c) => c.text).join("\n").trim();
+}
+function parseCodexArguments(args) {
+  if (typeof args !== "string" || !args) return void 0;
+  try {
+    return JSON.parse(args);
+  } catch {
+    return args;
+  }
+}
 var CodexCliParserV2 = class {
   name = "codex-cli-v2";
+  pendingTools = /* @__PURE__ */ new Map();
+  turnCounter = 0;
   parseLine(line) {
     let obj;
     try {
@@ -672,21 +694,62 @@ var CodexCliParserV2 = class {
       debugTranscriptParse("codex", line, error);
       return [];
     }
+    if (obj.response_item) {
+      return this.parseLegacy(obj);
+    }
+    if (obj.type === "response_item" && obj.payload) {
+      return this.parseNewEnvelope(obj.payload, obj.timestamp);
+    }
+    return [];
+  }
+  parseLegacy(obj) {
     const item = obj.response_item;
-    if (!item) return [];
-    if (item.type === "response.output_item.done" && item.item?.type === "message") {
-      const textParts = (item.item.content ?? []).filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text);
-      const text = textParts.join("\n").trim();
+    if (item.type !== "response.output_item.done") return [];
+    if (item.item?.type !== "message") return [];
+    const text = extractCodexText(item.item.content);
+    if (!text) return [];
+    const turnId = item.id ?? this.genTurnId(obj.timestamp);
+    const timestamp = obj.timestamp ?? now();
+    const blockId = genBlockId("txt");
+    return [
+      {
+        op: "upsert_turn",
+        turn: {
+          turnId,
+          role: "assistant",
+          startedAt: timestamp,
+          updatedAt: timestamp,
+          isComplete: false
+        }
+      },
+      {
+        op: "insert_block",
+        turnId,
+        block: makeTextBlock(blockId, text, true)
+      },
+      {
+        op: "complete_turn",
+        turnId,
+        endedAt: timestamp,
+        updatedAt: timestamp
+      }
+    ];
+  }
+  parseNewEnvelope(payload, lineTimestamp) {
+    const timestamp = lineTimestamp ?? now();
+    if (payload.type === "message") {
+      const role = mapCodexRole(payload.role);
+      if (!role) return [];
+      const text = extractCodexText(payload.content);
       if (!text) return [];
-      const turnId = item.id ?? `codex-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-      const timestamp = obj.timestamp ?? now();
+      const turnId = this.genTurnId(lineTimestamp);
       const blockId = genBlockId("txt");
       return [
         {
           op: "upsert_turn",
           turn: {
             turnId,
-            role: "assistant",
+            role,
             startedAt: timestamp,
             updatedAt: timestamp,
             isComplete: false
@@ -705,13 +768,140 @@ var CodexCliParserV2 = class {
         }
       ];
     }
+    if (payload.type === "function_call") {
+      if (!payload.name) return [];
+      const callId = payload.call_id ?? genBlockId("call");
+      const blockId = genBlockId("tool");
+      const turnId = this.genTurnId(lineTimestamp);
+      this.pendingTools.set(callId, {
+        blockId,
+        turnId,
+        toolName: payload.name
+      });
+      this.capPendingTools();
+      const input = parseCodexArguments(payload.arguments);
+      return [
+        {
+          op: "upsert_turn",
+          turn: {
+            turnId,
+            role: "assistant",
+            startedAt: timestamp,
+            updatedAt: timestamp,
+            isComplete: false
+          }
+        },
+        {
+          op: "insert_block",
+          turnId,
+          block: makeToolBlock(
+            blockId,
+            callId,
+            payload.name,
+            "running",
+            input
+          )
+        }
+      ];
+    }
+    if (payload.type === "function_call_output") {
+      if (!payload.call_id) return [];
+      const pending = this.pendingTools.get(payload.call_id);
+      const output = payload.output ?? "";
+      if (pending) {
+        this.pendingTools.delete(payload.call_id);
+        const ops2 = [
+          {
+            op: "set_tool_state",
+            turnId: pending.turnId,
+            blockId: pending.blockId,
+            state: "completed",
+            isComplete: true
+          }
+        ];
+        if (output) {
+          ops2.push({
+            op: "append_tool_output",
+            turnId: pending.turnId,
+            blockId: pending.blockId,
+            text: output
+          });
+        }
+        ops2.push({
+          op: "complete_turn",
+          turnId: pending.turnId,
+          endedAt: timestamp,
+          updatedAt: timestamp
+        });
+        return ops2;
+      }
+      const turnId = this.genTurnId(lineTimestamp);
+      const blockId = genBlockId("tool");
+      const ops = [
+        {
+          op: "upsert_turn",
+          turn: {
+            turnId,
+            role: "user",
+            startedAt: timestamp,
+            updatedAt: timestamp,
+            isComplete: false
+          }
+        },
+        {
+          op: "insert_block",
+          turnId,
+          block: makeToolBlock(
+            blockId,
+            payload.call_id,
+            "tool",
+            "completed",
+            void 0,
+            true
+          )
+        }
+      ];
+      if (output) {
+        ops.push({
+          op: "append_tool_output",
+          turnId,
+          blockId,
+          text: output
+        });
+      }
+      ops.push({
+        op: "complete_turn",
+        turnId,
+        endedAt: timestamp,
+        updatedAt: timestamp
+      });
+      return ops;
+    }
     return [];
   }
+  genTurnId(timestamp) {
+    this.turnCounter += 1;
+    const ts = timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
+    return `codex-${ts}-${this.turnCounter.toString(36)}`;
+  }
+  capPendingTools() {
+    if (this.pendingTools.size <= 500) return;
+    const keys = [...this.pendingTools.keys()];
+    for (let i = 0; i < 250; i += 1) {
+      this.pendingTools.delete(keys[i]);
+    }
+  }
 };
 function isGeminiHistoryItem(value) {
   if (!value || typeof value !== "object") return false;
   const item = value;
-  return Boolean(item.role && (item.parts || item.content || item.message));
+  if (typeof item.role === "string" && (item.parts !== void 0 || item.content !== void 0 || item.message !== void 0)) {
+    return true;
+  }
+  if (typeof item.type === "string" && (item.content !== void 0 || Array.isArray(item.toolCalls))) {
+    return true;
+  }
+  return false;
 }
 function findGeminiHistory(value, depth = 0) {
   if (depth > 6 || !value || typeof value !== "object") return null;
@@ -736,20 +926,76 @@ function findGeminiHistory(value, depth = 0) {
   }
   return null;
 }
-function geminiPartsFromItem(item) {
+function geminiRoleFromLegacy(role) {
+  const normalized = role?.toLowerCase();
+  if (normalized === "user") return "user";
+  if (normalized === "model" || normalized === "assistant") return "assistant";
+  return null;
+}
+function geminiRoleFromType(type) {
+  if (type === "user") return "user";
+  if (type === "gemini" || type === "model" || type === "assistant") {
+    return "assistant";
+  }
+  return null;
+}
+function geminiPartsFromLegacyItem(item) {
   if (Array.isArray(item.parts)) return item.parts;
   const source = item.content ?? item.message;
   if (typeof source === "string") return [{ text: source }];
-  if (source && typeof source === "object" && Array.isArray(source.parts)) {
-    return source.parts;
+  if (source && !Array.isArray(source) && typeof source === "object") {
+    const objSource = source;
+    if (Array.isArray(objSource.parts)) return objSource.parts;
   }
   return [];
 }
-function geminiRole(role) {
-  const normalized = role?.toLowerCase();
-  if (normalized === "user") return "user";
-  if (normalized === "model" || normalized === "assistant") return "assistant";
-  return null;
+function geminiTextFromNewItem(item) {
+  const c = item.content;
+  if (typeof c === "string") return c.trim();
+  if (Array.isArray(c)) {
+    return c.map((p) => p && typeof p.text === "string" ? p.text : "").filter(Boolean).join("\n").trim();
+  }
+  return "";
+}
+function mapGeminiToolStatus(status) {
+  switch (status?.toLowerCase()) {
+    case "success":
+    case "completed":
+    case "ok":
+      return "completed";
+    case "error":
+    case "failed":
+    case "failure":
+      return "error";
+    case "cancelled":
+    case "canceled":
+      return "cancelled";
+    case "pending":
+      return "pending";
+    case "running":
+    case "in_progress":
+      return "running";
+    default:
+      return status ? "completed" : "running";
+  }
+}
+function extractGeminiToolOutput(tc) {
+  if (Array.isArray(tc.result)) {
+    for (const r of tc.result) {
+      const output = r?.functionResponse?.response?.output;
+      if (typeof output === "string" && output) return output;
+      if (output !== void 0 && output !== null) {
+        try {
+          return JSON.stringify(output, null, 2);
+        } catch {
+        }
+      }
+    }
+  }
+  if (typeof tc.resultDisplay === "string" && tc.resultDisplay) {
+    return tc.resultDisplay;
+  }
+  return "";
 }
 var GeminiCliParserV2 = class {
   name = "gemini-cli-v2";
@@ -766,41 +1012,134 @@ var GeminiCliParserV2 = class {
     }
     const history = findGeminiHistory(root);
     if (!history) return [];
+    const pendingLegacyCalls = /* @__PURE__ */ new Map();
     const ops = [];
     history.forEach((item, index) => {
-      const role = geminiRole(item.role);
-      if (!role) return;
-      const parts = geminiPartsFromItem(item);
-      const timestamp = item.timestamp ?? item.createdAt ?? item.createTime ?? now();
-      const turnId = item.id ?? `gemini-${index}`;
-      const blocks = [];
-      for (const part of parts) {
-        const text = typeof part.text === "string" ? part.text.trim() : "";
-        if (text) {
+      const itemOps = this.parseHistoryItem(item, index, pendingLegacyCalls);
+      ops.push(...itemOps);
+    });
+    return ops;
+  }
+  parseHistoryItem(item, index, pendingLegacyCalls) {
+    const timestamp = item.timestamp ?? item.createdAt ?? item.createTime ?? now();
+    const fallbackTurnId = `gemini-${index}`;
+    const turnId = item.id ?? fallbackTurnId;
+    if (typeof item.type === "string") {
+      return this.parseNewSchemaItem(item, turnId, timestamp);
+    }
+    return this.parseLegacySchemaItem(item, turnId, timestamp, pendingLegacyCalls);
+  }
+  parseNewSchemaItem(item, turnId, timestamp) {
+    const role = geminiRoleFromType(item.type);
+    if (!role) return [];
+    const text = geminiTextFromNewItem(item);
+    const blocks = [];
+    if (text) {
+      blocks.push({
+        op: "insert_block",
+        turnId,
+        block: makeTextBlock(genBlockId("txt"), text, true)
+      });
+    }
+    if (role === "assistant" && Array.isArray(item.toolCalls)) {
+      for (const tc of item.toolCalls) {
+        if (!tc.name) continue;
+        const callId = tc.id ?? genBlockId("call");
+        const blockId = genBlockId("tool");
+        const state = mapGeminiToolStatus(tc.status);
+        const isComplete = state === "completed" || state === "error" || state === "cancelled";
+        blocks.push({
+          op: "insert_block",
+          turnId,
+          block: makeToolBlock(blockId, callId, tc.name, state, tc.args, isComplete)
+        });
+        const output = extractGeminiToolOutput(tc);
+        if (output) {
           blocks.push({
-            op: "insert_block",
+            op: "append_tool_output",
             turnId,
-            block: makeTextBlock(genBlockId("txt"), text, true)
+            blockId,
+            text: output
           });
         }
-        if (part.functionCall?.name) {
-          const callId = genBlockId("call");
-          blocks.push({
-            op: "insert_block",
-            turnId,
-            block: makeToolBlock(
-              genBlockId("tool"),
-              callId,
-              part.functionCall.name,
-              "running",
-              part.functionCall.args
-            )
-          });
+      }
+    }
+    if (blocks.length === 0) return [];
+    return [
+      {
+        op: "upsert_turn",
+        turn: {
+          turnId,
+          role,
+          startedAt: timestamp,
+          updatedAt: timestamp,
+          isComplete: false
         }
-        if (part.functionResponse?.name) {
-          const output = part.functionResponse.response;
+      },
+      ...blocks,
+      {
+        op: "complete_turn",
+        turnId,
+        endedAt: timestamp,
+        updatedAt: timestamp
+      }
+    ];
+  }
+  parseLegacySchemaItem(item, turnId, timestamp, pendingLegacyCalls) {
+    const role = geminiRoleFromLegacy(item.role);
+    if (!role) return [];
+    const parts = geminiPartsFromLegacyItem(item);
+    const currentTurnBlocks = [];
+    const priorTurnUpdates = [];
+    for (const part of parts) {
+      const text = typeof part.text === "string" ? part.text.trim() : "";
+      if (text) {
+        currentTurnBlocks.push({
+          op: "insert_block",
+          turnId,
+          block: makeTextBlock(genBlockId("txt"), text, true)
+        });
+      }
+      if (part.functionCall?.name) {
+        const callId = genBlockId("call");
+        const blockId = genBlockId("tool");
+        pendingLegacyCalls.set(part.functionCall.name, { turnId, blockId });
+        currentTurnBlocks.push({
+          op: "insert_block",
+          turnId,
+          block: makeToolBlock(
+            blockId,
+            callId,
+            part.functionCall.name,
+            "running",
+            part.functionCall.args
+          )
+        });
+      }
+      if (part.functionResponse?.name) {
+        const output = part.functionResponse.response;
+        const outputText = output === void 0 || output === null ? "" : typeof output === "string" ? output : JSON.stringify(output, null, 2);
+        const existing = pendingLegacyCalls.get(part.functionResponse.name);
+        if (existing) {
+          pendingLegacyCalls.delete(part.functionResponse.name);
+          priorTurnUpdates.push({
+            op: "set_tool_state",
+            turnId: existing.turnId,
+            blockId: existing.blockId,
+            state: "completed",
+            isComplete: true
+          });
+          if (outputText) {
+            priorTurnUpdates.push({
+              op: "append_tool_output",
+              turnId: existing.turnId,
+              blockId: existing.blockId,
+              text: outputText
+            });
+          }
+        } else {
           const blockId = genBlockId("tool");
-          blocks.push({
+          currentTurnBlocks.push({
             op: "insert_block",
             turnId,
             block: makeToolBlock(
@@ -812,17 +1151,20 @@ var GeminiCliParserV2 = class {
               true
             )
           });
-          if (output !== void 0) {
-            blocks.push({
+          if (outputText) {
+            currentTurnBlocks.push({
               op: "append_tool_output",
               turnId,
               blockId,
-              text: typeof output === "string" ? output : JSON.stringify(output, null, 2)
+              text: outputText
             });
           }
         }
       }
-      if (blocks.length === 0) return;
+    }
+    const ops = [];
+    ops.push(...priorTurnUpdates);
+    if (currentTurnBlocks.length > 0) {
       ops.push({
         op: "upsert_turn",
         turn: {
@@ -833,14 +1175,14 @@ var GeminiCliParserV2 = class {
           isComplete: false
         }
       });
-      ops.push(...blocks);
+      ops.push(...currentTurnBlocks);
       ops.push({
         op: "complete_turn",
         turnId,
         endedAt: timestamp,
         updatedAt: timestamp
       });
-    });
+    }
     return ops;
   }
 };
@@ -1158,8 +1500,17 @@ var ClaudeCodeParser = class {
     return "";
   }
 };
+function extractCodexLineText(content) {
+  if (!Array.isArray(content)) return "";
+  return content.filter(
+    (c) => (c.type === "input_text" || c.type === "output_text" || c.type === "text") && typeof c.text === "string"
+  ).map((c) => c.text).join("\n").trim();
+}
 var CodexCliParser = class {
   name = "codex-cli";
+  /** call_id → tool name, populated by function_call and consumed by function_call_output. */
+  pendingTools = /* @__PURE__ */ new Map();
+  turnCounter = 0;
   parseLine(line) {
     let obj;
     try {
@@ -1167,26 +1518,106 @@ var CodexCliParser = class {
     } catch {
       return null;
     }
+    if (obj.response_item) {
+      return this.parseLegacy(obj);
+    }
+    if (obj.type === "response_item" && obj.payload) {
+      return this.parseNewEnvelope(obj.payload, obj.timestamp);
+    }
+    return null;
+  }
+  parseLegacy(obj) {
     const item = obj.response_item;
-    if (!item) return null;
-    if (item.type === "response.output_item.done" && item.item?.type === "message") {
-      const textParts = (item.item.content ?? []).filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text);
-      const text = textParts.join("\n").trim();
+    if (item.type !== "response.output_item.done") return null;
+    if (item.item?.type !== "message") return null;
+    const text = extractCodexLineText(item.item.content);
+    if (!text) return null;
+    return {
+      turnId: item.id ?? this.genTurnId(obj.timestamp),
+      role: "assistant",
+      content: text,
+      timestamp: obj.timestamp ?? (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
+  parseNewEnvelope(payload, lineTimestamp) {
+    const timestamp = lineTimestamp ?? (/* @__PURE__ */ new Date()).toISOString();
+    if (payload.type === "message") {
+      const role = payload.role === "user" ? "user" : payload.role === "assistant" ? "assistant" : null;
+      if (!role) return null;
+      const text = extractCodexLineText(payload.content);
       if (!text) return null;
       return {
-        turnId: item.id ?? `codex-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-        role: "assistant",
+        turnId: this.genTurnId(lineTimestamp),
+        role,
         content: text,
-        timestamp: obj.timestamp ?? (/* @__PURE__ */ new Date()).toISOString()
+        timestamp
+      };
+    }
+    if (payload.type === "function_call") {
+      if (!payload.name) return null;
+      if (payload.call_id) {
+        this.pendingTools.set(payload.call_id, payload.name);
+        this.capPendingTools();
+      }
+      let input;
+      if (typeof payload.arguments === "string" && payload.arguments) {
+        try {
+          input = JSON.parse(payload.arguments);
+        } catch {
+          input = void 0;
+        }
+      }
+      return {
+        turnId: this.genTurnId(lineTimestamp),
+        role: "assistant",
+        content: "",
+        tools: [{ name: payload.name, input, status: "started" }],
+        timestamp
+      };
+    }
+    if (payload.type === "function_call_output") {
+      if (!payload.call_id) return null;
+      const toolName = this.pendingTools.get(payload.call_id) ?? "tool";
+      this.pendingTools.delete(payload.call_id);
+      return {
+        turnId: this.genTurnId(lineTimestamp),
+        role: "user",
+        content: "",
+        tools: [
+          {
+            name: toolName,
+            status: "completed",
+            result: payload.output || void 0
+          }
+        ],
+        timestamp
       };
     }
     return null;
   }
+  genTurnId(timestamp) {
+    this.turnCounter += 1;
+    const ts = timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
+    return `codex-${ts}-${this.turnCounter.toString(36)}`;
+  }
+  capPendingTools() {
+    if (this.pendingTools.size <= 500) return;
+    const keys = [...this.pendingTools.keys()];
+    for (let i = 0; i < 250; i += 1) {
+      this.pendingTools.delete(keys[i]);
+    }
+  }
 };
 function isGeminiHistoryItem2(value) {
   if (!value || typeof value !== "object") return false;
   const item = value;
-  return Boolean(item.role && (item.parts || item.content || item.message));
+  if (typeof item.role === "string" && (item.parts !== void 0 || item.content !== void 0 || item.message !== void 0)) {
+    return true;
+  }
+  if (typeof item.type === "string" && (item.content !== void 0 || Array.isArray(item.toolCalls))) {
+    return true;
+  }
+  return false;
 }
 function findGeminiHistory2(value, depth = 0) {
   if (depth > 6 || !value || typeof value !== "object") return null;
@@ -1209,15 +1640,63 @@ function findGeminiHistory2(value, depth = 0) {
   }
   return null;
 }
-function geminiPartsFromItem2(item) {
+function geminiPartsFromLegacyItem2(item) {
   if (Array.isArray(item.parts)) return item.parts;
   const source = item.content ?? item.message;
   if (typeof source === "string") return [{ text: source }];
-  if (source && typeof source === "object" && Array.isArray(source.parts)) {
-    return source.parts;
+  if (source && !Array.isArray(source) && typeof source === "object") {
+    const objSource = source;
+    if (Array.isArray(objSource.parts)) return objSource.parts;
   }
   return [];
 }
+function geminiTextFromNewItem2(item) {
+  const c = item.content;
+  if (typeof c === "string") return c.trim();
+  if (Array.isArray(c)) {
+    return c.map((p) => p && typeof p.text === "string" ? p.text : "").filter(Boolean).join("\n").trim();
+  }
+  return "";
+}
+function geminiToolStatusToEvent(status) {
+  switch (status?.toLowerCase()) {
+    case "success":
+    case "completed":
+    case "ok":
+      return "completed";
+    case "error":
+    case "failed":
+    case "failure":
+      return "error";
+    case "cancelled":
+    case "canceled":
+      return "completed";
+    case "pending":
+    case "running":
+    case "in_progress":
+      return "started";
+    default:
+      return status ? "completed" : "started";
+  }
+}
+function geminiToolResult(tc) {
+  if (Array.isArray(tc.result)) {
+    for (const r of tc.result) {
+      const output = r?.functionResponse?.response?.output;
+      if (typeof output === "string" && output) return output;
+      if (output !== void 0 && output !== null) {
+        try {
+          return JSON.stringify(output, null, 2);
+        } catch {
+        }
+      }
+    }
+  }
+  if (typeof tc.resultDisplay === "string" && tc.resultDisplay) {
+    return tc.resultDisplay;
+  }
+  return void 0;
+}
 var GeminiCliParser = class {
   name = "gemini-cli";
   parseLine(line) {
@@ -1235,43 +1714,79 @@ var GeminiCliParser = class {
     if (!history) return [];
     const turns = [];
     history.forEach((item, index) => {
-      const normalizedRole = item.role?.toLowerCase();
-      const role = normalizedRole === "model" || normalizedRole === "assistant" ? "assistant" : normalizedRole === "user" ? "user" : null;
-      if (!role) return;
-      const textBlocks = [];
-      const tools = [];
-      for (const part of geminiPartsFromItem2(item)) {
-        if (typeof part.text === "string" && part.text.trim()) {
-          textBlocks.push(part.text.trim());
-        }
-        if (part.functionCall?.name) {
-          tools.push({
-            name: part.functionCall.name,
-            input: part.functionCall.args,
-            status: "started"
-          });
-        }
-        if (part.functionResponse?.name) {
-          const response = part.functionResponse.response;
-          tools.push({
-            name: part.functionResponse.name,
-            status: "completed",
-            result: response === void 0 ? void 0 : typeof response === "string" ? response : JSON.stringify(response, null, 2)
-          });
-        }
-      }
-      const content = textBlocks.join("\n").trim();
-      if (!content && tools.length === 0) return;
-      turns.push({
-        turnId: item.id ?? `gemini-${index}`,
-        role,
-        content,
-        tools: tools.length > 0 ? tools : void 0,
-        timestamp: item.timestamp ?? item.createdAt ?? item.createTime ?? (/* @__PURE__ */ new Date()).toISOString()
-      });
+      const parsed = this.parseHistoryItem(item, index);
+      if (parsed) turns.push(parsed);
     });
     return turns;
   }
+  parseHistoryItem(item, index) {
+    if (typeof item.type === "string") {
+      return this.parseNewSchemaItem(item, index);
+    }
+    return this.parseLegacySchemaItem(item, index);
+  }
+  parseNewSchemaItem(item, index) {
+    const t = item.type;
+    const role = t === "user" ? "user" : t === "gemini" || t === "model" || t === "assistant" ? "assistant" : null;
+    if (!role) return null;
+    const content = geminiTextFromNewItem2(item);
+    const tools = [];
+    if (role === "assistant" && Array.isArray(item.toolCalls)) {
+      for (const tc of item.toolCalls) {
+        if (!tc.name) continue;
+        tools.push({
+          name: tc.name,
+          input: tc.args,
+          status: geminiToolStatusToEvent(tc.status),
+          result: geminiToolResult(tc)
+        });
+      }
+    }
+    if (!content && tools.length === 0) return null;
+    return {
+      turnId: item.id ?? `gemini-${index}`,
+      role,
+      content,
+      tools: tools.length > 0 ? tools : void 0,
+      timestamp: item.timestamp ?? item.createdAt ?? item.createTime ?? (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
+  parseLegacySchemaItem(item, index) {
+    const normalizedRole = item.role?.toLowerCase();
+    const role = normalizedRole === "model" || normalizedRole === "assistant" ? "assistant" : normalizedRole === "user" ? "user" : null;
+    if (!role) return null;
+    const textBlocks = [];
+    const tools = [];
+    for (const part of geminiPartsFromLegacyItem2(item)) {
+      if (typeof part.text === "string" && part.text.trim()) {
+        textBlocks.push(part.text.trim());
+      }
+      if (part.functionCall?.name) {
+        tools.push({
+          name: part.functionCall.name,
+          input: part.functionCall.args,
+          status: "started"
+        });
+      }
+      if (part.functionResponse?.name) {
+        const response = part.functionResponse.response;
+        tools.push({
+          name: part.functionResponse.name,
+          status: "completed",
+          result: response === void 0 ? void 0 : typeof response === "string" ? response : JSON.stringify(response, null, 2)
+        });
+      }
+    }
+    const content = textBlocks.join("\n").trim();
+    if (!content && tools.length === 0) return null;
+    return {
+      turnId: item.id ?? `gemini-${index}`,
+      role,
+      content,
+      tools: tools.length > 0 ? tools : void 0,
+      timestamp: item.timestamp ?? item.createdAt ?? item.createTime ?? (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
 };
 function parseProcessPid(sessionId) {
   if (!sessionId.startsWith("process:")) return null;
@@ -2930,10 +3445,39 @@ var BACKPRESSURE_RESUME_CHECK_MS = 100;
 var STOP_DEBOUNCE_MS = 2e3;
 var MAX_CONCURRENT_STREAMS = 20;
 var MAX_SESSION_BUFFER_BYTES = 64 * 1024;
-var ALT_SCREEN_MODE_RE = /\x1b\[\?(?=[0-9;]*(?:47|1047|1048|1049)(?:;|[hl]))[0-9;]*[hl]/g;
+var PRIVATE_MODE_SEQUENCE_RE = /\x1b\[\?([0-9;]*)([hl])/g;
+var ALT_SCREEN_PARAMS = /* @__PURE__ */ new Set(["47", "1047", "1048", "1049"]);
 function stripAlternateScreenModeSwitches(data) {
-  return data.replace(ALT_SCREEN_MODE_RE, "");
+  return data.replace(
+    PRIVATE_MODE_SEQUENCE_RE,
+    (full, params, action) => {
+      if (!params) return full;
+      const parts = params.split(";");
+      const filtered = parts.filter((p) => !ALT_SCREEN_PARAMS.has(p));
+      if (filtered.length === parts.length) return full;
+      if (filtered.length === 0) return "";
+      return `\x1B[?${filtered.join(";")}${action}`;
+    }
+  );
 }
+var AlternateScreenModeStripper = class {
+  pending = "";
+  write(data) {
+    const combined = this.pending + data;
+    this.pending = "";
+    const match = combined.match(/\x1b(?:\[(?:\?(?:[0-9;]*)?)?)?$/);
+    if (!match || match.index === void 0) {
+      return stripAlternateScreenModeSwitches(combined);
+    }
+    this.pending = combined.slice(match.index);
+    return stripAlternateScreenModeSwitches(combined.slice(0, match.index));
+  }
+  end() {
+    const pending = this.pending;
+    this.pending = "";
+    return stripAlternateScreenModeSwitches(pending);
+  }
+};
 function parsePaneTarget(sessionId) {
   if (!sessionId.startsWith("tmux:")) return null;
   const rest = sessionId.slice("tmux:".length);
@@ -3172,6 +3716,11 @@ var SessionStreamer = class {
   isStreaming(sessionId) {
     return this.active.has(sessionId);
   }
+  hasViewer(sessionId, viewerId) {
+    const viewerKey = viewerId?.trim() || "";
+    if (!viewerKey) return false;
+    return this.active.get(sessionId)?.viewerIds.has(viewerKey) ?? false;
+  }
   /**
    * Stop all active streams immediately (no debounce).
    */
@@ -3253,11 +3802,19 @@ var SessionStreamer = class {
    * Used when a viewer missed the initial burst (e.g. joinGroup race)
    * or reconnected ("Retry stream"). Does NOT restart pipe-pane.
    */
-  resyncStream(sessionId) {
+  resyncStream(sessionId, viewerId) {
     const stream = this.active.get(sessionId);
     if (!stream || stream.stopped || stream.streamType !== "tmux-pipe") return false;
     const { paneTarget, cleanEnv } = stream;
     if (!paneTarget || !cleanEnv) return false;
+    const targetViewerId = viewerId?.trim() || void 0;
+    const send = (data) => {
+      if (targetViewerId) {
+        this.sendFn(sessionId, data, targetViewerId);
+      } else {
+        this.sendFn(sessionId, data);
+      }
+    };
     stream.initializing = true;
     try {
       let alternateScreen = false;
@@ -3277,11 +3834,11 @@ var SessionStreamer = class {
           { env: cleanEnv, timeout: 1e4, encoding: "utf-8" }
         );
         if (scrollback && scrollback.length > 0) {
-          this.sendFn(sessionId, scrollback.replace(/\n/g, "\r\n"));
+          send(scrollback.replace(/\n/g, "\r\n"));
         }
       } catch {
       }
-      this.sendFn(sessionId, "\x1B[?1049l\x1B[0m\x1B[2J\x1B[H");
+      send("\x1B[?1049l\x1B[0m\x1B[2J\x1B[H");
       try {
         const captureArgs = alternateScreen ? ["capture-pane", "-a", "-t", paneTarget, "-p", "-e"] : ["capture-pane", "-t", paneTarget, "-p", "-e"];
         const initial = (0, import_node_child_process2.execFileSync)(
@@ -3290,7 +3847,7 @@ var SessionStreamer = class {
           { env: cleanEnv, timeout: 5e3, encoding: "utf-8" }
         );
         if (initial) {
-          this.sendFn(sessionId, stripAlternateScreenModeSwitches(initial.replace(/\n/g, "\r\n").replace(/\r\n$/, "")));
+          send(stripAlternateScreenModeSwitches(initial.replace(/\n/g, "\r\n").replace(/\r\n$/, "")));
         }
       } catch {
       }
@@ -3305,7 +3862,7 @@ var SessionStreamer = class {
           const x = parseInt(parts[0], 10);
           const y = parseInt(parts[1], 10);
           if (!isNaN(x) && !isNaN(y)) {
-            this.sendFn(sessionId, `\x1B[${y + 1};${x + 1}H`);
+            send(`\x1B[${y + 1};${x + 1}H`);
           }
         }
       } catch {
@@ -3359,7 +3916,8 @@ var SessionStreamer = class {
         cleanEnv,
         ptyProc: null,
         straceProc: null,
-        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8")
+        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8"),
+        altScreenStripper: new AlternateScreenModeStripper()
       };
       this.active.set(sessionId, stream);
       try {
@@ -3383,13 +3941,19 @@ var SessionStreamer = class {
         if (stream.initializing) {
           stream.initBuffer.push(data);
         } else {
-          this.sendFn(sessionId, stripAlternateScreenModeSwitches(data));
+          const filtered = stream.altScreenStripper.write(data);
+          if (filtered) this.sendFn(sessionId, filtered);
         }
       });
       catProc.on("exit", () => {
         if (!stream.stopped) {
           const remaining = stream.utf8Decoder.end();
-          if (remaining) this.sendFn(sessionId, stripAlternateScreenModeSwitches(remaining));
+          if (remaining) {
+            const filtered = stream.altScreenStripper.write(remaining);
+            if (filtered) this.sendFn(sessionId, filtered);
+          }
+          const pending = stream.altScreenStripper.end();
+          if (pending) this.sendFn(sessionId, pending);
           this.cleanupStream(stream);
           this.active.delete(sessionId);
           this.pendingStops.delete(sessionId);
@@ -3485,7 +4049,8 @@ var SessionStreamer = class {
         initBuffer: [],
         ptyProc: proc,
         straceProc: null,
-        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8")
+        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8"),
+        altScreenStripper: new AlternateScreenModeStripper()
       };
       this.active.set(sessionId, stream);
       proc.onData((data) => {
@@ -3538,7 +4103,8 @@ var SessionStreamer = class {
         initBuffer: [],
         ptyProc: proc,
         straceProc: null,
-        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8")
+        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8"),
+        altScreenStripper: new AlternateScreenModeStripper()
       };
       this.active.set(sessionId, stream);
       proc.onData((data) => {
@@ -3603,7 +4169,8 @@ var SessionStreamer = class {
         initBuffer: [],
         ptyProc: null,
         straceProc,
-        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8")
+        utf8Decoder: new import_node_string_decoder.StringDecoder("utf8"),
+        altScreenStripper: new AlternateScreenModeStripper()
       };
       this.active.set(sessionId, stream);
       const writeRegex = /^write\(([12]),\s*"((?:[^"\\]|\\.)*)"/;
@@ -3805,6 +4372,7 @@ var ANSI_KEY_SEQUENCES = /* @__PURE__ */ new Map([
   ["\x1B[5~", "PageUp"],
   ["\x1B[6~", "PageDown"]
 ]);
+var ANSI_KEY_ENTRIES = Array.from(ANSI_KEY_SEQUENCES.entries());
 function controlKeyName(charCode) {
   if (charCode >= 1 && charCode <= 26) {
     return `C-${String.fromCharCode(charCode + 96)}`;
@@ -3843,8 +4411,12 @@ function encodeTmuxInput(data) {
     literal = "";
   };
   for (let i = 0; i < data.length; i++) {
-    const remaining = data.slice(i);
-    const matchedSequence = Array.from(ANSI_KEY_SEQUENCES.entries()).find(([sequence]) => remaining.startsWith(sequence));
+    let matchedSequence;
+    if (data.charCodeAt(i) === 27) {
+      matchedSequence = ANSI_KEY_ENTRIES.find(
+        ([sequence]) => data.startsWith(sequence, i)
+      );
+    }
     if (matchedSequence) {
       flushLiteral();
       const [sequence, key] = matchedSequence;
@@ -3932,12 +4504,30 @@ async function sendInputToTmux(sessionId, data) {
     return;
   }
   try {
-    for (const segment of encodeTmuxInput(data)) {
-      if (segment.kind === "literal") {
-        await execTmuxSendKeys(["send-keys", "-t", target, "-l", "--", segment.value]);
-      } else {
-        await execTmuxSendKeys(["send-keys", "-t", target, "--", segment.value]);
+    const segments = encodeTmuxInput(data);
+    let i = 0;
+    while (i < segments.length) {
+      const seg = segments[i];
+      if (seg.kind === "literal") {
+        await execTmuxSendKeys([
+          "send-keys",
+          "-t",
+          target,
+          "-l",
+          "--",
+          seg.value
+        ]);
+        i += 1;
+        continue;
       }
+      const keys = [seg.value];
+      let j = i + 1;
+      while (j < segments.length && segments[j].kind === "key") {
+        keys.push(segments[j].value);
+        j += 1;
+      }
+      await execTmuxSendKeys(["send-keys", "-t", target, "--", ...keys]);
+      i = j;
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -4186,11 +4776,15 @@ var ConnectionManager = class {
    * the field.
    */
   getRxSeqForViewer(viewerId) {
-    const key = typeof viewerId === "string" && viewerId.length > 0 ? viewerId : "_legacy";
+    const isValid = typeof viewerId === "string" && viewerId.length > 0;
+    const key = isValid ? viewerId : "_legacy";
     let tracker = this.rxSeqByViewer.get(key);
     if (!tracker) {
       tracker = new SequenceTracker();
       this.rxSeqByViewer.set(key, tracker);
+      if (!isValid) {
+        log11.warn("rxSeq fell back to _legacy bucket \u2014 portal sent empty viewerId", { typeofViewerId: typeof viewerId });
+      }
     }
     return tracker;
   }
@@ -5025,6 +5619,7 @@ async function installLatestCliFromNpm() {
 // src/control-dispatcher.ts
 var log13 = createLogger("control");
 var TMUX_RESYNC_DEBOUNCE_MS = 150;
+var TMUX_INPUT_COALESCE_MS = 4;
 function collectProcessTreePids(rootPid, visited = /* @__PURE__ */ new Set()) {
   if (visited.has(rootPid)) return [];
   visited.add(rootPid);
@@ -5067,6 +5662,7 @@ var ControlDispatcher = class {
   options;
   _approvalEnforcer = null;
   tmuxResizeState = /* @__PURE__ */ new Map();
+  tmuxInputBuffers = /* @__PURE__ */ new Map();
   /** Set to true when a reconnect was requested (restart-agent, disconnect). */
   reconnectRequested = false;
   /** Set to false to stop the agent. */
@@ -5318,14 +5914,32 @@ var ControlDispatcher = class {
     if (!sessionId || sessionId.startsWith("pty:")) {
       this.shell.write(data);
     } else if (sessionId.startsWith("tmux:")) {
-      sendInputToTmux(sessionId, data).catch(() => {
-      });
+      this.queueTmuxInput(sessionId, data);
     } else if (sessionId.startsWith("screen:") || sessionId.startsWith("zellij:")) {
       this.streamer.writeInput(sessionId, data);
     }
   }
+  /** Coalesce per-keystroke input into one `tmux send-keys` spawn. */
+  queueTmuxInput(sessionId, data) {
+    const existing = this.tmuxInputBuffers.get(sessionId);
+    if (existing) {
+      existing.data += data;
+      return;
+    }
+    const buffer = { data, timer: null };
+    buffer.timer = setTimeout(() => this.flushTmuxInput(sessionId), TMUX_INPUT_COALESCE_MS);
+    this.tmuxInputBuffers.set(sessionId, buffer);
+  }
+  flushTmuxInput(sessionId) {
+    const buffer = this.tmuxInputBuffers.get(sessionId);
+    if (!buffer) return;
+    this.tmuxInputBuffers.delete(sessionId);
+    if (buffer.timer) clearTimeout(buffer.timer);
+    sendInputToTmux(sessionId, buffer.data).catch(() => {
+    });
+  }
   /** Handle resize routing. */
-  handleResize(cols, rows, sessionId) {
+  handleResize(cols, rows, sessionId, viewerId) {
     if (!sessionId || sessionId.startsWith("pty:")) {
       this.shell.resize(cols, rows);
     } else if (sessionId.startsWith("tmux:")) {
@@ -5347,7 +5961,7 @@ var ControlDispatcher = class {
           const latest = this.tmuxResizeState.get(sessionId);
           if (latest === current) {
             latest.timer = null;
-            this.streamer.resyncStream(sessionId);
+            this.streamer.resyncStream(sessionId, viewerId);
           }
         }, TMUX_RESYNC_DEBOUNCE_MS);
       }).catch((error) => {
@@ -5558,13 +6172,15 @@ var ControlDispatcher = class {
     if (!sessionId) return;
     const ws = this.connection.activeSocket;
     const group = this.connection.activeGroups.privateGroup;
+    const viewerKey = viewerId?.trim() || "";
     if (sessionId.startsWith("tmux:") || sessionId.startsWith("screen:") || sessionId.startsWith("zellij:") || sessionId.startsWith("process:")) {
       const alreadyStreaming = this.streamer.isStreaming(sessionId);
+      const viewerAlreadyAttached = alreadyStreaming && this.streamer.hasViewer(sessionId, viewerKey);
       const started = this.streamer.startStream(sessionId, viewerId ?? void 0);
       if (ws && ws.readyState === import_ws4.default.OPEN && group) {
         if (started) {
-          if (alreadyStreaming) {
-            this.streamer.resyncStream(sessionId);
+          if (alreadyStreaming && !viewerAlreadyAttached) {
+            this.streamer.resyncStream(sessionId, viewerKey);
           }
           const dims = this.queryPaneDimensions(sessionId);
           sendToGroup(ws, group, { type: "stream-started", sessionId, ...dims });
@@ -6033,7 +6649,7 @@ async function runAgent(rawOptions) {
   const outputBuffer = new OutputBuffer();
   const ptySessionId = `pty:${options.hostId}`;
   const sessionStreamer = new SessionStreamer(
-    (sessionId, data) => {
+    (sessionId, data, viewerId) => {
       conn.requestInventorySync();
       if (!conn.isReady()) {
         sessionStreamer.bufferOutput(sessionId, data);
@@ -6041,11 +6657,12 @@ async function runAgent(rawOptions) {
       }
       const redactedData = redactStreamingChunk(sessionId, data);
       for (const chunk of splitTransportChunks(redactedData)) {
+        const outputPayload = viewerId ? { type: "output", sessionId, viewerId } : { type: "output", sessionId };
         if (conn.sessionKey) {
           const { enc, iv, seq } = encryptPayload(chunk, conn.sessionKey, conn.txSeq.next());
-          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, seq, sessionId });
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { ...outputPayload, enc, iv, seq });
         } else {
-          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", data: chunk, sessionId });
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { ...outputPayload, data: chunk });
         }
       }
     },
@@ -6308,7 +6925,8 @@ async function runAgent(rawOptions) {
                   return;
                 }
                 const sid = typeof payload.sessionId === "string" ? payload.sessionId.trim() : "";
-                dispatcher.handleResize(payload.cols, payload.rows, sid);
+                const resizeViewerId = typeof payload.viewerId === "string" ? payload.viewerId : void 0;
+                dispatcher.handleResize(payload.cols, payload.rows, sid, resizeViewerId);
               } else if (payload.type === "control" && typeof payload.action === "string") {
                 let controlPayload = payload;
                 if (typeof payload.enc === "string" && typeof payload.iv === "string" && conn.sessionKey) {

package/dist/sbom.json

@@ -1166,8 +1166,8 @@
     {
       "type": "library",
       "name": "ragent-cli",
-      "version": "1.11.8",
-      "bom-ref": "ragent-live|ragent-cli@1.11.8",
+      "version": "1.11.10",
+      "bom-ref": "ragent-live|ragent-cli@1.11.10",
       "author": "Intellimetrics",
       "description": "CLI agent for rAgent Live — browser-first terminal control plane for AI coding agents",
       "licenses": [
@@ -1178,7 +1178,7 @@
           }
         }
       ],
-      "purl": "pkg:npm/ragent-cli@1.11.8",
+      "purl": "pkg:npm/ragent-cli@1.11.10",
       "externalReferences": [
         {
           "url": "https://github.com/chadlindell/ragent-live/issues",
@@ -1303,7 +1303,7 @@
         "ragent-live|@emnapi/wasi-threads@1.2.1",
         "ragent-live|@pkgjs/parseargs@0.11.0",
         "ragent-live|@tybys/wasm-util@0.10.1",
-        "ragent-live|ragent-cli@1.11.8"
+        "ragent-live|ragent-cli@1.11.10"
       ]
     },
     {
@@ -1436,7 +1436,7 @@
       ]
     },
     {
-      "ref": "ragent-live|ragent-cli@1.11.8",
+      "ref": "ragent-live|ragent-cli@1.11.10",
       "dependsOn": [
         "ragent-live|@azure/web-pubsub-client@1.0.4",
         "ragent-live|commander@14.0.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ragent-cli",
-  "version": "1.11.8",
+  "version": "1.11.10",
   "description": "CLI agent for rAgent Live — browser-first terminal control plane for AI coding agents",
   "main": "dist/index.js",
   "bin": {