This commit is contained in:
Timothy Jaeryang Baek
2026-06-06 21:23:49 +01:00
Unverified
parent 3497f0d543
commit 91eab92e12
4 changed files with 62 additions and 34 deletions
@@ -62,9 +62,6 @@
if (rect.width === 0 || rect.height === 0) return;
try {
fitAddon.fit();
// Do NOT scroll after fit. Rich CLI apps (htop, vim, Claude Code)
// manage their own cursor/viewport after SIGWINCH. Forcing scroll
// interferes with their rendering.
} catch {
// FitAddon can throw if terminal not properly attached
}
@@ -192,6 +189,18 @@
fitAddon = new FitAddon();
term.loadAddon(fitAddon);
term.open(containerEl);
// // iOS: Move xterm's textarea from inside .xterm-helpers (position:absolute,
// // offscreen) to a flex sibling BELOW the terminal.
// if ('ontouchstart' in window && term.textarea) {
// containerEl.after(term.textarea);
// term.focus = () => term.textarea?.focus();
//
// // xterm's mousedown calls ev.preventDefault() which blocks iOS
// // viewport adjustment. Focus on touchstart (fires before mousedown).
// containerEl.addEventListener('touchstart', () => {
// term.textarea?.focus();
// }, { passive: true });
// }
// GPU-accelerated rendering, 2-5x faster than canvas 2D.
// Falls back to canvas if WebGL is unavailable.
@@ -374,7 +383,10 @@
});
</script>
<div bind:this={containerEl} class="h-full w-full pt-1 pl-2 overflow-hidden"></div>
<div class="flex flex-col h-full w-full">
<div bind:this={containerEl} class="flex-1 min-h-0 pt-1 pl-2 overflow-hidden"></div>
<!-- On mobile, xterm's textarea gets moved here as a flex sibling -->
</div>
<style>
@reference "../../app.css";
@@ -388,4 +400,23 @@
scrollbar-color: rgba(75, 85, 99, 0.4) transparent;
overscroll-behavior: contain;
}
/* When moved to flex sibling on mobile, override xterm's offscreen
positioning. Make it a real in-flow element like chat's textarea.
Use opacity:1 with transparent colors — iOS ignores opacity:0
elements for viewport adjustment. */
/* :global(.xterm-helper-textarea) {
position: relative !important;
top: auto !important;
left: auto !important;
width: 100% !important;
height: 1px !important;
opacity: 1 !important;
color: transparent !important;
background: transparent !important;
caret-color: transparent !important;
border: none !important;
outline: none !important;
resize: none !important;
flex-shrink: 0;
} */
</style>
@@ -24,7 +24,7 @@
import { socketStore } from '$lib/stores/socket.svelte';
import { onMount, onDestroy, tick } from 'svelte';
import { get } from 'svelte/store';
import { currentWorkspace, toolApprovalMode, streamingBehavior } from '$lib/stores';
import { currentWorkspace, toolApprovalMode, streamingBehavior, selectedModelId } from '$lib/stores';
import ChatInput from './ChatInput.svelte';
import UserMessage from './UserMessage.svelte';
@@ -355,11 +355,9 @@
if (chatId) loadChat(chatId);
}
const MODEL_STORAGE_KEY = 'cptr:chat:lastModel';
onMount(() => {
const models = get(chatModels);
const saved = localStorage.getItem(MODEL_STORAGE_KEY);
const saved = get(selectedModelId);
const dm = get(defaultModel);
if (saved && models.some((m) => m.id === saved)) selectedModel = saved;
else if (dm) selectedModel = dm;
@@ -397,7 +395,7 @@
// ── Persist model selection ─────────────────────────────────
$effect(() => {
if (selectedModel) localStorage.setItem(MODEL_STORAGE_KEY, selectedModel);
if (selectedModel) selectedModelId.set(selectedModel);
});
// ── Sync streaming state to shared store for tab icon ────
+8 -1
View File
@@ -74,6 +74,7 @@ export interface UserPreferences {
workspaceOrder?: string[]; // ordered paths for sidebar drag-reorder
keybindings?: Record<string, string>; // user-customised keyboard shortcuts
version?: string; // last seen app version for changelog
selectedModelId?: string; // last selected chat model, synced across browsers
}
export type Theme = 'dark' | 'light' | 'system';
@@ -138,6 +139,7 @@ export const gitReviewOpen = writable(false);
export const isGitRepo = writable(false);
export type StreamingBehavior = 'queue' | 'interrupt';
export const streamingBehavior = writable<StreamingBehavior>('queue');
export const selectedModelId = writable<string>('');
/** Saved workspace path order for sidebar drag-reorder. */
export const workspaceOrder = writable<string[]>([]);
@@ -269,7 +271,8 @@ function persistPreferences(): void {
locale: i18next.language,
workspaceOrder: get(workspaceOrder),
keybindings: get(keybindings),
version: get(lastSeenVersion)
version: get(lastSeenVersion),
selectedModelId: get(selectedModelId) || undefined
};
savePreferences(prefs as unknown as Record<string, unknown>).catch(() => {});
}, 300);
@@ -303,6 +306,9 @@ function subscribeForPersistence() {
lastSeenVersion.subscribe(() => {
if (get(stateLoaded)) persistPreferences();
});
selectedModelId.subscribe(() => {
if (get(stateLoaded)) persistPreferences();
});
i18next.on('languageChanged', () => {
if (get(stateLoaded)) persistPreferences();
});
@@ -327,6 +333,7 @@ export async function loadPreferences(): Promise<void> {
if (Array.isArray(prefs.workspaceOrder)) workspaceOrder.set(prefs.workspaceOrder as string[]);
if (prefs.keybindings) loadKeybindings(prefs.keybindings as Record<string, string>);
if (prefs.version) lastSeenVersion.set(prefs.version as string);
if (prefs.selectedModelId) selectedModelId.set(prefs.selectedModelId as string);
} catch {
// First run, no preferences yet
}
+16 -24
View File
@@ -38,7 +38,6 @@
let { children } = $props();
let showQuickOpen = $state(false);
let showSettings = $state(false);
let terminalVvHeight = $state('');
// Auth state
type AuthState = 'checking' | 'needs_setup' | 'needs_login' | 'authenticated';
@@ -65,37 +64,31 @@
},
30 * 60 * 1000
);
// Terminal needs a JS height override because xterm uses a hidden
// textarea that doesn't trigger interactive-widget=resizes-content.
// Chat and other tabs use pure CSS (dvh) — no JS needed.
// iOS: Termius-style keyboard handling. visualViewport.height
// gives us the area above the keyboard. Set max-height on the
// main content column so the terminal shrinks to fit.
// The layout container's overflow:hidden clips the gap.
const vv = window.visualViewport;
let vpTimer: ReturnType<typeof setTimeout>;
if (vv) {
const update = () => {
clearTimeout(vpTimer);
vpTimer = setTimeout(() => {
const keyboardHeight = window.innerHeight - vv.height;
terminalVvHeight = keyboardHeight > 100 ? `${vv.height}px` : '';
}, 350);
const syncHeight = () => {
const col = document.getElementById('main-col');
if (!col) return;
const kbHeight = window.innerHeight - vv.height;
console.log('[viewport]', { innerHeight: window.innerHeight, vvHeight: vv.height, kbHeight });
col.style.maxHeight = kbHeight > 100 ? `${vv.height}px` : '';
};
vv.addEventListener('resize', update);
// iOS may fire 'scroll' instead of 'resize' when keyboard opens
vv.addEventListener('resize', syncHeight);
vv.addEventListener('scroll', syncHeight);
return () => {
clearTimeout(vpTimer);
clearInterval(healthCheck);
vv.removeEventListener('resize', update);
vv.removeEventListener('resize', syncHeight);
vv.removeEventListener('scroll', syncHeight);
};
}
return () => clearInterval(healthCheck);
});
// Only apply JS pixel height for terminal tabs; everything else uses CSS dvh.
const appHeight = $derived(
$activeTab?.type === 'terminal' && terminalVvHeight ? terminalVvHeight : ''
);
let startupToken = $state('');
$effect(() => {
@@ -256,11 +249,10 @@
{:else if $stateLoaded}
<div
class="h-screen max-h-[100dvh] flex overflow-hidden font-sans antialiased text-gray-900 bg-white dark:text-gray-100 dark:bg-black"
style={appHeight ? `height:${appHeight};` : ''}
>
<Sidebar />
<div class="flex flex-col flex-1 min-w-0 min-h-0 overflow-hidden">
<div id="main-col" class="flex flex-col flex-1 min-w-0 min-h-0 overflow-hidden">
{#if !$currentWorkspace}
<Bar />
{/if}