diff --git a/packages/cli-rs/parity/fixtures/E.11a/session-list.app.json b/packages/cli-rs/parity/fixtures/E.11a/session-list.app.json index b98931b437c..8e603d93ee4 100644 --- a/packages/cli-rs/parity/fixtures/E.11a/session-list.app.json +++ b/packages/cli-rs/parity/fixtures/E.11a/session-list.app.json @@ -74,11 +74,11 @@ "until": "Ask anything", "masks": [ { - "x": 0, - "y": 0, - "width": 100, - "height": 30, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" + "x": 16, + "y": 16, + "width": 84, + "height": 1, + "reason": "the placeholder: random in TS, not drawn yet in Rust (T17-home-prompt)" } ], "fixture": "E.11a/session-list/home" @@ -92,36 +92,6 @@ { "checkpoint": "list", "until": "Write docs", - "masks": [ - { - "x": 0, - "y": 0, - "width": 100, - "height": 8, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 0, - "y": 19, - "width": 100, - "height": 11, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 0, - "y": 8, - "width": 6, - "height": 11, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 94, - "y": 8, - "width": 6, - "height": 11, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - } - ], "fixture": "E.11a/session-list/list" }, { @@ -132,36 +102,6 @@ { "checkpoint": "marked", "until": "again to confirm", - "masks": [ - { - "x": 0, - "y": 0, - "width": 100, - "height": 8, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 0, - "y": 19, - "width": 100, - "height": 11, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 0, - "y": 8, - "width": 6, - "height": 11, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 94, - "y": 8, - "width": 6, - "height": 11, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - } - ], "fixture": "E.11a/session-list/marked" }, { @@ -172,36 +112,6 @@ { "checkpoint": "deleted", "until": "delete ctrl+d", - "masks": [ - { - "x": 0, - "y": 0, - "width": 100, - "height": 8, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 0, - "y": 18, - "width": 100, - "height": 12, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 0, - "y": 8, - "width": 6, - "height": 10, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - }, - { - "x": 94, - "y": 8, - "width": 6, - "height": 10, - "reason": "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" - } - ], "fixture": "E.11a/session-list/deleted" } ], diff --git a/packages/cli-rs/parity/fixtures/E.11a/session-list/deleted.json b/packages/cli-rs/parity/fixtures/E.11a/session-list/deleted.json index 6e9e634e903..9fbaedccbdb 100644 --- a/packages/cli-rs/parity/fixtures/E.11a/session-list/deleted.json +++ b/packages/cli-rs/parity/fixtures/E.11a/session-list/deleted.json @@ -20,6 +20,9 @@ " all projects ctrl+a delete ctrl+d rename ctrl+r ", " ", " ┃ ", + " ┃ ", + " ╹▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ", + " /tmp/opencode/packages/tui:main shift+tab agents ctrl+p commands ", " ", " ", " ", @@ -27,14 +30,11 @@ " ", " ", " ", - " ", - " ", - " ", - " ", + " test ", " " ], "styles": [ - "#00000000 #00000000 0", + "#ffffffff #040404ff 0", "#ffffffff #141414ff 0", "#808080ff #141414ff 0", "#808080ff #141414ff 1", @@ -44,9 +44,11 @@ "#ffffffff #1e1e1eff 0", "#eeeeeeff #1e1e1eff 0", "#808080ff #1e1e1eff 0", - "#ffffffff #040404ff 0", "#1e1e1eff #040404ff 0", - "#ffffffff #0c0c0cff 0" + "#ffffffff #0c0c0cff 0", + "#0c0c0cff #040404ff 0", + "#353535ff #040404ff 0", + "#626262ff #040404ff 0" ], "runs": [ [[0,100]], @@ -66,11 +68,10 @@ [[0,6],[7,88],[0,6]], [[0,6],[7,4],[8,12],[9,7],[7,32],[8,6],[9,7],[7,3],[8,6],[9,7],[7,4],[0,6]], [[0,6],[7,88],[0,6]], - [[0,6],[10,7],[11,1],[12,74],[10,6],[0,6]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], + [[0,13],[10,1],[11,74],[0,12]], + [[0,13],[10,1],[11,74],[0,12]], + [[0,13],[10,1],[12,74],[0,12]], + [[0,13],[13,31],[0,11],[14,9],[0,1],[13,6],[0,2],[14,6],[0,1],[13,8],[0,12]], [[0,100]], [[0,100]], [[0,100]], @@ -78,6 +79,7 @@ [[0,100]], [[0,100]], [[0,100]], + [[0,94],[13,4],[0,2]], [[0,100]] ] } diff --git a/packages/cli-rs/parity/fixtures/E.11a/session-list/home.json b/packages/cli-rs/parity/fixtures/E.11a/session-list/home.json index c4f16c64833..cf865f7f42e 100644 --- a/packages/cli-rs/parity/fixtures/E.11a/session-list/home.json +++ b/packages/cli-rs/parity/fixtures/E.11a/session-list/home.json @@ -11,6 +11,18 @@ " ", " ", " ", + " ▄ ", + " █▀▀█ █▀▀█ █▀▀█ █▀▀▄ █▀▀▀ █▀▀█ █▀▀█ █▀▀█ ", + " █ █ █ █ █▀▀▀ █ █ █ █ █ █ █ █▀▀▀ ", + " ▀▀▀▀ █▀▀▀ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀ ", + " ", + " ", + " ┃ ", + " ┃ ", + " ┃ ", + " ┃ ", + " ╹▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ", + " /tmp/opencode/packages/tui:main shift+tab agents ctrl+p commands ", " ", " ", " ", @@ -18,23 +30,21 @@ " ", " ", " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", + " test ", " " ], "styles": [ - "#00000000 #00000000 0" + "#ffffffff #0a0a0aff 0", + "#808080ff #0a0a0aff 0", + "#eeeeeeff #0a0a0aff 1", + "#808080ff #282828ff 0", + "#eeeeeeff #434343ff 1", + "#282828ff #0a0a0aff 0", + "#484848ff #0a0a0aff 0", + "#ffffffff #1e1e1eff 0", + "#00000000 #00000000 0", + "#1e1e1eff #0a0a0aff 0", + "#eeeeeeff #0a0a0aff 0" ], "runs": [ [[0,100]], @@ -46,6 +56,18 @@ [[0,100]], [[0,100]], [[0,100]], + [[0,31],[1,19],[0,1],[2,19],[0,30]], + [[0,31],[1,19],[0,1],[2,19],[0,30]], + [[0,31],[1,1],[3,2],[1,3],[3,2],[1,3],[3,3],[1,2],[3,2],[1,1],[0,1],[2,1],[4,3],[2,2],[4,2],[2,3],[4,2],[2,3],[4,3],[0,30]], + [[0,31],[1,16],[5,2],[1,1],[0,1],[2,19],[0,30]], + [[0,100]], + [[0,100]], + [[0,13],[6,1],[7,74],[0,12]], + [[0,13],[6,1],[7,2],[8,84]], + [[0,13],[6,1],[7,74],[0,12]], + [[0,13],[6,1],[7,74],[0,12]], + [[0,13],[6,1],[9,74],[0,12]], + [[0,13],[1,31],[0,11],[10,10],[1,6],[0,2],[10,7],[1,8],[0,12]], [[0,100]], [[0,100]], [[0,100]], @@ -53,19 +75,7 @@ [[0,100]], [[0,100]], [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], - [[0,100]], + [[0,94],[1,4],[0,2]], [[0,100]] ] } diff --git a/packages/cli-rs/parity/fixtures/E.11a/session-list/list.json b/packages/cli-rs/parity/fixtures/E.11a/session-list/list.json index 4e48394de71..8aadbce8ac2 100644 --- a/packages/cli-rs/parity/fixtures/E.11a/session-list/list.json +++ b/packages/cli-rs/parity/fixtures/E.11a/session-list/list.json @@ -21,6 +21,8 @@ " all projects ctrl+a delete ctrl+d rename ctrl+r ", " ", " ┃ ", + " ╹▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ", + " /tmp/opencode/packages/tui:main shift+tab agents ctrl+p commands ", " ", " ", " ", @@ -28,13 +30,11 @@ " ", " ", " ", - " ", - " ", - " ", + " test ", " " ], "styles": [ - "#00000000 #00000000 0", + "#ffffffff #040404ff 0", "#ffffffff #141414ff 0", "#808080ff #141414ff 0", "#808080ff #141414ff 1", @@ -45,9 +45,11 @@ "#ffffffff #1e1e1eff 0", "#eeeeeeff #1e1e1eff 0", "#808080ff #1e1e1eff 0", - "#ffffffff #040404ff 0", "#1e1e1eff #040404ff 0", - "#ffffffff #0c0c0cff 0" + "#ffffffff #0c0c0cff 0", + "#0c0c0cff #040404ff 0", + "#353535ff #040404ff 0", + "#626262ff #040404ff 0" ], "runs": [ [[0,100]], @@ -68,10 +70,9 @@ [[0,6],[8,88],[0,6]], [[0,6],[8,4],[9,12],[10,7],[8,32],[9,6],[10,7],[8,3],[9,6],[10,7],[8,4],[0,6]], [[0,6],[8,88],[0,6]], - [[0,6],[11,7],[12,1],[13,74],[11,6],[0,6]], - [[0,100]], - [[0,100]], - [[0,100]], + [[0,13],[11,1],[12,74],[0,12]], + [[0,13],[11,1],[13,74],[0,12]], + [[0,13],[14,31],[0,11],[15,9],[0,1],[14,6],[0,2],[15,6],[0,1],[14,8],[0,12]], [[0,100]], [[0,100]], [[0,100]], @@ -79,6 +80,7 @@ [[0,100]], [[0,100]], [[0,100]], + [[0,94],[14,4],[0,2]], [[0,100]] ] } diff --git a/packages/cli-rs/parity/fixtures/E.11a/session-list/marked.json b/packages/cli-rs/parity/fixtures/E.11a/session-list/marked.json index e0476418481..a480861eb6c 100644 --- a/packages/cli-rs/parity/fixtures/E.11a/session-list/marked.json +++ b/packages/cli-rs/parity/fixtures/E.11a/session-list/marked.json @@ -21,6 +21,8 @@ " all projects ctrl+a delete ctrl+d rename ctrl+r ", " ", " ┃ ", + " ╹▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ", + " /tmp/opencode/packages/tui:main shift+tab agents ctrl+p commands ", " ", " ", " ", @@ -28,13 +30,11 @@ " ", " ", " ", - " ", - " ", - " ", + " test ", " " ], "styles": [ - "#00000000 #00000000 0", + "#ffffffff #040404ff 0", "#ffffffff #141414ff 0", "#808080ff #141414ff 0", "#808080ff #141414ff 1", @@ -45,9 +45,11 @@ "#ffffffff #1e1e1eff 0", "#eeeeeeff #1e1e1eff 0", "#808080ff #1e1e1eff 0", - "#ffffffff #040404ff 0", "#1e1e1eff #040404ff 0", - "#ffffffff #0c0c0cff 0" + "#ffffffff #0c0c0cff 0", + "#0c0c0cff #040404ff 0", + "#353535ff #040404ff 0", + "#626262ff #040404ff 0" ], "runs": [ [[0,100]], @@ -68,10 +70,9 @@ [[0,6],[8,88],[0,6]], [[0,6],[8,4],[9,12],[10,7],[8,32],[9,6],[10,7],[8,3],[9,6],[10,7],[8,4],[0,6]], [[0,6],[8,88],[0,6]], - [[0,6],[11,7],[12,1],[13,74],[11,6],[0,6]], - [[0,100]], - [[0,100]], - [[0,100]], + [[0,13],[11,1],[12,74],[0,12]], + [[0,13],[11,1],[13,74],[0,12]], + [[0,13],[14,31],[0,11],[15,9],[0,1],[14,6],[0,2],[15,6],[0,1],[14,8],[0,12]], [[0,100]], [[0,100]], [[0,100]], @@ -79,6 +80,7 @@ [[0,100]], [[0,100]], [[0,100]], + [[0,94],[14,4],[0,2]], [[0,100]] ] } diff --git a/packages/cli-rs/parity/scenarios/E.11a/session-list.app.ts b/packages/cli-rs/parity/scenarios/E.11a/session-list.app.ts index 5bf76b3fd70..66170592606 100644 --- a/packages/cli-rs/parity/scenarios/E.11a/session-list.app.ts +++ b/packages/cli-rs/parity/scenarios/E.11a/session-list.app.ts @@ -1,17 +1,14 @@ // The session list over the home (DLG16): opened with l, the first delete press marks the row, the -// second deletes the session. The masks keep the comparison to the dialog panel (x 6-93, y 8-18 at 100x30): -// the home's prompt behind it is E.2's (T17-home-prompt). +// second deletes the session. The whole screen is compared except the home placeholder row. import { defineApp, session } from "../../lib/app" -const reason = "outside the dialog panel: the home prompt behind it differs (T17-home-prompt)" -// The panel's rows: 11 with two sessions, 10 once one is deleted. -const panel = (rows: number) => [ - { x: 0, y: 0, width: 100, height: 8, reason }, - { x: 0, y: 8 + rows, width: 100, height: 22 - rows, reason }, - { x: 0, y: 8, width: 6, height: rows, reason }, - { x: 94, y: 8, width: 6, height: rows, reason }, -] -const masks = panel(11) +const placeholder = { + x: 16, + y: 16, + width: 84, + height: 1, + reason: "the placeholder: random in TS, not drawn yet in Rust (T17-home-prompt)", +} export default defineApp({ routes: [ @@ -25,12 +22,12 @@ export default defineApp({ { method: "DELETE", path: "/api/session/ses_b" }, ], steps: [ - { checkpoint: "home", until: "Ask anything", masks: [{ x: 0, y: 0, width: 100, height: 30, reason }] }, + { checkpoint: "home", until: "Ask anything", masks: [placeholder] }, { keys: ["ctrl+x", "l"] }, - { checkpoint: "list", until: "Write docs", masks }, + { checkpoint: "list", until: "Write docs" }, { keys: ["ctrl+d"] }, - { checkpoint: "marked", until: "again to confirm", masks }, + { checkpoint: "marked", until: "again to confirm" }, { keys: ["ctrl+d"] }, - { checkpoint: "deleted", until: "delete ctrl+d", masks: panel(10) }, + { checkpoint: "deleted", until: "delete ctrl+d" }, ], })