Revert

public/js/chat.js

@@ -26,16 +26,7 @@ on('chat:aborted',          (msg) => { if (msg.sessionId === activeSessionId) on
 on('chat:error',            (msg) => { if (msg.sessionId === activeSessionId) onChatError(msg.error); });
 on('chat:asset',            (msg) => { if (msg.sessionId === activeSessionId) appendAsset(msg.asset); });
 on('chat:toolCall',         (msg) => { if (msg.sessionId === activeSessionId) handleLiveToolCall(msg.call); });
-on('chat:messageEdited',    (msg) => {
-  if (msg.sessionId === activeSessionId) {
-    renderHistory(msg.history);
-    // Update the session history
-    const s = sessions.find(s => s.id === msg.sessionId);
-    if (s) s.history = msg.history;
-    // After any edit, continue the conversation from the edited branch.
-    submitMessage('', [], true);
-  }
-});
+on('chat:messageEdited',    (msg) => { if (msg.sessionId === activeSessionId) renderHistory(msg.history); });
 on('chat:versionSelected',  (msg) => { if (msg.sessionId === activeSessionId) renderHistory(msg.history); });
 
 // Reconnect: reload current session instead of resetting to welcome
@@ -130,14 +121,13 @@ function appendUserMsg(box, msg, index) {
 
   wrap.appendChild(bubble);
 
-  const controls = document.createElement('div');
-  controls.className = 'msg-controls msg-controls-right';
-  controls.appendChild(buildActions([
+  // User actions appear on the RIGHT side
+  wrap.appendChild(buildActions([
     { icon: '📋', title: 'Copy', fn: () => copyText(text) },
     { icon: '✏️', title: 'Edit', fn: () => startUserEdit(wrap, index, msg, text) },
   ], 'right'));
-  if (msg.versions?.length > 1) controls.appendChild(buildVersionNav(msg, index));
-  wrap.appendChild(controls);
+
+  if (msg.versions?.length > 1) wrap.appendChild(buildVersionNav(msg, index));
 
   box.appendChild(wrap);
 }
@@ -159,14 +149,13 @@ function appendAssistantMsg(box, msg, index) {
 
   wrap.appendChild(bubble);
 
-  const controls = document.createElement('div');
-  controls.className = 'msg-controls msg-controls-left';
-  controls.appendChild(buildActions([
+  // Assistant actions appear on the LEFT side
+  wrap.appendChild(buildActions([
     { icon: '📋', title: 'Copy', fn: () => copyText(msg.content || '') },
     { icon: '✏️', title: 'Edit', fn: () => startAssistantEdit(wrap, index, msg) },
   ], 'left'));
-  if (msg.versions?.length > 1) controls.appendChild(buildVersionNav(msg, index));
-  wrap.appendChild(controls);
+
+  if (msg.versions?.length > 1) wrap.appendChild(buildVersionNav(msg, index));
 
   box.appendChild(wrap);
 }
@@ -523,16 +512,11 @@ function appendAsset(asset) {
 
 // ── Submit ────────────────────────────────────────────────────────────────
 
-export function submitMessage(text, attachments = [], regenerate = false) {
-  if (!text.trim() && attachments.length === 0 && !regenerate) return;
+export function submitMessage(text, attachments = []) {
+  if (!text.trim() && attachments.length === 0) return;
   if (isStreaming) { send({ type: 'chat:stop' }); return; }
   if (!activeSessionId) return;
 
-  if (regenerate) {
-    send({ type: 'chat:regenerate', sessionId: activeSessionId, tools: getActiveTools(), clientId: localStorage.getItem('ipai_client_id') || '' });
-    return;
-  }
-
   const images   = attachments.filter(a => a.type === 'image');
   const textFiles= attachments.filter(a => a.type === 'text');
 

server/chatStream.js

@@ -126,7 +126,7 @@ export async function streamChat(ws, {
   const messages = [
     { role: "system", content: SYSTEM_PROMPT },
     ...history.map(normalizeMessage).filter(Boolean),
-    ...(typeof userMessage === 'undefined' ? [] : [{ role: "user", content: userMessage }]),
+    { role: "user", content: userMessage },
   ];
 
   try {

server/wsHandler.js

@@ -185,7 +185,6 @@ const handlers = {
         });
         const asstEntry = buildEntry('assistant', finalText, mergedCalls);
         const newHistory = [...(session.history || []), userEntry, asstEntry];
-        attachCurrentVersionTail(newHistory);
 
         // Use session name from XML tag; fall back to existing name or default
         let newName = session.name;
@@ -205,61 +204,6 @@ const handlers = {
     });
   },
 
-  'chat:regenerate': async (ws, msg, client) => {
-    const { sessionId, tools } = msg;
-    if (!client.userId) {
-      if (!sessionStore.tempCanSend(client.tempId)) return safeSend(ws, { type: 'chat:limitReached' });
-      sessionStore.tempBump(client.tempId);
-    }
-    const session = client.userId
-      ? sessionStore.getUserSession(client.userId, sessionId)
-      : sessionStore.getTempSession(client.tempId, sessionId);
-    if (!session) return safeSend(ws, { type: 'error', message: 'Session not found' });
-
-    if (activeStreams.has(ws)) activeStreams.get(ws).abort();
-    const abort = new AbortController();
-    activeStreams.set(ws, abort);
-    safeSend(ws, { type: 'chat:start', sessionId });
-
-    let fullText = '';
-    const assetsCollected = [], toolCallsCollected = [];
-
-    await streamChat(ws, {
-      history: session.history || [], tools: tools || {},
-      accessToken: client.accessToken, clientId: msg.clientId, abortSignal: abort.signal,
-      onToken(t) { fullText += t; safeSend(ws, { type: 'chat:token', token: t, sessionId }); },
-      onToolCall(call) {
-        safeSend(ws, { type: 'chat:toolCall', call, sessionId });
-        if (call.state === 'resolved' || call.state === 'canceled') toolCallsCollected.push(call);
-      },
-      onNewAsset(asset) { safeSend(ws, { type: 'chat:asset', asset, sessionId }); assetsCollected.push(asset); },
-      async onDone(text, toolCalls, aborted, sessionNameFromTag) {
-        activeStreams.delete(ws);
-        const finalText = text || fullText;
-
-        const resolvedMap = new Map(toolCallsCollected.map(c => [c.id, c]));
-        const mergedCalls = (toolCalls || []).map(c => {
-          const resolved = resolvedMap.get(c.id) || {};
-          return { ...c, state: resolved.state || 'resolved', result: resolved.result };
-        });
-        const asstEntry = buildEntry('assistant', finalText, mergedCalls);
-        const newHistory = [...(session.history || []), asstEntry];
-        attachCurrentVersionTail(newHistory);
-
-        let newName = session.name;
-        if (sessionNameFromTag) {
-          newName = sessionNameFromTag;
-        }
-
-        if (client.userId)
-          await sessionStore.updateUserSession(client.userId, client.accessToken, sessionId, { history: newHistory, name: newName });
-        else sessionStore.updateTempSession(client.tempId, sessionId, { history: newHistory, name: newName });
-        safeSend(ws, { type: aborted ? 'chat:aborted' : 'chat:done', sessionId, name: newName, history: newHistory });
-      },
-      onError(err) { activeStreams.delete(ws); safeSend(ws, { type: 'chat:error', error: String(err), sessionId }); },
-    });
-  },
-
   'chat:stop': (ws) => { if (activeStreams.has(ws)) { activeStreams.get(ws).abort(); activeStreams.delete(ws); } },
 
   'chat:editMessage': async (ws, msg, client) => {
@@ -275,7 +219,6 @@ const handlers = {
     m.currentVersionIdx = m.versions.length - 1;
     m.content = newContent;
     const newHistory = history.slice(0, messageIndex + 1);
-    attachCurrentVersionTail(newHistory);
     if (client.userId) await sessionStore.updateUserSession(client.userId, client.accessToken, sessionId, { history: newHistory });
     else sessionStore.updateTempSession(client.tempId, sessionId, { history: newHistory });
     safeSend(ws, { type: 'chat:messageEdited', sessionId, messageIndex, message: m, history: newHistory });
@@ -293,7 +236,6 @@ const handlers = {
     const v = m.versions[versionIdx];
     m.currentVersionIdx = versionIdx; m.content = v.content;
     const newHistory = [...history.slice(0, messageIndex + 1), ...(v.tail || [])];
-    attachCurrentVersionTail(newHistory);
     if (client.userId) await sessionStore.updateUserSession(client.userId, client.accessToken, sessionId, { history: newHistory });
     else sessionStore.updateTempSession(client.tempId, sessionId, { history: newHistory });
     safeSend(ws, { type: 'chat:versionSelected', sessionId, history: newHistory });
@@ -328,19 +270,6 @@ const handlers = {
   },
 };
 
-function attachCurrentVersionTail(history) {
-  for (let i = history.length - 1; i >= 0; i--) {
-    const msg = history[i];
-    if (msg?.versions && Number.isInteger(msg.currentVersionIdx)) {
-      const current = msg.versions[msg.currentVersionIdx];
-      if (current) {
-        current.tail = history.slice(i + 1);
-      }
-      break;
-    }
-  }
-}
-
 function ser(s) { return { id: s.id, name: s.name, created: s.created, history: s.history || [], model: s.model }; }
 
 function buildEntry(role, content, toolCalls = []) {