glad-web 1.0.26 → 1.0.27

package/lib/codex/structured-session.js

@@ -812,12 +812,17 @@ class CodexStructuredSession extends EventEmitter {
     this.effectivePermissionMode = result.approvalPolicy || this.effectivePermissionMode;
     this.effectiveSandboxMode = sandboxModeFromPolicy(result.sandbox) || this.effectiveSandboxMode;
     const history = await this.request('thread/read', { threadId: this.threadId, includeTurns: true });
-    this.model = history?.thread?.model || this.model;
-    this.effort = history?.thread?.reasoningEffort || history?.thread?.reasoning_effort || this.effort;
-    this.tokenUsage = history?.thread?.tokenUsage || history?.thread?.token_usage || this.tokenUsage;
+    this.restoreThreadHistory(history?.thread, `Resumed Codex thread ${this.threadId}`);
+    return true;
+  }
+
+  restoreThreadHistory(thread, eventText = '') {
+    this.model = thread?.model || this.model;
+    this.effort = thread?.reasoningEffort || thread?.reasoning_effort || this.effort;
+    this.tokenUsage = thread?.tokenUsage || thread?.token_usage || this.tokenUsage;
     this.messages = [];
     this.completedPermissions = [];
-    for (const turn of history?.thread?.turns || []) {
+    for (const turn of thread?.turns || []) {
       const status = turn.status === 'failed' ? 'failed' : turn.status === 'interrupted' ? 'cancelled' : 'completed';
       const startedAt = Number(turn.startedAt || turn.createdAt || 0);
       const completedAt = Number(turn.completedAt || turn.updatedAt || 0);
@@ -831,10 +836,29 @@ class CodexStructuredSession extends EventEmitter {
       this.append({ kind: 'turn-end', turnId: turn.id, status, durationMs,
         ...(completedAtMs ? { createdAt: completedAtMs } : {}) });
     }
-    this.append({ kind: 'event', level: 'info', text: `Resumed Codex thread ${this.threadId}` });
+    if (eventText) this.append({ kind: 'event', level: 'info', text: eventText });
     this.emitEvent({ type: 'history-reset', messages: this.messages });
     this.emitEvent({ type: 'state', state: this.getControlState() });
-    return true;
+  }
+
+  async forkFrom(threadId) {
+    const sourceThreadId = String(threadId || '').trim();
+    if (!sourceThreadId || this.presentation !== 'structured' || this.status !== 'idle') return false;
+    await this.ensureProcess();
+    const params = { threadId: sourceThreadId, cwd: this.workingDir, ephemeral: false, threadSource: null };
+    if (this.hasModelOverride) params.model = this.model;
+    if (this.permissionMode) params.approvalPolicy = this.permissionMode;
+    if (this.sandboxMode) params.sandbox = this.sandboxMode;
+    const result = await this.request('thread/fork', params);
+    const forkedThread = result?.thread;
+    if (!forkedThread?.id) throw new Error('Codex did not return a forked thread');
+    this.threadId = forkedThread.id;
+    this.model = result.model || forkedThread.model || this.model;
+    this.effort = result.reasoningEffort || forkedThread.reasoningEffort || forkedThread.reasoning_effort || this.effort;
+    this.effectivePermissionMode = result.approvalPolicy || this.effectivePermissionMode;
+    this.effectiveSandboxMode = sandboxModeFromPolicy(result.sandbox) || this.effectiveSandboxMode;
+    this.restoreThreadHistory(forkedThread, `Forked from Codex thread ${sourceThreadId}`);
+    return { threadId: this.threadId };
   }
 
   async switchToTerminal() {

package/lib/commands/web.js

@@ -379,6 +379,14 @@ async function webCommand(options) {
     } catch (e) { res.status(400).json({ error: e.message }); }
   });
 
+  app.post('/api/sessions/:id/codex-fork', async (req, res) => {
+    try {
+      const session = await sessionManager.forkCodex(req.params.id, req.body && req.body.threadId);
+      if (!session) return res.status(404).json({ error: 'Codex session not found' });
+      res.json({ success: true, id: session.id, name: session.name, threadId: session.threadId });
+    } catch (e) { res.status(e.statusCode || 400).json({ error: e.message }); }
+  });
+
   app.post('/api/sessions/:id/codex-presentation', async (req, res) => {
     const presentation = req.body && req.body.presentation;
     if (!['terminal', 'structured'].includes(presentation)) return res.status(400).json({ error: 'Invalid presentation' });

package/lib/session/session-manager.js

@@ -438,6 +438,45 @@ class SessionManager extends EventEmitter {
     return session && session.kind === 'codex-structured' ? session.resume(threadId) : false;
   }
 
+  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 error = new Error('Codex must be idle in chat mode before forking');
+      error.statusCode = 409;
+      throw error;
+    }
+    const sourceThreadId = String(threadId || source.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;
+    }
+  }
+
   listCodexResumeThreads(id) {
     const session = this.get(id);
     if (!session || session.kind !== 'codex-structured') return null;

package/lib/web/index.html

@@ -143,16 +143,18 @@
         .codex-inline-permission .claude-permission-actions { margin-top: 8px; }
         @keyframes codex-spin { to { transform: rotate(360deg); } }
         #codex-control-panel { display: none; width: min(100%, var(--control-content-max)); margin: 0 auto; padding: 8px 14px 10px; border-bottom: 1px solid #222; background: #121212; box-sizing: border-box; }
-        .codex-control-row { display: grid; grid-template-columns: repeat(6, minmax(0, 116px)); grid-template-rows: auto; justify-content: center; gap: clamp(2px, .8vw, 7px); align-items: center; white-space: nowrap; }
-        .codex-control-row > * { width: 100%; min-width: 0; overflow: hidden; }
-        .codex-control-row .claude-ctrl-btn, .codex-control-row .codex-select-label { padding-left: clamp(2px, 1vw, 10px); padding-right: clamp(2px, 1vw, 10px); font-size: clamp(8px, 2.2vw, 11px); text-overflow: ellipsis; overflow: hidden; }
+        .codex-control-rail { display: flex; gap: 14px; overflow-x: auto; overscroll-behavior-x: contain; scroll-snap-type: x mandatory; scrollbar-width: none; -webkit-overflow-scrolling: touch; }
+        .codex-control-rail::-webkit-scrollbar { display: none; }
+        .codex-control-page { flex: 0 0 100%; display: grid; grid-template-columns: repeat(5, minmax(0, 116px)); grid-template-rows: auto; justify-content: center; gap: clamp(2px, .8vw, 7px); align-items: center; white-space: nowrap; scroll-snap-align: start; box-sizing: border-box; }
+        .codex-control-page > * { width: 100%; min-width: 0; overflow: hidden; }
+        .codex-control-page .claude-ctrl-btn, .codex-control-page .codex-select-label { padding-left: clamp(2px, 1vw, 10px); padding-right: clamp(2px, 1vw, 10px); font-size: clamp(8px, 2.2vw, 11px); text-overflow: ellipsis; overflow: hidden; }
         .codex-select-control { position: relative; display: block; min-width: 0; height: 32px; }
         .codex-select-label { display: flex; width: 100%; height: 100%; align-items: center; justify-content: center; box-sizing: border-box; border: 1px solid rgba(255,255,255,.1); border-radius: 16px; background: rgba(255,255,255,.08); color: #f5f5f7; font-size: 11px; font-weight: 800; white-space: nowrap; }
         .codex-select-control:focus-within .codex-select-label { background: rgba(255,255,255,.14); border-color: rgba(0,122,255,.45); }
         .codex-select { appearance: none; position: absolute; inset: 0; width: 100%; min-width: 0; height: 100%; opacity: 0; cursor: pointer; }
         .codex-select option { background: #1c1c1e; color: #fff; }
-        #codex-model-panel, #codex-resume-panel { display: none; margin-top: 8px; border: 1px solid rgba(255,255,255,.1); background: rgba(28,28,30,.99); border-radius: 8px; box-shadow: 0 16px 36px rgba(0,0,0,.34); overflow: hidden; }
-        #codex-model-panel.active, #codex-resume-panel.active { display: block; }
+        #codex-model-panel, #codex-resume-panel, #codex-fork-panel { display: none; margin-top: 8px; border: 1px solid rgba(255,255,255,.1); background: rgba(28,28,30,.99); border-radius: 8px; box-shadow: 0 16px 36px rgba(0,0,0,.34); overflow: hidden; }
+        #codex-model-panel.active, #codex-resume-panel.active, #codex-fork-panel.active { display: block; }
         #codex-model-panel { grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); max-height: min(300px, 42dvh); }
         #codex-model-panel.active { display: grid; }
         .codex-picker-column { min-width: 0; overflow-y: auto; }
@@ -161,7 +163,7 @@
         .codex-picker-option.selected { background: rgba(0,122,255,.18); color: #fff; }
         #codex-state-bar { display: flex; align-items: center; gap: 7px; min-height: 24px; margin-top: 8px; color: var(--text-dim); font-size: 11px; overflow-x: auto; scrollbar-width: none; white-space: nowrap; }
         #codex-state-bar::-webkit-scrollbar { display: none; }
-        #codex-resume-panel { max-height: min(280px, 38dvh); overflow-y: auto; }
+        #codex-resume-panel, #codex-fork-panel { max-height: min(280px, 38dvh); overflow-y: auto; }
         .claude-context-size-badge { position: sticky; top: 0; z-index: 2; width: max-content; max-width: 100%; margin: 0 0 8px auto; border: 1px solid rgba(255,255,255,0.1); background: rgba(28,28,30,0.94); border-radius: 999px; padding: 4px 9px; color: #d1d5db; font-size: 11px; font-weight: 800; box-shadow: 0 8px 18px rgba(0,0,0,0.24); }
         .claude-message { max-width: 92%; margin: 0 0 10px 0; padding: 10px 12px; border-radius: 8px; overflow-wrap: anywhere; line-height: 1.45; font-size: 14px; }
         .claude-message.user { margin-left: auto; background: rgba(0,122,255,0.24); border: 1px solid rgba(0,122,255,0.32); color: #fff; border-radius: 12px; padding-top: 7px; padding-bottom: 7px; }
@@ -321,8 +323,8 @@
             #nav-bar > div:last-child .icon-btn { min-width: 34px; min-height: 30px; padding: 5px 7px !important; }
             #input-row { padding-left: 10px; padding-right: 10px; }
             #codex-control-panel { padding-left: 8px; padding-right: 8px; }
-            .codex-control-row { grid-template-columns: repeat(6, minmax(0, 1fr)); }
-            .codex-control-row .claude-ctrl-btn { height: 36px; padding-left: 4px; padding-right: 4px; }
+            .codex-control-page { grid-template-columns: repeat(5, minmax(0, 1fr)); }
+            .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%; }
@@ -443,27 +445,33 @@
                     <div id="claude-resume-panel"></div>
                 </div>
                 <div id="codex-control-panel">
-                    <div class="codex-control-row">
-                        <label class="codex-select-control" title="Sandbox mode">
-                            <span class="codex-select-label" aria-hidden="true">Sandbox</span>
-                            <select id="codex-sandbox-select" class="codex-select" aria-label="Sandbox mode" onchange="updateCodexSettingsFromControls()">
-                                <option value="default">Default</option><option value="read-only">Read only</option><option value="workspace-write">Workspace write</option><option value="danger-full-access">Full access</option>
-                            </select>
-                        </label>
-                        <label class="codex-select-control" title="Approval policy">
-                            <span class="codex-select-label" aria-hidden="true">Ask</span>
-                            <select id="codex-permission-select" class="codex-select" aria-label="Approval policy" onchange="updateCodexSettingsFromControls()">
-                                <option value="default">Default</option><option value="untrusted">Untrusted</option><option value="on-request">On request</option><option value="never">Never ask</option>
-                            </select>
-                        </label>
-                        <button id="codex-model-btn" class="claude-ctrl-btn" onclick="toggleCodexModelPanel()" title="Model and effort">Model</button>
-                        <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>
+                    <div id="codex-control-rail" class="codex-control-rail">
+                        <div class="codex-control-page">
+                            <button id="codex-model-btn" class="claude-ctrl-btn" onclick="toggleCodexModelPanel()" title="Model and effort">Model</button>
+                            <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>
+                        </div>
+                        <div class="codex-control-page">
+                            <label class="codex-select-control" title="Sandbox mode">
+                                <span class="codex-select-label" aria-hidden="true">Sandbox</span>
+                                <select id="codex-sandbox-select" class="codex-select" aria-label="Sandbox mode" onchange="updateCodexSettingsFromControls()">
+                                    <option value="default">Default</option><option value="read-only">Read only</option><option value="workspace-write">Workspace write</option><option value="danger-full-access">Full access</option>
+                                </select>
+                            </label>
+                            <label class="codex-select-control" title="Approval policy">
+                                <span class="codex-select-label" aria-hidden="true">Ask</span>
+                                <select id="codex-permission-select" class="codex-select" aria-label="Approval policy" onchange="updateCodexSettingsFromControls()">
+                                    <option value="default">Default</option><option value="untrusted">Untrusted</option><option value="on-request">On request</option><option value="never">Never ask</option>
+                                </select>
+                            </label>
+                        </div>
                     </div>
                     <div id="codex-state-bar"></div>
                     <div id="codex-model-panel"></div>
                     <div id="codex-resume-panel"></div>
+                    <div id="codex-fork-panel"></div>
                 </div>
                 <div id="timed-send-panel">
                     <div class="timed-row">
@@ -660,6 +668,7 @@
         let codexModelPanelOpen = false;
         let codexModelCandidate = null;
         let codexResumePanelOpen = false;
+        let codexForkPanelOpen = false;
         let codexRenderFrame = null;
         const modifiers = { ctrl: false };
 
@@ -2297,6 +2306,8 @@
             if (modelButton) modelButton.textContent = 'Model';
             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);
             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();
@@ -2320,8 +2331,10 @@
         function toggleCodexModelPanel() {
             codexModelPanelOpen = !codexModelPanelOpen;
             codexResumePanelOpen = false;
+            codexForkPanelOpen = false;
             codexModelCandidate = codexState.model || codexState.models?.[0]?.id || null;
             document.getElementById('codex-resume-panel').classList.remove('active');
+            document.getElementById('codex-fork-panel').classList.remove('active');
             renderCodexModelPanel();
             updateTerminalControlsHeight();
         }
@@ -2370,11 +2383,29 @@
         async function toggleCodexResumePanel() {
             codexResumePanelOpen = !codexResumePanelOpen;
             codexModelPanelOpen = false;
+            codexForkPanelOpen = false;
             document.getElementById('codex-model-panel').classList.remove('active');
+            document.getElementById('codex-fork-panel').classList.remove('active');
             const panel = document.getElementById('codex-resume-panel');
             panel.classList.toggle('active', codexResumePanelOpen);
             updateTerminalControlsHeight();
             if (!codexResumePanelOpen) return;
+            await loadCodexThreadPanel(panel, 'resume');
+        }
+        async function toggleCodexForkPanel() {
+            if (!(codexState.presentation === 'structured' && codexState.status === 'idle' && codexState.threadId)) return;
+            codexForkPanelOpen = !codexForkPanelOpen;
+            codexModelPanelOpen = false;
+            codexResumePanelOpen = false;
+            document.getElementById('codex-model-panel').classList.remove('active');
+            document.getElementById('codex-resume-panel').classList.remove('active');
+            const panel = document.getElementById('codex-fork-panel');
+            panel.classList.toggle('active', codexForkPanelOpen);
+            updateTerminalControlsHeight();
+            if (!codexForkPanelOpen) return;
+            await loadCodexThreadPanel(panel, 'fork');
+        }
+        async function loadCodexThreadPanel(panel, action) {
             panel.innerHTML = '<div class="claude-resume-meta" style="padding:12px;">Loading sessions...</div>';
             try {
                 const res = await fetchWithTimeout(`/api/sessions/${activeSessionId}/codex-resume-threads`, {}, 30000);
@@ -2383,9 +2414,11 @@
                 const items = data.items || [];
                 panel.innerHTML = items.length ? items.map(item => {
                     const questions = Array.isArray(item.questions) ? item.questions : [];
-                    return `<button class="claude-resume-item" onclick="selectCodexResumeThread(decodePathValue('${encodePathValue(item.id)}'))"><div class="claude-resume-title"><span>${escapeHtml((questions[0] || 'Codex session').slice(0, 120))}${item.current ? ' · current' : ''}</span><span>${escapeHtml(item.updatedAt ? new Date(item.updatedAt).toLocaleString() : '')}</span></div><div class="codex-resume-question-secondary">${escapeHtml((questions[1] || '').slice(0, 120))}</div></button>`;
+                    const handler = action === 'fork' ? 'selectCodexForkThread' : 'selectCodexResumeThread';
+                    return `<button class="claude-resume-item" onclick="${handler}(decodePathValue('${encodePathValue(item.id)}'))"><div class="claude-resume-title"><span>${escapeHtml((questions[0] || 'Codex session').slice(0, 120))}${item.current ? ' · current' : ''}</span><span>${escapeHtml(item.updatedAt ? new Date(item.updatedAt).toLocaleString() : '')}</span></div><div class="codex-resume-question-secondary">${escapeHtml((questions[1] || '').slice(0, 120))}</div></button>`;
                 }).join('') : '<div class="claude-resume-meta" style="padding:12px;">No Codex sessions found for this folder.</div>';
             } catch (e) { panel.innerHTML = `<div class="claude-resume-meta" style="padding:12px;color:#ff6b61;">${escapeHtml(e.message)}</div>`; }
+            updateTerminalControlsHeight();
         }
         async function selectCodexResumeThread(threadId) {
             const res = await fetchWithTimeout(`/api/sessions/${activeSessionId}/codex-resume`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ threadId }) }, 30000);
@@ -2394,6 +2427,23 @@
             document.getElementById('codex-resume-panel').classList.remove('active');
             updateTerminalControlsHeight();
         }
+        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>';
+            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();
+            if (!res.ok || !data.success) {
+                panel.innerHTML = `<div class="claude-resume-meta" style="padding:12px;color:#ff6b61;">${escapeHtml(data.error || 'Unable to fork Codex thread')}</div>`;
+                updateTerminalControlsHeight();
+                return;
+            }
+            codexForkPanelOpen = false;
+            panel.classList.remove('active');
+            panel.innerHTML = '';
+            updateTerminalControlsHeight();
+            refreshSessionsNow();
+        }
         async function toggleCodexPresentation() {
             const presentation = codexState.presentation === 'terminal' ? 'structured' : 'terminal';
             const res = await fetchWithTimeout(`/api/sessions/${activeSessionId}/codex-presentation`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ presentation }) }, 30000);
@@ -2528,8 +2578,11 @@
             codexModelPanelOpen = false;
             codexModelCandidate = null;
             codexResumePanelOpen = false;
+            codexForkPanelOpen = false;
             document.getElementById('codex-model-panel').classList.remove('active');
             document.getElementById('codex-resume-panel').classList.remove('active');
+            document.getElementById('codex-fork-panel').classList.remove('active');
+            document.getElementById('codex-control-rail').scrollLeft = 0;
             codexState = { permissionMode: 'default', sandboxMode: 'default', effectivePermissionMode: null, effectiveSandboxMode: null, model: null, effort: null, status: 'idle', threadId: null, presentation: 'structured', models: [], canAbort: false, canSwitchToTerminal: false, canSwitchToStructured: false };
             setClaudeModeEnabled(false);
             applyCodexState(codexState);

package/package.json

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