diff --git a/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json b/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json index 9fee80a3142..ce1e5a4ab27 100644 --- a/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json +++ b/mobile/rpc-foundation/goldens/matrix-session.create-terminal-session.tabs.createterminal-1.json @@ -61,6 +61,30 @@ "sessionTabs": [], "terminals": [] }, + "3ac1092997d5": { + "name": "toast", + "ordinal": 3, + "value": { + "durationMs": 1800, + "message": "The host sent a reply this app could not read (session.tabs.createTerminal)" + } + }, + "3ad31e99d9a0": { + "name": "toast", + "ordinal": 3, + "value": { + "durationMs": 1800, + "message": "Unknown method" + } + }, + "3c6e5a949be0": { + "name": "toast", + "ordinal": 3, + "value": { + "durationMs": 1800, + "message": "outer refused" + } + }, "4694ea73188a": { "name": "session.tabs.createTerminal#1", "ordinal": 1, @@ -425,6 +449,14 @@ "startedAt": 0 } }, + "b67f7950d99d": { + "name": "toast", + "ordinal": 3, + "value": { + "durationMs": 1800, + "message": "transport failure" + } + }, "c13357779299": { "name": "subscribe-terminal", "ordinal": 5, @@ -782,7 +814,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -795,7 +827,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -808,7 +840,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -821,7 +853,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -834,7 +866,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -847,7 +879,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -860,7 +892,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -873,7 +905,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -886,7 +918,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -899,7 +931,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -912,7 +944,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -925,7 +957,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -938,7 +970,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -951,7 +983,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -964,7 +996,7 @@ "create": "eb79a9b3682a" }, "state": "76f2a4b2872b", - "effects": ["b1152db10a02"] + "effects": ["3ac1092997d5"] } }, { @@ -977,7 +1009,7 @@ "create": "eb79a9b3682a" }, "state": "2ae1c681a443", - "effects": ["b1152db10a02"] + "effects": ["3c6e5a949be0"] } }, { @@ -990,7 +1022,7 @@ "create": "eb79a9b3682a" }, "state": "2ae1c681a443", - "effects": ["b1152db10a02"] + "effects": ["3c6e5a949be0"] } }, { @@ -1003,7 +1035,7 @@ "create": "eb79a9b3682a" }, "state": "2ae1c681a443", - "effects": ["b1152db10a02"] + "effects": ["3c6e5a949be0"] } }, { @@ -1055,7 +1087,7 @@ "create": "eb79a9b3682a" }, "state": "d6dddfd9c6a4", - "effects": ["b1152db10a02"] + "effects": ["3ad31e99d9a0"] } }, { @@ -1068,7 +1100,7 @@ "create": "eb79a9b3682a" }, "state": "d6dddfd9c6a4", - "effects": ["b1152db10a02"] + "effects": ["3ad31e99d9a0"] } }, { @@ -1081,7 +1113,7 @@ "create": "eb79a9b3682a" }, "state": "d6dddfd9c6a4", - "effects": ["b1152db10a02"] + "effects": ["3ad31e99d9a0"] } }, { @@ -1094,7 +1126,7 @@ "create": "eb79a9b3682a" }, "state": "96cb96f54156", - "effects": ["b1152db10a02"] + "effects": ["b67f7950d99d"] } }, { @@ -1107,7 +1139,7 @@ "create": "eb79a9b3682a" }, "state": "96cb96f54156", - "effects": ["b1152db10a02"] + "effects": ["b67f7950d99d"] } }, { @@ -1120,7 +1152,7 @@ "create": "eb79a9b3682a" }, "state": "96cb96f54156", - "effects": ["b1152db10a02"] + "effects": ["b67f7950d99d"] } }, { diff --git a/mobile/rpc-foundation/goldens/session-create-terminal-refused.json b/mobile/rpc-foundation/goldens/session-create-terminal-refused.json index 66ff69fe2ce..f874d7b5119 100644 --- a/mobile/rpc-foundation/goldens/session-create-terminal-refused.json +++ b/mobile/rpc-foundation/goldens/session-create-terminal-refused.json @@ -72,14 +72,6 @@ "status": "pending", "startedAt": 0 }, - "b1152db10a02": { - "name": "toast", - "ordinal": 3, - "value": { - "durationMs": 1800, - "message": "Couldn't run Notes" - } - }, "b1d637072fc8": { "name": "session.tabs.createTerminal#1", "ordinal": 1, @@ -111,6 +103,14 @@ "startedAt": 0 } }, + "bacf357ed220": { + "name": "toast", + "ordinal": 3, + "value": { + "durationMs": 1800, + "message": "No pty slots left on the host" + } + }, "cce8a731064a": { "name": "session.tabs.createTerminal#1", "ordinal": 2, @@ -151,7 +151,7 @@ "create": "eb79a9b3682a" }, "state": "7853d5a23971", - "effects": ["b1152db10a02"] + "effects": ["bacf357ed220"] } } ] diff --git a/mobile/src/session/use-mobile-session-terminal-create-actions.test.ts b/mobile/src/session/use-mobile-session-terminal-create-actions.test.ts index 243252da19d..d4c1270a2dd 100644 --- a/mobile/src/session/use-mobile-session-terminal-create-actions.test.ts +++ b/mobile/src/session/use-mobile-session-terminal-create-actions.test.ts @@ -318,31 +318,40 @@ describe('mobile + Codex tab creation routing', () => { renderer = create(createElement(Harness)) }) await act(async () => { - await actions?.handleCreateTerminal() + await actions?.handleCreateTerminal(undefined, { errorToast: "Couldn't run quick command" }) }) expect(scope.setCreateError).toHaveBeenCalledWith( 'Your system cannot allocate any more pty devices.' ) + expect(scope.showToast).toHaveBeenCalledWith( + 'Your system cannot allocate any more pty devices.', + 1800 + ) }) - it('falls back to the generic message when the host gives no reason', async () => { - const client = clientReturning({ ok: false, error: { code: 'runtime_error', message: '' } }) - const scope = createScope(client) - let actions: ReturnType | undefined - function Harness() { - actions = useMobileSessionTerminalCreateActions(scope as never) - return null + it.each([undefined, "Couldn't run quick command"])( + 'falls back when the host gives no reason and errorToast is %s', + async (errorToast) => { + const client = clientReturning({ ok: false, error: { code: 'runtime_error', message: '' } }) + const scope = createScope(client) + let actions: ReturnType | undefined + function Harness() { + actions = useMobileSessionTerminalCreateActions(scope as never) + return null + } + await act(async () => { + renderer = create(createElement(Harness)) + }) + await act(async () => { + await actions?.handleCreateTerminal(undefined, { errorToast }) + }) + + const expectedReason = errorToast ?? 'Failed to create terminal' + expect(scope.setCreateError).toHaveBeenCalledWith(expectedReason) + expect(scope.showToast).toHaveBeenCalledWith(expectedReason, 1800) } - await act(async () => { - renderer = create(createElement(Harness)) - }) - await act(async () => { - await actions?.handleCreateTerminal() - }) - - expect(scope.setCreateError).toHaveBeenCalledWith('Failed to create terminal') - }) + ) }) describe('phone chat CLI fork creation owner', () => { diff --git a/mobile/src/session/use-mobile-session-terminal-create-actions.ts b/mobile/src/session/use-mobile-session-terminal-create-actions.ts index e1f7d4985df..3c72b59306f 100644 --- a/mobile/src/session/use-mobile-session-terminal-create-actions.ts +++ b/mobile/src/session/use-mobile-session-terminal-create-actions.ts @@ -109,7 +109,7 @@ export function useMobileSessionTerminalCreateActions(scope: MobileSessionAttach setCreateError(reason) // Only empty sessions show inline errors; existing tabs need toast feedback. triggerError() - showToast(options?.errorToast ?? reason, 1800) + showToast(reason, 1800) } try {