glad-web 1.0.37 → 1.0.39

package/lib/codex/structured-session.js

@@ -183,6 +183,12 @@ function toolDetails(raw) {
   };
 }
 
+function codexReconnectProgress(message) {
+  const match = String(message || '').match(/\bReconnecting(?:\.\.\.)?\s*(\d+)\s*\/\s*(\d+)\b/i);
+  if (!match) return null;
+  return { attempt: Number(match[1]), maximum: Number(match[2]) };
+}
+
 class CodexStructuredSession extends EventEmitter {
   constructor({ id, tool, workingDir, name, logger, options = {} }) {
     super();
@@ -203,6 +209,7 @@ class CodexStructuredSession extends EventEmitter {
     this.threadId = options.resume || null;
     this.currentTurnId = null;
     this.currentTurnStartedAt = null;
+    this.reconnectAbortTurnId = null;
     this.threadTurns = new Map();
     this.turnContexts = new Map();
     this.providerItemContexts = new Map();
@@ -575,7 +582,15 @@ class CodexStructuredSession extends EventEmitter {
       return;
     }
     if (method === 'error') {
-      this.append({ kind: 'event', level: 'error', text: params.error?.message || 'Codex reported an error.' });
+      const message = params.error?.message || 'Codex reported an error.';
+      this.append({ kind: 'event', level: 'error', text: message });
+      const reconnect = codexReconnectProgress(message);
+      const turnId = String(params.turnId || this.currentTurnId || 'active');
+      if (params.willRetry && reconnect?.attempt === 4 && reconnect.maximum === 5
+        && this.reconnectAbortTurnId !== turnId && this.abort('Aborted after Codex reconnect attempt 4/5.')) {
+        this.reconnectAbortTurnId = turnId;
+        this.emitEvent({ type: 'runtime-disconnected', activeTurn: true, turnId });
+      }
       if (!params.willRetry) { this.compacting = false; this.setStatus('idle'); }
       return;
     }

package/lib/web/claude.js

@@ -486,15 +486,47 @@
         }
 
         function inlineMarkdown(text) {
+            const protectedSegments = [];
+            const protect = value => `\uE000${protectedSegments.push(value) - 1}\uE001`;
+            const restore = value => value.replace(/\uE000(\d+)\uE001/g, (_match, index) => protectedSegments[Number(index)] || '');
+            const formatText = value => {
+                const codeSegments = [];
+                const protectCode = code => `\uE002${codeSegments.push(code) - 1}\uE003`;
+                const restoreCode = formatted => formatted.replace(/\uE002(\d+)\uE003/g, (_match, index) => codeSegments[Number(index)] || '');
+                let formatted = value.replace(/`([^`]+)`/g, (_match, code) => protectCode(`<code>${code}</code>`));
+                formatted = formatted.replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>');
+                formatted = formatted.replace(/(^|[^\p{L}\p{N}_])__([^_\n]+)__(?![\p{L}\p{N}_])/gu, '$1<strong>$2</strong>');
+                formatted = formatted.replace(/\*([^*\n]+)\*/g, '<em>$1</em>');
+                formatted = formatted.replace(/(^|[^\p{L}\p{N}_])_([^_\n]+)_(?![\p{L}\p{N}_])/gu, '$1<em>$2</em>');
+                return restoreCode(formatted);
+            };
+
             let html = escapeHtml(text || '');
-            html = html.replace(/`([^`]+)`/g, '<code>$1</code>');
-            html = html.replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>');
-            html = html.replace(/__([^_]+)__/g, '<strong>$1</strong>');
-            html = html.replace(/\*([^*\n]+)\*/g, '<em>$1</em>');
-            html = html.replace(/_([^_\n]+)_/g, '<em>$1</em>');
-            html = html.replace(/!\[([^\]]*)\]\((https?:\/\/[^)\s]+)\)/g, '<img src="$2" alt="$1">');
-            html = html.replace(/\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g, '<a href="$2" target="_blank" rel="noopener noreferrer">$1</a>');
-            return html;
+            html = html.replace(/`([^`]+)`|!\[([^\]]*)\]\((https?:\/\/[^)\s]+)\)|\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g,
+                (_match, code, alt, imageUrl, label, linkUrl) => {
+                    if (code !== undefined) return protect(`<code>${code}</code>`);
+                    if (imageUrl !== undefined) return protect(`<img src="${imageUrl}" alt="${alt}">`);
+                    return protect(`<a href="${linkUrl}" target="_blank" rel="noopener noreferrer">${formatText(label)}</a>`);
+                });
+            return restore(formatText(html));
+        }
+
+        function parseMarkdownFenceOpener(line) {
+            const match = String(line || '').match(/^\s{0,3}(`{3,}|~{3,})(.*)$/);
+            if (!match) return null;
+            const marker = match[1];
+            const info = match[2].trim();
+            if (marker[0] === '`' && info.includes('`')) return null;
+            return {
+                character: marker[0],
+                length: marker.length,
+                language: info.split(/\s+/, 1)[0] || ''
+            };
+        }
+
+        function isMarkdownFenceCloser(line, opener) {
+            const match = String(line || '').match(/^\s{0,3}(`+|~+)\s*$/);
+            return Boolean(match && match[1][0] === opener.character && match[1].length >= opener.length);
         }
 
         function splitMarkdownBlocks(markdown) {
@@ -506,17 +538,16 @@
                     i++;
                     continue;
                 }
-                const fence = lines[i].match(/^```(\w+)?\s*$/);
+                const fence = parseMarkdownFenceOpener(lines[i]);
                 if (fence) {
-                    const language = fence[1] || '';
                     const content = [];
                     i++;
-                    while (i < lines.length && !/^```\s*$/.test(lines[i])) {
+                    while (i < lines.length && !isMarkdownFenceCloser(lines[i], fence)) {
                         content.push(lines[i]);
                         i++;
                     }
                     if (i < lines.length) i++;
-                    blocks.push({ type: 'code', language, content: content.join('\n') });
+                    blocks.push({ type: 'code', language: fence.language, content: content.join('\n') });
                     continue;
                 }
                 if (/^\s*[-*_]{3,}\s*$/.test(lines[i])) {
@@ -541,13 +572,15 @@
                     continue;
                 }
                 if (/^\s*([-*+])\s+/.test(lines[i]) || /^\s*\d+\.\s+/.test(lines[i])) {
-                    const ordered = /^\s*\d+\.\s+/.test(lines[i]);
+                    const orderedMatch = lines[i].match(/^\s*(\d+)\.\s+/);
+                    const ordered = Boolean(orderedMatch);
+                    const start = ordered ? Number(orderedMatch[1]) : null;
                     const items = [];
                     while (i < lines.length && (ordered ? /^\s*\d+\.\s+/.test(lines[i]) : /^\s*[-*+]\s+/.test(lines[i]))) {
                         items.push(lines[i].replace(ordered ? /^\s*\d+\.\s+/ : /^\s*[-*+]\s+/, ''));
                         i++;
                     }
-                    blocks.push({ type: ordered ? 'ol' : 'ul', items });
+                    blocks.push({ type: ordered ? 'ol' : 'ul', items, ...(ordered ? { start } : {}) });
                     continue;
                 }
                 if (/^\s*>\s?/.test(lines[i])) {
@@ -561,7 +594,12 @@
                 }
                 const paragraph = [];
                 while (i < lines.length && lines[i].trim()) {
-                    if (/^```/.test(lines[i]) || /^\s{0,3}#{1,4}\s+/.test(lines[i]) || /^\s*([-*+])\s+/.test(lines[i]) || /^\s*\d+\.\s+/.test(lines[i])) break;
+                    if (parseMarkdownFenceOpener(lines[i]) || /^\s{0,3}#{1,4}\s+/.test(lines[i]) || /^\s*([-*+])\s+/.test(lines[i]) || /^\s*\d+\.\s+/.test(lines[i])) break;
+                    paragraph.push(lines[i]);
+                    i++;
+                }
+                // Always make progress even if a future block detector and parser disagree.
+                if (!paragraph.length) {
                     paragraph.push(lines[i]);
                     i++;
                 }
@@ -580,7 +618,7 @@
                 if (block.type === 'hr') return '<hr>';
                 if (block.type === 'header') return `<h${block.level}>${inlineMarkdown(block.text)}</h${block.level}>`;
                 if (block.type === 'ul') return `<ul>${block.items.map(item => `<li>${inlineMarkdown(item)}</li>`).join('')}</ul>`;
-                if (block.type === 'ol') return `<ol>${block.items.map(item => `<li>${inlineMarkdown(item)}</li>`).join('')}</ol>`;
+                if (block.type === 'ol') return `<ol${block.start !== 1 ? ` start="${block.start}"` : ''}>${block.items.map(item => `<li>${inlineMarkdown(item)}</li>`).join('')}</ol>`;
                 if (block.type === 'quote') return `<blockquote>${renderMarkdown(block.text)}</blockquote>`;
                 if (block.type === 'table') return renderMarkdownTable(block.rows);
                 return `<p>${inlineMarkdown(block.text).replace(/\n/g, '<br>')}</p>`;

package/lib/web/core.js

@@ -229,18 +229,18 @@
                             <h3>${escapeHtml(s.name)}${s.hasUnreadCompletion ? '<span class="completion-dot" title="Completed"></span>' : ''}${timerBadge} <button class="icon-btn" onclick="renameSession('${s.id}', decodePathValue('${encodedName}'), event)"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg></button></h3>
                             <p>${escapeHtml(s.tool)}</p>
                             <p>${new Date(s.startTime).toLocaleTimeString()}</p>
-                            <div class="session-dir-row">
-                                <button class="copy-dir-btn" title="Copy directory" onclick="copySessionDirectory(decodePathValue('${encodedDir}'), event)">
-                                    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="11" height="11" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>
-                                </button>
-                                <p title="${escapeHtml(workingDirectory)}">${escapeHtml(workingDirectory)}</p>
-                            </div>
                         </div>
                         <div class="session-actions">
                             ${renderServerChanSessionAction(s)}
                             <button class="btn-join" onclick="joinSession('${s.id}', decodePathValue('${encodedName}'), '${escapeHtml(s.toolKey || '')}')">Connect</button>
                             <button class="icon-btn btn-delete" onclick="deleteSession('${s.id}', event)"><svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg></button>
                         </div>
+                        <div class="session-dir-row">
+                            <button class="copy-dir-btn" title="Copy directory" onclick="copySessionDirectory(decodePathValue('${encodedDir}'), event)">
+                                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="11" height="11" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>
+                            </button>
+                            <p title="${escapeHtml(workingDirectory)}">${escapeHtml(workingDirectory)}</p>
+                        </div>
                     </div>`;
                 });
                 list.innerHTML = html;

package/lib/web/styles.css

@@ -11,18 +11,18 @@
         .header-action-btn.icon-only { width: 36px; padding: 0; }
         .header-action-btn:active { background: #0062cc; transform: scale(.97); }
         .btn-retry { background: #333; color: #fff; border: none; padding: 8px 16px; border-radius: 20px; margin-top: 10px; cursor: pointer; }
-        .session-card { background: var(--card-bg); border-radius: 12px; padding: 16px; margin-bottom: 12px; display: flex; justify-content: space-between; align-items: center; transition: transform 0.1s; position: relative; }
+        .session-card { background: var(--card-bg); border-radius: 12px; padding: 12px 16px 8px; margin-bottom: 12px; display: grid; grid-template-columns: minmax(0, 1fr) auto; column-gap: 10px; row-gap: 0; align-items: center; transition: transform 0.1s; position: relative; }
         .session-card:active { transform: scale(0.98); }
         .completion-dot { width: 9px; height: 9px; border-radius: 50%; background: #ff3b30; flex-shrink: 0; }
         .session-info { flex: 1; min-width: 0; }
         .session-info h3 { margin: 0 0 4px 0; font-size: 17px; display: flex; align-items: center; gap: 8px; }
         .session-info p { margin: 0; font-size: 13px; color: var(--text-dim); }
         .timer-count-badge { display: inline-flex; align-items: center; gap: 3px; color: #fff; background: rgba(0,122,255,0.22); border: 1px solid rgba(0,122,255,0.34); border-radius: 999px; padding: 2px 7px; font-size: 11px; font-weight: 800; flex-shrink: 0; }
-        .session-dir-row { display: flex; align-items: center; gap: 6px; margin-top: 2px; }
+        .session-dir-row { grid-column: 1 / -1; display: flex; align-items: center; gap: 6px; width: 100%; min-width: 0; }
         .session-dir-row p { flex: 1; min-width: 0; font-family: monospace; overflow-wrap: anywhere; }
         .copy-dir-btn { color: var(--text-dim); background: rgba(255,255,255,0.06); border: 1px solid rgba(255,255,255,0.08); border-radius: 8px; width: 28px; height: 28px; padding: 0; display: flex; align-items: center; justify-content: center; cursor: pointer; flex-shrink: 0; }
         .copy-dir-btn:active { color: #fff; background: rgba(255,255,255,0.12); }
-        .session-actions { display: flex; gap: 12px; align-items: center; margin-left: 10px; }
+        .session-actions { display: flex; gap: 12px; align-items: center; }
         .serverchan-toggle { width: 34px; height: 34px; padding: 0; border: 1px solid rgba(255,255,255,0.1); border-radius: 50%; background: rgba(255,255,255,0.05); color: var(--text-dim); cursor: pointer; display: flex; align-items: center; justify-content: center; flex-shrink: 0; }
         .serverchan-toggle.active { color: #34c759; background: rgba(52,199,89,0.13); }
         .serverchan-toggle:active { color: #fff; background: rgba(255,255,255,0.12); }

package/package.json

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