glad-web 1.0.27 → 1.0.28

package/lib/codex/structured-session.js

@@ -43,6 +43,12 @@ function safeJson(value) {
   try { return JSON.stringify(value || {}, null, 2); } catch (_) { return String(value || ''); }
 }
 
+function toTimestampMs(value) {
+  const timestamp = Number(value || 0);
+  if (!timestamp) return null;
+  return timestamp < 100000000000 ? timestamp * 1000 : timestamp;
+}
+
 function appServerSpawnOptions({ cwd, env, platform = process.platform }) {
   const options = { cwd, env, stdio: ['pipe', 'pipe', 'pipe'] };
 
@@ -247,7 +253,7 @@ class CodexStructuredSession extends EventEmitter {
   patch(id, patch) {
     const item = this.messages.find(message => message.id === id);
     if (!item) return null;
-    Object.assign(item, patch);
+    Object.assign(item, { updatedAt: Date.now() }, patch);
     this.emitEvent({ type: 'message-updated', message: item });
     return item;
   }
@@ -514,8 +520,10 @@ class CodexStructuredSession extends EventEmitter {
     const trackedTurnId = threadId ? this.threadTurns.get(threadId)?.turnId : null;
     const turnId = raw.turnId || context.turnId || trackedTurnId || this.currentTurnId;
     const existingStartedAtMs = existing?.startedAtMs || existing?.createdAt || null;
-    const startedAtMs = context.startedAtMs || raw.startedAtMs || existingStartedAtMs;
-    const completedAtMs = context.completedAtMs || raw.completedAtMs || null;
+    const startedAtMs = Number(context.startedAtMs || raw.startedAtMs || 0)
+      || toTimestampMs(raw.startedAt || raw.createdAt) || existingStartedAtMs;
+    const completedAtMs = Number(context.completedAtMs || raw.completedAtMs || 0)
+      || toTimestampMs(raw.completedAt || raw.updatedAt);
     const durationMs = Number(raw.durationMs || 0)
       || (completedAtMs && startedAtMs && completedAtMs >= startedAtMs ? completedAtMs - startedAtMs : null)
       || Number(existing?.durationMs || 0) || null;
@@ -526,13 +534,13 @@ class CodexStructuredSession extends EventEmitter {
     };
     const patch = kind === 'tool' ? { ...toolDetails(raw), threadId, turnId,
       ...timing, toolStatus: inferredToolStatus || raw.status || 'running' }
-      : { text, threadId, turnId, streaming: false };
+      : { text, threadId, turnId, streaming: false, ...(completedAtMs ? { completedAtMs } : {}) };
     if (existing) {
       this.patch(existing.id, patch);
     } else if (kind === 'user') {
       const local = [...this.messages].reverse().find(item => item.kind === 'user' && !item.providerId && item.text === text);
       if (local) this.patch(local.id, { providerId, ...patch });
-      else this.append({ kind, providerId, ...patch });
+      else this.append({ kind, providerId, ...(startedAtMs ? { createdAt: startedAtMs } : {}), ...patch });
     } else {
       this.append({ kind, providerId, ...(startedAtMs ? { createdAt: startedAtMs } : {}), ...patch });
     }
@@ -702,33 +710,41 @@ class CodexStructuredSession extends EventEmitter {
       text: prompt || '📷 Image attachment',
       attachments: images.map(item => ({ id: item.id, name: item.name || 'image' }))
     });
-    await this.ensureProcess();
-    if (!this.threadId) {
-      const params = { cwd: this.workingDir };
+    try {
+      await this.ensureProcess();
+      if (!this.threadId) {
+        const params = { cwd: this.workingDir };
+        if (this.hasModelOverride) params.model = this.model;
+        if (this.permissionMode) params.approvalPolicy = this.permissionMode;
+        if (this.sandboxMode) params.sandbox = this.sandboxMode;
+        const started = await this.request('thread/start', params);
+        this.threadId = started.thread?.id;
+        this.model = started.model || this.model;
+        this.effort = started.reasoningEffort || this.effort;
+        this.effectivePermissionMode = started.approvalPolicy || this.effectivePermissionMode;
+        this.effectiveSandboxMode = sandboxModeFromPolicy(started.sandbox) || this.effectiveSandboxMode;
+        this.emitEvent({ type: 'state', state: this.getControlState() });
+      }
+      this.setStatus('running');
+      const input = [];
+      if (prompt) input.push({ type: 'text', text: prompt });
+      for (const image of images) input.push({ type: 'localImage', path: image.path });
+      const params = { threadId: this.threadId, input, cwd: this.workingDir, summary: 'auto' };
       if (this.hasModelOverride) params.model = this.model;
+      if (this.hasEffortOverride) params.effort = this.effort;
       if (this.permissionMode) params.approvalPolicy = this.permissionMode;
-      if (this.sandboxMode) params.sandbox = this.sandboxMode;
-      const started = await this.request('thread/start', params);
-      this.threadId = started.thread?.id;
-      this.model = started.model || this.model;
-      this.effort = started.reasoningEffort || this.effort;
-      this.effectivePermissionMode = started.approvalPolicy || this.effectivePermissionMode;
-      this.effectiveSandboxMode = sandboxModeFromPolicy(started.sandbox) || this.effectiveSandboxMode;
-      this.emitEvent({ type: 'state', state: this.getControlState() });
+      const sandboxPolicy = sandboxPolicyFor(this.sandboxMode, this.workingDir);
+      if (sandboxPolicy) params.sandboxPolicy = sandboxPolicy;
+      const started = await this.request('turn/start', params);
+      this.currentTurnId = started?.turn?.id || started?.turnId || this.currentTurnId;
+      return true;
+    } catch (error) {
+      this.currentTurnId = null;
+      this.currentTurnStartedAt = null;
+      this.setStatus('idle');
+      this.append({ kind: 'event', level: 'error', text: `Unable to send message: ${error.message}` });
+      throw error;
     }
-    this.setStatus('running');
-    const input = [];
-    if (prompt) input.push({ type: 'text', text: prompt });
-    for (const image of images) input.push({ type: 'localImage', path: image.path });
-    const params = { threadId: this.threadId, input, cwd: this.workingDir, summary: 'auto' };
-    if (this.hasModelOverride) params.model = this.model;
-    if (this.hasEffortOverride) params.effort = this.effort;
-    if (this.permissionMode) params.approvalPolicy = this.permissionMode;
-    const sandboxPolicy = sandboxPolicyFor(this.sandboxMode, this.workingDir);
-    if (sandboxPolicy) params.sandboxPolicy = sandboxPolicy;
-    const started = await this.request('turn/start', params);
-    this.currentTurnId = started?.turn?.id || started?.turnId || this.currentTurnId;
-    return true;
   }
 
   write(data) {
@@ -736,9 +752,7 @@ class CodexStructuredSession extends EventEmitter {
     const text = String(data || '').replace(/\r/g, '\n');
     const prompt = text.trim();
     if (prompt) void this.sendUserMessage(prompt).catch(error => {
-      this.currentTurnId = null;
-      this.setStatus('idle');
-      this.append({ kind: 'event', level: 'error', text: error.message });
+      this.logger.debugInfo?.(`[codex-app-server] send failed: ${error.message}`);
     });
     return true;
   }
@@ -830,7 +844,12 @@ class CodexStructuredSession extends EventEmitter {
       const startedAtMs = toMilliseconds(startedAt);
       const completedAtMs = toMilliseconds(completedAt);
       this.append({ kind: 'turn-start', turnId: turn.id, ...(startedAtMs ? { createdAt: startedAtMs } : {}) });
-      for (const item of turn.items || []) this.applyProviderItem({ ...item, turnId: turn.id }, status === 'failed' ? 'failed' : 'completed');
+      for (const item of turn.items || []) {
+        this.applyProviderItem({ ...item, turnId: turn.id }, status === 'failed' ? 'failed' : 'completed', {
+          startedAtMs,
+          completedAtMs
+        });
+      }
       const durationMs = Number(turn.durationMs || turn.duration_ms || 0)
         || (startedAtMs && completedAtMs && completedAtMs >= startedAtMs ? completedAtMs - startedAtMs : null);
       this.append({ kind: 'turn-end', turnId: turn.id, status, durationMs,

package/lib/session/session-manager.js

@@ -439,42 +439,23 @@ class SessionManager extends EventEmitter {
   }
 
   async forkCodex(id, threadId) {
-    const source = this.get(id);
-    if (!source || source.kind !== 'codex-structured') return null;
-    if (source.presentation !== 'structured' || source.status !== 'idle') {
+    const session = this.get(id);
+    if (!session || session.kind !== 'codex-structured') return null;
+    if (session.presentation !== 'structured' || session.status !== 'idle') {
       const error = new Error('Codex must be idle in chat mode before forking');
       error.statusCode = 409;
       throw error;
     }
-    const sourceThreadId = String(threadId || source.threadId || '').trim();
+    const sourceThreadId = String(threadId || session.threadId || '').trim();
     if (!sourceThreadId) {
       const error = new Error('Choose a Codex thread to fork');
       error.statusCode = 400;
       throw error;
     }
-
-    const target = this.createCodexStructuredSession({
-      tool: source.tool,
-      workingDirectory: this.getSessionWorkingDirectory(source),
-      name: `${source.name} Fork`,
-      codexOptions: {
-        ...(source.hasModelOverride && source.model ? { model: source.model } : {}),
-        ...(source.hasEffortOverride && source.effort ? { effort: source.effort } : {}),
-        ...(source.permissionMode ? { permissionMode: source.permissionMode } : {}),
-        ...(source.sandboxMode ? { sandboxMode: source.sandboxMode } : {})
-      }
-    });
-    target.parentSessionId = source.id;
-    target.forkedFromThreadId = sourceThreadId;
-    try {
-      const result = await target.forkFrom(sourceThreadId);
-      if (!result) throw new Error('Unable to fork the selected Codex thread');
-      source.append({ kind: 'event', level: 'info', text: `Forked a new session: ${target.name}` });
-      return target;
-    } catch (error) {
-      this.kill(target.id);
-      throw error;
-    }
+    const result = await session.forkFrom(sourceThreadId);
+    if (!result) throw new Error('Unable to fork the selected Codex thread');
+    session.forkedFromThreadId = sourceThreadId;
+    return session;
   }
 
   listCodexResumeThreads(id) {

package/lib/web/index.html

@@ -99,9 +99,13 @@
         .codex-conversation { width: min(100%, var(--chat-content-max)); margin: 0 auto; }
         .codex-working-indicator { position: sticky; top: 0; z-index: 4; width: 28px; height: 28px; margin: 0 0 -28px auto; border: 1px solid rgba(255,255,255,.1); border-radius: 50%; background: rgba(28,28,30,.68); box-shadow: 0 5px 16px rgba(0,0,0,.24); backdrop-filter: blur(8px); pointer-events: none; }
         .codex-working-indicator::after { content: ''; position: absolute; inset: 8px; border: 1.5px solid rgba(255,255,255,.7); border-top-color: transparent; border-radius: 50%; animation: codex-spin .8s linear infinite; }
-        .codex-message { max-width: 100%; margin: 0 0 12px; color: #f5f5f7; font-size: 14px; line-height: 1.45; overflow-wrap: anywhere; }
-        .codex-message.user { max-width: 92%; margin-left: auto; padding: 8px 12px; border: 1px solid rgba(0,122,255,.32); border-radius: 12px; background: rgba(0,122,255,.24); }
+        .codex-message-block { max-width: 100%; margin: 0 0 12px; }
+        .codex-message-block.user { max-width: 92%; margin-left: auto; }
+        .codex-message { max-width: 100%; margin: 0; color: #f5f5f7; font-size: 14px; line-height: 1.45; overflow-wrap: anywhere; }
+        .codex-message.user { padding: 8px 12px; border: 1px solid rgba(0,122,255,.32); border-radius: 12px; background: rgba(0,122,255,.24); }
         .codex-message.event { color: var(--text-dim); text-align: center; font-size: 12px; }
+        .codex-message-time { display: block; width: max-content; margin-top: 4px; padding: 0 2px; color: #8e8e93; font-size: 10px; font-weight: 500; line-height: 1; font-variant-numeric: tabular-nums; }
+        .codex-message-block.user .codex-message-time { margin-left: auto; }
         .codex-status-card { margin: 10px 0 14px; border: 1px solid rgba(100,210,255,.2); border-radius: 10px; background: rgba(28,28,30,.72); padding: 11px; color: #f5f5f7; }
         .codex-status-title { margin-bottom: 9px; color: #64d2ff; font-size: 12px; font-weight: 800; text-transform: uppercase; letter-spacing: .04em; }
         .codex-status-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 7px; }
@@ -327,7 +331,7 @@
             .codex-control-page .claude-ctrl-btn { height: 36px; padding-left: 4px; padding-right: 4px; }
             .codex-select-control { height: 36px; }
             #codex-chat-container { padding: 10px 10px calc(22px + env(safe-area-inset-bottom)); }
-            .codex-message.user { max-width: 94%; }
+            .codex-message-block.user { max-width: 94%; }
             .claude-permission-actions { justify-content: flex-start; }
         }
         @media (max-width: 430px) {
@@ -451,7 +455,7 @@
                             <button id="codex-status-btn" class="claude-ctrl-btn" onclick="requestCodexStatus()" title="Show Codex account, limits, and context status">Status</button>
                             <button id="codex-abort-btn" class="claude-ctrl-btn danger" onclick="abortCodexSession()" title="Abort current Codex turn">Abort</button>
                             <button id="codex-resume-btn" class="claude-ctrl-btn primary" onclick="toggleCodexResumePanel()" title="Resume a Codex thread">Resume</button>
-                            <button id="codex-fork-btn" class="claude-ctrl-btn primary" onclick="toggleCodexForkPanel()" title="Fork a Codex thread into a new Glad session">Fork</button>
+                            <button id="codex-fork-btn" class="claude-ctrl-btn primary" onclick="toggleCodexForkPanel()" title="Fork a Codex thread in this conversation">Fork</button>
                         </div>
                         <div class="codex-control-page">
                             <label class="codex-select-control" title="Sandbox mode">
@@ -2197,7 +2201,16 @@
             }).join('');
             const label = running ? 'Working' : failed ? 'Work finished with errors' : duration ? `Worked for ${duration}` : 'Worked';
             const key = items.map(item => item.id || item.providerId || '').join('-');
-            return `<details class="codex-work-group" data-codex-key="group-${escapeHtml(key)}"${running ? ' open' : ''}><summary>${label} · ${items.length} tools</summary><div class="codex-work-group-body">${tools}</div></details>`;
+            return `<details class="codex-work-group" data-codex-key="group-${escapeHtml(key)}"><summary>${label} · ${items.length} ${items.length === 1 ? 'tool' : 'tools'}</summary><div class="codex-work-group-body">${tools}</div></details>`;
+        }
+        function renderCodexMessageTime(item, finalOnly = false) {
+            if (!item || (finalOnly && item.streaming)) return '';
+            const timestamp = Number(finalOnly ? (item.completedAtMs || item.updatedAt || item.createdAt) : item.createdAt);
+            if (!Number.isFinite(timestamp) || timestamp <= 0) return '';
+            const date = new Date(timestamp);
+            if (Number.isNaN(date.getTime())) return '';
+            const label = date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
+            return `<time class="codex-message-time" datetime="${escapeHtml(date.toISOString())}" title="${escapeHtml(date.toLocaleString())}">${escapeHtml(label)}</time>`;
         }
         function syncCodexDom(current, next) {
             if (!current || !next) return;
@@ -2243,6 +2256,10 @@
         function commitCodexChatRender() {
             const container = document.getElementById('codex-chat-container');
             if (!container) return;
+            const wasEmpty = !container.firstElementChild;
+            const previousScrollTop = container.scrollTop;
+            const distanceFromBottom = container.scrollHeight - container.clientHeight - previousScrollTop;
+            const shouldStickToBottom = wasEmpty || distanceFromBottom <= 64;
             const parts = [];
             const permissionById = new Map(codexPendingPermissions.map(item => [String(item.id), item]));
             const usedPermissions = new Set();
@@ -2255,17 +2272,12 @@
                     const tools = [];
                     const turnId = item.turnId;
                     while (i < visible.length && visible[i].kind === 'tool' && visible[i].turnId === turnId) tools.push(visible[i++]);
-                    if (tools.length > 1) parts.push(renderCodexToolGroup(tools, permissionById, usedPermissions,
+                    parts.push(renderCodexToolGroup(tools, permissionById, usedPermissions,
                         turnEndById.get(String(turnId || ''))));
-                    else {
-                        const permission = permissionById.get(String(tools[0].providerId || ''));
-                        if (permission) usedPermissions.add(permission.id);
-                        parts.push(renderCodexTool(tools[0], permission));
-                    }
                     continue;
                 }
-                if (item.kind === 'assistant') parts.push(`<div class="codex-message assistant claude-md" data-codex-key="message-${escapeHtml(item.id || '')}">${renderMarkdown(item.text || '')}</div>`);
-                else if (item.kind === 'user') parts.push(`<div class="codex-message user claude-md" data-codex-key="message-${escapeHtml(item.id || '')}">${renderMarkdown(item.text || '')}</div>`);
+                if (item.kind === 'assistant') parts.push(`<div class="codex-message-block assistant" data-codex-key="message-${escapeHtml(item.id || '')}"><div class="codex-message assistant claude-md">${renderMarkdown(item.text || '')}</div>${renderCodexMessageTime(item, true)}</div>`);
+                else if (item.kind === 'user') parts.push(`<div class="codex-message-block user" data-codex-key="message-${escapeHtml(item.id || '')}"><div class="codex-message user claude-md">${renderMarkdown(item.text || '')}</div>${renderCodexMessageTime(item)}</div>`);
                 else if (item.kind === 'status') parts.push(renderCodexStatus(item));
                 else parts.push(`<div class="codex-message ${escapeHtml(item.level === 'error' ? 'event error' : item.kind || 'event')}">${codexText(item.text)}</div>`);
                 i += 1;
@@ -2278,7 +2290,7 @@
             const current = container.firstElementChild;
             if (!current) container.appendChild(next);
             else syncCodexDom(current, next);
-            requestAnimationFrame(() => { container.scrollTop = container.scrollHeight; });
+            container.scrollTop = shouldStickToBottom ? container.scrollHeight : previousScrollTop;
         }
 
         function applyCodexState(state = {}) {
@@ -2307,7 +2319,7 @@
             const abort = document.getElementById('codex-abort-btn');
             if (abort) abort.disabled = !codexState.canAbort;
             const fork = document.getElementById('codex-fork-btn');
-            if (fork) fork.disabled = !(codexState.presentation === 'structured' && codexState.status === 'idle' && codexState.threadId);
+            if (fork) fork.disabled = !(codexState.presentation === 'structured' && codexState.status === 'idle');
             const terminal = document.getElementById('codex-terminal-switch');
             if (terminal) { terminal.textContent = codexState.presentation === 'terminal' ? 'CHAT' : 'TERM'; terminal.disabled = codexState.presentation === 'structured' && !codexState.canSwitchToTerminal; terminal.title = codexState.presentation === 'terminal' ? 'Return to Codex chat' : 'Switch to Codex terminal'; }
             renderCodexStateBar();
@@ -2393,7 +2405,7 @@
             await loadCodexThreadPanel(panel, 'resume');
         }
         async function toggleCodexForkPanel() {
-            if (!(codexState.presentation === 'structured' && codexState.status === 'idle' && codexState.threadId)) return;
+            if (!(codexState.presentation === 'structured' && codexState.status === 'idle')) return;
             codexForkPanelOpen = !codexForkPanelOpen;
             codexModelPanelOpen = false;
             codexResumePanelOpen = false;
@@ -2429,7 +2441,7 @@
         }
         async function selectCodexForkThread(threadId) {
             const panel = document.getElementById('codex-fork-panel');
-            panel.innerHTML = '<div class="claude-resume-meta" style="padding:12px;">Forking into a new session...</div>';
+            panel.innerHTML = '<div class="claude-resume-meta" style="padding:12px;">Forking and switching this conversation...</div>';
             updateTerminalControlsHeight();
             const res = await fetchWithTimeout(`/api/sessions/${activeSessionId}/codex-fork`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ threadId }) }, 60000);
             const data = await res.json();
@@ -2442,7 +2454,6 @@
             panel.classList.remove('active');
             panel.innerHTML = '';
             updateTerminalControlsHeight();
-            refreshSessionsNow();
         }
         async function toggleCodexPresentation() {
             const presentation = codexState.presentation === 'terminal' ? 'structured' : 'terminal';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glad-web",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Glad transforms terminal-based AI coding tools into a polished, mobile-friendly local Web interface.",
   "main": "index.js",
   "bin": {