claude-simple 0.2.24 → 0.2.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-simple",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "type": "module",
   "bin": {
     "claude-simple": "server.js",

package/public/api.js

@@ -54,6 +54,7 @@ export async function api(method, path, body, signal, opts = {}) {
       method,
       signal,
       headers,
+      ...(opts.cache ? { cache: opts.cache } : {}),
       ...(body !== undefined ? { body: JSON.stringify(body) } : {}),
     });
     if (res.status === 304) return NOT_MODIFIED;

package/public/chat.js

@@ -2,7 +2,7 @@
 import { watch, delegate, esc, $ } from './lib.js';
 import { ctx, isProcessing, currentProject, currentTab, currentModel, currentEffort, currentPermission,
          currentAgent, setAgent, AGENT_LABELS, getDefaultModel, getModelsForAgent, getEffortsForModel,
-         getDefaultEffort, addCustomModel, setCurrentModel, chatDensity, wsStatus } from './state.js';
+         getDefaultEffort, addCustomModel, setCurrentModel, chatDensity, wsStatus, sessionMetaMap, metaKey } from './state.js';
 import { sendWs, api, authHeaders, flushWsQueue, clearWsQueue } from './api.js';
 import { initWakeLock, setWakeLockDesired } from './wake-lock.js';
 import { pushNotification } from './notifications.js';
@@ -37,13 +37,39 @@ let sawDisconnect = false;
 let lastWsMachine = null;
 let reconnectQuiet = false;
 const HUB_CURSOR_KEY = 'hubStreamCursors';
+const assistantMessageRefs = new Map();
+let assistantMessageSeq = 0;
+const renderedGrokQueuePrompts = new Set();
+const PENDING_QUEUE_KEY = 'pendingUserTexts';
 /** FIFO messages deliberately queued while a turn is running. */
-let pendingUserTexts = [];
+let pendingUserTexts = (() => {
+  try {
+    const saved = JSON.parse(sessionStorage.getItem(PENDING_QUEUE_KEY) || '[]');
+    return Array.isArray(saved) ? saved.filter(x => x?.key && x?.text).slice(-30) : [];
+  } catch { return []; }
+})();
+const announcedRestoredQueues = new Set();
 // Composer state belongs to a conversation, never to the shared textarea.
 // Keeping this in memory deliberately avoids persisting potentially sensitive
 // prompts to disk while still making session switches lossless.
 const composerDrafts = new Map();
 
+function persistPendingUserTexts() {
+  try {
+    if (pendingUserTexts.length) sessionStorage.setItem(PENDING_QUEUE_KEY, JSON.stringify(pendingUserTexts.slice(-30)));
+    else sessionStorage.removeItem(PENDING_QUEUE_KEY);
+  } catch { /* private mode / quota: in-memory queue still works */ }
+}
+
+function announceRestoredQueue() {
+  const key = draftKey();
+  const count = pendingUserTexts.filter(item => item.key === key).length;
+  if (count && !announcedRestoredQueues.has(key)) {
+    announcedRestoredQueues.add(key);
+    appendSystemMsg(`⌛ Restored ${count} queued prompt${count === 1 ? '' : 's'} in this browser tab`);
+  }
+}
+
 function hubCursorKey(sessionId = ctx.sessionId, agent = ctx.agent, machineId = ctx.machineId) {
   return sessionId ? `${machineId || ''}:${agent || 'claude'}:${sessionId}` : '';
 }
@@ -106,6 +132,7 @@ export function parkQueuedMessages(identity) {
   const queued = pendingUserTexts.filter(item => item.key === key);
   if (!queued.length) return;
   pendingUserTexts = pendingUserTexts.filter(item => item.key !== key);
+  persistPendingUserTexts();
   const existing = composerDrafts.get(key) || '';
   composerDrafts.set(key, [existing, ...queued.map(item => item.text)].filter(Boolean).join('\n\n'));
 }
