History

[codex] fix terminal dimension validation (#2411)

Julius Marminge committed 6 months ago

Commit 02903f21 parent 22b7d8c2 files · +16 −5Browse files

Unified · Split

2 files
  1. packages/contracts/src/terminal.test.ts +12 −1
  2. packages/contracts/src/terminal.ts +4 −4
packages/contracts/src/terminal.test.ts+12−1
@@ -38,13 +38,24 @@ describe("TerminalOpenInput", () => { · 37 unmodified lines
38 ).toBe(true);38 ).toBe(true);
39 });39 });
40 40
41 it("accepts ultrawide terminal dimensions from xterm fit", () => {
42 expect(
43 decodes(TerminalOpenInput, {
44 threadId: "thread-1",
45 cwd: "/tmp/project",
46 cols: 423,
47 rows: 40,
48 }),
49 ).toBe(true);
50 });
51
41 it("rejects invalid bounds", () => {52 it("rejects invalid bounds", () => {
42 expect(53 expect(
43 decodes(TerminalOpenInput, {54 decodes(TerminalOpenInput, {
44 threadId: "thread-1",55 threadId: "thread-1",
45 cwd: "/tmp/project",56 cwd: "/tmp/project",
46 cols: 10,57 cols: 10,
47 rows: 2,58 rows: 0,
48 }),59 }),
49 ).toBe(false);60 ).toBe(false);
50 });61 });
packages/contracts/src/terminal.ts+4−4
@@ -4,11 +4,11 @@ import { TrimmedNonEmptyString } from "./baseSchemas.ts"; · 3 unmodified lines
4export const DEFAULT_TERMINAL_ID = "default";4export const DEFAULT_TERMINAL_ID = "default";
5 5
6const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;6const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;
7const TerminalColsSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(20)).check(7const TerminalColsSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)).check(
8 Schema.isLessThanOrEqualTo(400),8 Schema.isLessThanOrEqualTo(1000),
9);9);
10const TerminalRowsSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(5)).check(10const TerminalRowsSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)).check(
11 Schema.isLessThanOrEqualTo(200),11 Schema.isLessThanOrEqualTo(500),
12);12);
13const TerminalIdSchema = TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(128));13const TerminalIdSchema = TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(128));
14const TerminalEnvKeySchema = Schema.String.check(14const TerminalEnvKeySchema = Schema.String.check(

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t