authorgravatar for julius0216@outlook.comJulius Marminge <julius0216@outlook.com> 2026-02-17 23:19:28-08:00
committergravatar for jmarminge@gmail.comJulius Marminge <jmarminge@gmail.com> 2026-02-18 00:59:06-08:00
log1a94fcbd294ab69709a3895b30941537d415764a
tree5f5f9f63e636362739ccc0288b886f02f3d1a9ed
parented40fd3364b7bb575f55ddf07475e7689a037a32

Handle optional terminal dimensions and preserve active terminal size

- make `cols`/`rows` optional in terminal open contracts - default new/restarted sessions to 120x30 when size hints are missing - reuse existing terminal dimensions unless a new size is explicitly requested - only send script terminal size hints when creating a new terminal

4 files changed, 92 insertions(+), 16 deletions(-)

apps/server/src/terminalManager.test.ts+59
...@@ -196,6 +196,65 @@ describe("TerminalManager", () => {...@@ -196,6 +196,65 @@ describe("TerminalManager", () => {
196 manager.dispose();196 manager.dispose();
197 });197 });
198198
199 it("resizes running terminal on open when a different size is requested", async () => {
200 const { manager, ptyAdapter } = makeManager();
201 await manager.open(openInput({ cols: 100, rows: 24 }));
202 const process = ptyAdapter.processes[0];
203 expect(process).toBeDefined();
204 if (!process) return;
205
206 await manager.open(openInput({ cols: 140, rows: 40 }));
207
208 expect(process.resizeCalls).toEqual([{ cols: 140, rows: 40 }]);
209
210 manager.dispose();
211 });
212
213 it("preserves existing terminal size on open when size is omitted", async () => {
214 const { manager, ptyAdapter } = makeManager();
215 await manager.open(openInput({ cols: 100, rows: 24 }));
216 const ptyProcess = ptyAdapter.processes[0];
217 expect(ptyProcess).toBeDefined();
218 if (!ptyProcess) return;
219
220 await manager.open({
221 threadId: "thread-1",
222 cwd: globalThis.process.cwd(),
223 });
224
225 expect(ptyProcess.resizeCalls).toEqual([]);
226
227 ptyProcess.emitExit({ exitCode: 0, signal: 0 });
228 await manager.open({
229 threadId: "thread-1",
230 cwd: globalThis.process.cwd(),
231 });
232
233 const resumedSpawn = ptyAdapter.spawnInputs[1];
234 expect(resumedSpawn).toBeDefined();
235 if (!resumedSpawn) return;
236 expect(resumedSpawn.cols).toBe(100);
237 expect(resumedSpawn.rows).toBe(24);
238
239 manager.dispose();
240 });
241
242 it("uses default dimensions when opening a new terminal without size hints", async () => {
243 const { manager, ptyAdapter } = makeManager();
244 await manager.open({
245 threadId: "thread-1",
246 cwd: process.cwd(),
247 });
248
249 const spawned = ptyAdapter.spawnInputs[0];
250 expect(spawned).toBeDefined();
251 if (!spawned) return;
252 expect(spawned.cols).toBe(120);
253 expect(spawned.rows).toBe(30);
254
255 manager.dispose();
256 });
257
199 it("supports multiple terminals per thread with isolated sessions", async () => {258 it("supports multiple terminals per thread with isolated sessions", async () => {
200 const { manager, ptyAdapter } = makeManager();259 const { manager, ptyAdapter } = makeManager();
201 await manager.open(openInput({ terminalId: "default" }));260 await manager.open(openInput({ terminalId: "default" }));
apps/server/src/terminalManager.ts+25-12
...@@ -26,6 +26,8 @@ import { runProcess } from "./processRunner";...@@ -26,6 +26,8 @@ import { runProcess } from "./processRunner";
26const DEFAULT_HISTORY_LINE_LIMIT = 5_000;26const DEFAULT_HISTORY_LINE_LIMIT = 5_000;
27const DEFAULT_PERSIST_DEBOUNCE_MS = 40;27const DEFAULT_PERSIST_DEBOUNCE_MS = 40;
28const DEFAULT_SUBPROCESS_POLL_INTERVAL_MS = 1_000;28const DEFAULT_SUBPROCESS_POLL_INTERVAL_MS = 1_000;
29const DEFAULT_OPEN_COLS = 120;
30const DEFAULT_OPEN_ROWS = 30;
29const TERMINAL_ENV_BLOCKLIST = new Set(["PORT", "ELECTRON_RENDERER_PORT", "ELECTRON_RUN_AS_NODE"]);31const TERMINAL_ENV_BLOCKLIST = new Set(["PORT", "ELECTRON_RENDERER_PORT", "ELECTRON_RUN_AS_NODE"]);
3032
31type TerminalSubprocessChecker = (terminalPid: number) => Promise<boolean>;33type TerminalSubprocessChecker = (terminalPid: number) => Promise<boolean>;
...@@ -67,6 +69,8 @@ interface ShellCandidate {...@@ -67,6 +69,8 @@ interface ShellCandidate {
67 args?: string[];69 args?: string[];
68}70}
6971
72type TerminalStartInput = TerminalOpenInput & { cols: number; rows: number };
73
70function defaultShellResolver(): string {74function defaultShellResolver(): string {
71 if (process.platform === "win32") {75 if (process.platform === "win32") {
72 return process.env.ComSpec ?? "cmd.exe";76 return process.env.ComSpec ?? "cmd.exe";
...@@ -334,6 +338,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -334,6 +338,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
334 if (!existing) {338 if (!existing) {
335 await this.flushPersistQueue(input.threadId, input.terminalId);339 await this.flushPersistQueue(input.threadId, input.terminalId);
336 const history = await this.readHistory(input.threadId, input.terminalId);340 const history = await this.readHistory(input.threadId, input.terminalId);
341 const cols = input.cols ?? DEFAULT_OPEN_COLS;
342 const rows = input.rows ?? DEFAULT_OPEN_ROWS;
337 const session: TerminalSessionState = {343 const session: TerminalSessionState = {
338 threadId: input.threadId,344 threadId: input.threadId,
339 terminalId: input.terminalId,345 terminalId: input.terminalId,
...@@ -344,8 +350,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -344,8 +350,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
344 exitCode: null,350 exitCode: null,
345 exitSignal: null,351 exitSignal: null,
346 updatedAt: new Date().toISOString(),352 updatedAt: new Date().toISOString(),
347 cols: input.cols,353 cols,
348 rows: input.rows,354 rows,
349 process: null,355 process: null,
350 unsubscribeData: null,356 unsubscribeData: null,
351 unsubscribeExit: null,357 unsubscribeExit: null,
...@@ -353,12 +359,14 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -353,12 +359,14 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
353 runtimeEnv: normalizedRuntimeEnv(input.env),359 runtimeEnv: normalizedRuntimeEnv(input.env),
354 };360 };
355 this.sessions.set(sessionKey, session);361 this.sessions.set(sessionKey, session);
356 this.startSession(session, input, "started");362 this.startSession(session, { ...input, cols, rows }, "started");
357 return this.snapshot(session);363 return this.snapshot(session);
358 }364 }
359365
360 const nextRuntimeEnv = normalizedRuntimeEnv(input.env);366 const nextRuntimeEnv = normalizedRuntimeEnv(input.env);
361 const currentRuntimeEnv = existing.runtimeEnv;367 const currentRuntimeEnv = existing.runtimeEnv;
368 const targetCols = input.cols ?? existing.cols;
369 const targetRows = input.rows ?? existing.rows;
362 const runtimeEnvChanged =370 const runtimeEnvChanged =
363 JSON.stringify(currentRuntimeEnv) !== JSON.stringify(nextRuntimeEnv);371 JSON.stringify(currentRuntimeEnv) !== JSON.stringify(nextRuntimeEnv);
364372
...@@ -377,14 +385,14 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -377,14 +385,14 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
377 }385 }
378386
379 if (!existing.process) {387 if (!existing.process) {
380 this.startSession(existing, input, "started");388 this.startSession(existing, { ...input, cols: targetCols, rows: targetRows }, "started");
381 return this.snapshot(existing);389 return this.snapshot(existing);
382 }390 }
383391
384 if (existing.cols !== input.cols || existing.rows !== input.rows) {392 if (existing.cols !== targetCols || existing.rows !== targetRows) {
385 existing.cols = input.cols;393 existing.cols = targetCols;
386 existing.rows = input.rows;394 existing.rows = targetRows;
387 existing.process.resize(input.cols, input.rows);395 existing.process.resize(targetCols, targetRows);
388 existing.updatedAt = new Date().toISOString();396 existing.updatedAt = new Date().toISOString();
389 }397 }
390398
...@@ -441,6 +449,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -441,6 +449,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
441 const sessionKey = toSessionKey(input.threadId, input.terminalId);449 const sessionKey = toSessionKey(input.threadId, input.terminalId);
442 let session = this.sessions.get(sessionKey);450 let session = this.sessions.get(sessionKey);
443 if (!session) {451 if (!session) {
452 const cols = input.cols ?? DEFAULT_OPEN_COLS;
453 const rows = input.rows ?? DEFAULT_OPEN_ROWS;
444 session = {454 session = {
445 threadId: input.threadId,455 threadId: input.threadId,
446 terminalId: input.terminalId,456 terminalId: input.terminalId,
...@@ -451,8 +461,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -451,8 +461,8 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
451 exitCode: null,461 exitCode: null,
452 exitSignal: null,462 exitSignal: null,
453 updatedAt: new Date().toISOString(),463 updatedAt: new Date().toISOString(),
454 cols: input.cols,464 cols,
455 rows: input.rows,465 rows,
456 process: null,466 process: null,
457 unsubscribeData: null,467 unsubscribeData: null,
458 unsubscribeExit: null,468 unsubscribeExit: null,
...@@ -466,9 +476,12 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -466,9 +476,12 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
466 session.runtimeEnv = normalizedRuntimeEnv(input.env);476 session.runtimeEnv = normalizedRuntimeEnv(input.env);
467 }477 }
468478
479 const cols = input.cols ?? session.cols;
480 const rows = input.rows ?? session.rows;
481
469 session.history = "";482 session.history = "";
470 await this.persistHistory(input.threadId, input.terminalId, session.history);483 await this.persistHistory(input.threadId, input.terminalId, session.history);
471 this.startSession(session, input, "restarted");484 this.startSession(session, { ...input, cols, rows }, "restarted");
472 return this.snapshot(session);485 return this.snapshot(session);
473 });486 });
474 }487 }
...@@ -517,7 +530,7 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {...@@ -517,7 +530,7 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
517530
518 private startSession(531 private startSession(
519 session: TerminalSessionState,532 session: TerminalSessionState,
520 input: TerminalOpenInput,533 input: TerminalStartInput,
521 eventType: "started" | "restarted",534 eventType: "started" | "restarted",
522 ): void {535 ): void {
523 this.stopProcess(session);536 this.stopProcess(session);
apps/web/src/components/ChatView.tsx+6-2
...@@ -725,9 +725,13 @@ export default function ChatView() {...@@ -725,9 +725,13 @@ export default function ChatView() {
725 threadId: activeThreadId,725 threadId: activeThreadId,
726 terminalId: targetTerminalId,726 terminalId: targetTerminalId,
727 cwd: targetCwd,727 cwd: targetCwd,
728 cols: SCRIPT_TERMINAL_COLS,
729 rows: SCRIPT_TERMINAL_ROWS,
730 env: runtimeEnv,728 env: runtimeEnv,
729 ...(shouldCreateNewTerminal
730 ? {
731 cols: SCRIPT_TERMINAL_COLS,
732 rows: SCRIPT_TERMINAL_ROWS,
733 }
734 : {}),
731 });735 });
732 await api.terminal.write({736 await api.terminal.write({
733 threadId: activeThreadId,737 threadId: activeThreadId,
packages/contracts/src/terminal.ts+2-2
...@@ -21,8 +21,8 @@ export const terminalSessionInputSchema = terminalThreadInputSchema.extend({...@@ -21,8 +21,8 @@ export const terminalSessionInputSchema = terminalThreadInputSchema.extend({
2121
22export const terminalOpenInputSchema = terminalSessionInputSchema.extend({22export const terminalOpenInputSchema = terminalSessionInputSchema.extend({
23 cwd: z.string().trim().min(1),23 cwd: z.string().trim().min(1),
24 cols: terminalColsSchema,24 cols: terminalColsSchema.optional(),
25 rows: terminalRowsSchema,25 rows: terminalRowsSchema.optional(),
26 env: terminalEnvSchema.optional(),26 env: terminalEnvSchema.optional(),
27});27});
2828