@@ -126,7 +153,7 @@ function bindSocketLifecycle() {
       ensureChatSocket({ probe: true });
       // Re-subscribe so server can re-attach stream / clear stuck busy state
       if (ctx.ws?.readyState === WebSocket.OPEN && ctx.sessionId) {
-        try { ctx.ws.send(JSON.stringify({ type: 'subscribe', sessionId: ctx.sessionId })); } catch { /* ignore */ }
+        try { ctx.ws.send(JSON.stringify({ type: 'subscribe', sessionId: ctx.sessionId, agent: ctx.agent })); } catch { /* ignore */ }
       }
     }
   });
@@ -225,6 +252,22 @@ function syncWakeLock() {
   setWakeLockDesired(need);
 }
 
+/** External CLI transcripts are observable, but this UI must not race their
+ * terminal owner by submitting another turn into the same native session. */
+export function setExternalSessionReadOnly(readOnly) {
+  ctx.externalSessionReadOnly = !!readOnly;
+  const input = $('chat-input');
+  const send = $('send-btn');
+  const attach = $('btn-attach');
+  if (input) {
+    input.disabled = !!readOnly;
+    if (readOnly) input.placeholder = '外部终端会话 · 实时同步中（只读）';
+    else if (!isProcessing.peek()) updateInputMode(input.value || '');
+  }
+  if (send) send.disabled = !!readOnly;
+  if (attach) attach.disabled = !!readOnly;
+}
+
 /** Manual reconnect (toolbar / banner). Resets backoff and forces a new socket. */
 export function refreshConnection() {
   reconnectDelay = 400;
@@ -273,9 +316,10 @@ export function connectWS(opts = {}) {
     wsStatus.value = 'open';
     updateConnDot();
     if (ctx.sessionId) {
-      try { sock.send(JSON.stringify({ type: 'subscribe', sessionId: ctx.sessionId })); } catch { /* ignore */ }
+      try { sock.send(JSON.stringify({ type: 'subscribe', sessionId: ctx.sessionId, agent: ctx.agent })); } catch { /* ignore */ }
     }
     flushWsQueue();
+    announceRestoredQueue();
     startHeartbeat(sock, gen);
     syncWakeLock();
     if (sawDisconnect && !reconnectQuiet) {
@@ -307,6 +351,10 @@ export function connectWS(opts = {}) {
         // Server says idle — unlock (fixes Grok lingering process / missed complete)
         isProcessing.value = false;
         flushPendingUserText();
+      } else {
+        // After reload the UI starts idle; server status is still authoritative
+        // enough to release browser-restored queued prompts.
+        flushPendingUserText();
       }
       syncWakeLock();
       return;
@@ -336,6 +384,7 @@ function flushPendingUserText() {
   // opened (or are converted to a draft during navigation).
   if (index < 0) return;
   const [pending] = pendingUserTexts.splice(index, 1);
+  persistPendingUserTexts();
   const input = $('chat-input');
   if (input) {
     input.value = pending.text;
@@ -379,10 +428,27 @@ function handleWsMessage(msg) {
     document.dispatchEvent(new CustomEvent('sessions-changed'));
     return;
   }
+  if (msg.type === 'external-sessions-changed') {
+    document.dispatchEvent(new CustomEvent('sessions-changed'));
+    return;
+  }
+  if (msg.type === 'external-session-updated') {
+    // The external CLI owns this conversation. Reloading the normalized native
+    // transcript is safer than trying to synthesize its varied JSONL events in
+    // the browser, and keeps reconnects/idempotency straightforward.
+    setExternalSessionReadOnly(true);
+    document.dispatchEvent(new CustomEvent('sessions-changed'));
+    document.dispatchEvent(new CustomEvent('external-session-updated', { detail: msg }));
+    return;
+  }
   if (msg.type === 'notification' && msg.notification) {
     pushNotification(msg.notification);
     return;
   }
+  if (msg.type === 'grok-queue-status') {
+    renderGrokQueuePrompts(msg);
+    return;
+  }
   if (msg.type === 'result') {
     finalizeThoughtStream();
     finalizeAssistantStream();
@@ -555,6 +621,7 @@ function finalizeAssistantStream() {
     liveAsstBody.classList.add('md');
     liveAsstBody.innerHTML = renderMarkdown(text);
     enhanceMarkdown(liveAsstEl);
+    addAssistantMessageActions(liveAsstEl, text);
   } else {
     liveAsstEl.remove();
   }
@@ -811,6 +878,10 @@ export function sendMessage() {
   const input = $('chat-input');
   const text  = input?.value.trim();
   if (!text || !currentProject.peek()) return;
+  if (ctx.externalSessionReadOnly) {
+    appendSystemMsg('此会话由外部终端运行，agentui 仅实时同步，不会发送输入。');
+    return;
+  }
 
   // While a turn is running, queue the next message (common Grok complaint).
   if (isProcessing.peek()) {
@@ -829,14 +900,16 @@ export function sendMessage() {
           ...(currentPermission.peek() === 'bypassPermissions' && { allowDangerouslySkipPermissions: true }),
         },
       });
+      appendQueuedGrokPrompt(text);
       input.value = '';
       autoResize(input);
       updateInputMode('');
       clearPendingAttachments();
-      appendSystemMsg(ok ? '已加入 Grok 服务端队列，刷新页面不会丢失' : '连接未就绪，消息将在重连后发送');
+      appendSystemMsg(ok ? '已加入 Grok 服务端队列，刷新页面仍会显示' : '连接未就绪，消息将在重连后发送');
       return;
     }
     pendingUserTexts.push({ key: draftKey(), text });
+    persistPendingUserTexts();
     input.value = '';
     autoResize(input);
     updateInputMode('');
@@ -907,6 +980,8 @@ export function stopProcessing() {
     sendWs({ type: 'command', cmd: 'turn.interrupt', sessionId: ctx.sessionId });
   }
   pendingUserTexts = pendingUserTexts.filter(item => item.key !== draftKey());
+  persistPendingUserTexts();
+  markQueuedGrokPromptsCancelled();
   markTurnDone();
 }
 
@@ -1017,7 +1092,7 @@ function bubbleHtml(role, text, ts) {
     case 'assistant': {
       const long = text.length > ASST_COLLAPSE;
       const inner = long ? `<div class="msg-body">${renderMarkdown(text)}</div>${expandBtn}` : renderMarkdown(text);
-      bubble = `<div class="max-w-[min(92%,52rem)] rounded-2xl rounded-tl-sm px-3.5 py-2.5 text-sm bg-base-200 border border-base-300/40 break-words md leading-relaxed${long ? ' msg-card' : ''}">${inner}</div>`;
+      bubble = `<div class="msg-assistant-content max-w-[min(92%,52rem)] rounded-2xl rounded-tl-sm px-3.5 py-2.5 text-sm bg-base-200 border border-base-300/40 break-words md leading-relaxed${long ? ' msg-card' : ''}">${inner}</div>`;
       break;
     }
     case 'error':
@@ -1047,6 +1122,7 @@ export function appendMsg(role, _label, text, opts = {}) {
   const ts = coerceTs(opts.ts) ?? (role === 'system' ? null : Date.now());
   msgs.insertAdjacentHTML('beforeend', bubbleHtml(role, text, ts));
   enhanceMarkdown(msgs.lastElementChild);
+  if (role === 'assistant') addAssistantMessageActions(msgs.lastElementChild, text, opts);
   stickBottom(msgs, role === 'user');
 }
 
@@ -1345,6 +1421,122 @@ export function clearMessages() {
   toolBatch = null;
   liveAsstEl = liveAsstBody = null;
   liveThoughtEl = liveThoughtBody = null;
+  assistantMessageRefs.clear();
+  renderedGrokQueuePrompts.clear();
+}
+
+function queuedGrokPromptKey(text, sessionId = ctx.sessionId) {
+  return `${sessionId || ''}\n${String(text || '')}`;
+}
+
+/** Paint a server-accepted Grok follow-up before the native transcript writes
+ * it. This makes the queued user prompt visible both immediately and after a
+ * reconnect (the server sends the same snapshot on subscribe). */
+function appendQueuedGrokPrompt(text, sessionId = ctx.sessionId) {
+  const key = queuedGrokPromptKey(text, sessionId);
+  if (!text || renderedGrokQueuePrompts.has(key)) return;
+  renderedGrokQueuePrompts.add(key);
+  appendMsg('user', 'You', text, { ts: Date.now() });
+  $('messages')?.lastElementChild?.classList.add('queued-user-msg');
+}
+
+function renderGrokQueuePrompts(msg) {
+  if ((msg.sessionId || ctx.sessionId) !== ctx.sessionId) return;
+  const items = Array.isArray(msg.items) ? msg.items.filter(x => typeof x === 'string' && x.trim()) : [];
+  for (const text of items) appendQueuedGrokPrompt(text, msg.sessionId || ctx.sessionId);
+  if (items.length) appendSystemMsg(`⌛ Grok queue · ${items.length} prompt${items.length === 1 ? '' : 's'} waiting`);
+}
+
+function markQueuedGrokPromptsCancelled() {
+  const msgs = $('messages');
+  if (!msgs) return;
+  msgs.querySelectorAll('.queued-user-msg').forEach(row => {
+    row.classList.remove('queued-user-msg');
+    row.classList.add('cancelled-queued-user-msg');
+  });
+  renderedGrokQueuePrompts.clear();
+}
+
+/** Per-answer controls stay below the assistant message. Raw answer text lives
+ * only in this in-memory map, never in a DOM data attribute. */
+function addAssistantMessageActions(row, text, opts = {}) {
+  if (!row || !text || row.querySelector('.msg-actions')) return;
+  const key = `a${++assistantMessageSeq}`;
+  assistantMessageRefs.set(key, {
+    text,
+    historyIndex: Number.isInteger(opts.historyIndex) ? opts.historyIndex : null,
+    sessionId: ctx.sessionId,
+    agent: ctx.agent || currentAgent.peek() || 'claude',
+    machineId: ctx.machineId || null,
+  });
+  const canFork = !['gemini', 'cursor'].includes(ctx.agent || currentAgent.peek() || 'claude');
+  const actions = document.createElement('div');
+  actions.className = 'msg-actions';
+  actions.innerHTML = `
+    <button type="button" class="msg-action-btn" data-copy-message="${esc(key)}" title="Copy answer">Copy</button>
+    ${canFork ? `<button type="button" class="msg-action-btn" data-fork-message="${esc(key)}" title="Start a branch from this answer">Fork</button>` : ''}`;
+  const timestamp = row.querySelector('.msg-ts');
+  row.insertBefore(actions, timestamp || null);
+}
+
+async function copyAssistantMessage(button) {
+  const ref = assistantMessageRefs.get(button.dataset.copyMessage || '');
+  if (!ref) return;
+  try {
+    await navigator.clipboard.writeText(ref.text);
+    button.textContent = 'Copied';
+  } catch {
+    button.textContent = 'Failed';
+  }
+  setTimeout(() => { button.textContent = 'Copy'; }, 1300);
+}
+
+async function forkAssistantMessage(button) {
+  const ref = assistantMessageRefs.get(button.dataset.forkMessage || '');
+  if (!ref || !ref.sessionId || ref.sessionId !== ctx.sessionId) return;
+  button.disabled = true;
+  button.textContent = 'Forking…';
+  try {
+    const res = await api('POST', `/api/sessions/${encodeURIComponent(ref.sessionId)}/fork`, {
+      sourceAgent: ref.agent,
+      ...(ref.historyIndex != null ? { upTo: ref.historyIndex } : {}),
+      assistantText: ref.text,
+    }, undefined, { machineId: ref.machineId || undefined });
+    if (!res?.success || !res.targetSessionId) throw new Error('Fork did not create a session');
+    const branch = {
+      parentSessionId: ref.sessionId,
+      parentAgent: ref.agent,
+      parentMachineId: ref.machineId,
+      forkMessageIndex: Number.isInteger(res.forkMessageIndex) ? res.forkMessageIndex : ref.historyIndex,
+      forkedAt: Date.now(),
+    };
+    const metaRes = await api('PUT', '/api/sessions/meta', {
+      sessionId: res.targetSessionId, agent: res.targetAgent || ref.agent, branch,
+      machineId: ref.machineId || undefined,
+    }, undefined, { machineId: ref.machineId || undefined });
+    const key = metaKey(res.targetAgent || ref.agent, res.targetSessionId, ref.machineId);
+    sessionMetaMap.value = {
+      ...sessionMetaMap.peek(),
+      [key]: {
+        favorite: Boolean(metaRes?.favorite), notes: metaRes?.notes || '', title: metaRes?.title || '',
+        hidden: Boolean(metaRes?.hidden), branch: metaRes?.branch || branch, updatedAt: metaRes?.updatedAt || Date.now(),
+      },
+    };
+    const [{ loadAllSessions }, { resumeSession }] = await Promise.all([
+      import('./shell/session-list.js'), import('./shell/session-nav.js'),
+    ]);
+    await loadAllSessions({ waitFresh: true });
+    await resumeSession(res.targetSessionId, currentProject.peek()?.path || null, ctx.configDir || null,
+      res.targetAgent || ref.agent, ref.machineId || null);
+    appendSystemMsg('Fork created — this branch can now continue independently.');
+  } catch (err) {
+    button.textContent = 'Fork failed';
+    appendSystemMsg(`Fork failed: ${err.message}`);
+    setTimeout(() => { button.textContent = 'Fork'; }, 1800);
+  } finally {
+    button.disabled = false;
+    if (button.textContent === 'Forking…') button.textContent = 'Fork';
+  }
 }
 
 function appendStreamBubble(role) {
@@ -1622,10 +1814,12 @@ export function initChat() {
     $('stop-btn')?.classList.toggle('hidden', !val);
     const input = $('chat-input');
     if (input) {
-      input.disabled = false;
-      if (val) input.placeholder = '回复中… 可先写好下一条，结束后自动发送 · 或点 ■ 停止';
+      input.disabled = !!ctx.externalSessionReadOnly;
+      if (ctx.externalSessionReadOnly) input.placeholder = '外部终端会话 · 实时同步中（只读）';
+      else if (val) input.placeholder = '回复中… 可先写好下一条，结束后自动发送 · 或点 ■ 停止';
       else updateInputMode(input.value || '');
     }
+    if (!val) $('send-btn')?.toggleAttribute('disabled', !!ctx.externalSessionReadOnly);
     const msgs = $('messages');
     if (!msgs) return;
     const existing = $('typing-indicator');
@@ -1747,6 +1941,17 @@ export function initChat() {
     el.textContent = expanded ? '▲ Show less' : '▼ Show more';
   });
 
+  delegate.on('click', '[data-copy-message]', (e, el) => {
+    e.preventDefault();
+    e.stopPropagation();
+    void copyAssistantMessage(el);
+  });
+  delegate.on('click', '[data-fork-message]', (e, el) => {
+    e.preventDefault();
+    e.stopPropagation();
+    void forkAssistantMessage(el);
+  });
+
   // Copy code from fenced blocks
   delegate.on('click', '.code-copy', async (e, el) => {
     e.preventDefault();

package/public/router.js

@@ -54,6 +54,11 @@ export function applyInitialRoute() {
 }
 
 function applyHash(path) {
+  const pathname = String(path || '').split('?')[0];
+  if (pathname === '/settings') {
+    document.dispatchEvent(new CustomEvent('router:settings'));
+    return;
+  }
   // /session/:id  or  /session/:id/:tab
   const parsed = parseHashPath(path);
   if (!parsed) {