naps62/maestro
Archived
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: naps62/maestro:android-app/269-spawn-form
Branches Tags
naps62/maestro:main naps62/maestro:chorale naps62/maestro:upbeat naps62/maestro:tritone-2 naps62/maestro:fermata-4 naps62/maestro:android-app/271-theme-apk naps62/maestro:blitz/android-app naps62/maestro:android-app/270-command-bar naps62/maestro:android-app/268-app-shell naps62/maestro:android-app/267-structured naps62/maestro:android-app/266-terminal naps62/maestro:android-app/269-spawn-form naps62/maestro:android-app/265-sidebar naps62/maestro:android-app/264-daemon-connection naps62/maestro:android-app/263-api-client naps62/maestro:android-app/262-project-scaffold naps62/maestro:rhapsody naps62/maestro:dominant-2 naps62/maestro:animato-2 naps62/maestro:glockenspiel naps62/maestro:septet naps62/maestro:mandolin naps62/maestro:chord naps62/maestro:timbre-2 naps62/maestro:aeolian naps62/maestro:cello-2 naps62/maestro:allegro naps62/maestro:lento naps62/maestro:lyre naps62/maestro:maestoso naps62/maestro:cadence-3 naps62/maestro:modulation-2 naps62/maestro:modulation naps62/maestro:xylophone-2 naps62/maestro:tuba-2 naps62/maestro:piccolo-2 naps62/maestro:grazioso-2 naps62/maestro:grazioso naps62/maestro:hymn naps62/maestro:xylophone naps62/maestro:blitz/react-tailwind-migration naps62/maestro:254-design-kit-react naps62/maestro:253-delete-vanilla-wire-react naps62/maestro:issue/252-tests-rtl naps62/maestro:issue/242-daemon-link-react naps62/maestro:issue/240-types-api-router naps62/maestro:issue/251-preview-mode-react naps62/maestro:issue/250-dialogs-drawer-react naps62/maestro:issue/249-layout-system-react naps62/maestro:247-command-bar-react naps62/maestro:issue/248-spawn-dialog-react naps62/maestro:246-structured-pane-react naps62/maestro:issue/245-terminal-pane-react naps62/maestro:244-sidebar-react naps62/maestro:issue/243-theme-tokens-tailwind naps62/maestro:issue/241-catalog-connection-zustand naps62/maestro:issue/239-scaffold-react-tailwind naps62/maestro:timpani naps62/maestro:staccato-2 naps62/maestro:trombone-2 naps62/maestro:grave-2 naps62/maestro:harpsichord-2 naps62/maestro:recorder-4 naps62/maestro:vivace naps62/maestro:sotto naps62/maestro:tuba naps62/maestro:chaconne naps62/maestro:etude naps62/maestro:arpeggio naps62/maestro:harpsichord naps62/maestro:cadence-2 naps62/maestro:brillante naps62/maestro:clarinet naps62/maestro:snare-2 naps62/maestro:staccato naps62/maestro:recorder-2 naps62/maestro:tritone naps62/maestro:balalaika naps62/maestro:timbre naps62/maestro:violin naps62/maestro:fix/web-nix-build naps62/maestro:blitz/codex-structured-sessions naps62/maestro:codex-structured-sessions/203-tui-spawn naps62/maestro:codex-structured-sessions/202-web-spawn naps62/maestro:codex-structured-sessions/201-codex-lifecycle naps62/maestro:codex-structured-sessions/200-select-acp-adapter naps62/maestro:blitz/structured-view naps62/maestro:vivo naps62/maestro:structured-view/199-command-resolution naps62/maestro:structured-view/198-viewport naps62/maestro:structured-view/197-lock-order naps62/maestro:structured-view/196-concurrent-handshakes naps62/maestro:structured-view/195-autoscroll naps62/maestro:structured-view/194-plan-row naps62/maestro:structured-view/193-expanded-reconnect naps62/maestro:structured-view/192-pty-gate naps62/maestro:structured-view/143-spawn-structured naps62/maestro:structured-view/191-accurate-diffs naps62/maestro:structured-view/190-web-tool-state naps62/maestro:structured-view/189-tui-approval-failure naps62/maestro:structured-view/188-web-submit naps62/maestro:structured-view/187-tui-spawn-race naps62/maestro:structured-view/141-tui-structured naps62/maestro:structured-view/140-web-structured naps62/maestro:structured-view/186-unknown-update-doc naps62/maestro:structured-view/185-lock-order naps62/maestro:structured-view/184-approval-persist naps62/maestro:structured-view/142-structured-activity naps62/maestro:structured-view/137-structured-docs naps62/maestro:fix/codex-attach-scroll naps62/maestro:structured-view/139-permission-requests naps62/maestro:structured-view/138-structured-api naps62/maestro:structured-view/136-transcript-projection naps62/maestro:structured-view/183-dismissal-race naps62/maestro:structured-view/182-natural-exit-race naps62/maestro:structured-view/181-recovery-provenance naps62/maestro:structured-view/180-shutdown-create naps62/maestro:structured-view/179-shutdown-drain naps62/maestro:structured-view/177-restart-worktree naps62/maestro:structured-view/178-pid-safe naps62/maestro:structured-view/135-event-log naps62/maestro:structured-view/134-acp-subprocess naps62/maestro:10-umbrella-feature-gate-tests naps62/maestro:structured-view/133-session-view naps62/maestro:contrabass naps62/maestro:fermata naps62/maestro:interlude naps62/maestro:crescendo naps62/maestro:reboot/173-timing-assert naps62/maestro:reboot/169-tui-dormant naps62/maestro:blitz/reboot-resilience naps62/maestro:reboot/171-scrollback naps62/maestro:reboot/176-session-id-refresh naps62/maestro:reboot/175-resume-races naps62/maestro:reboot/168-web-dormant naps62/maestro:reboot/174-bootid-strand naps62/maestro:reboot/167-resume-policy naps62/maestro:reboot/166-resume-route naps62/maestro:reboot/172-worktree-field naps62/maestro:reboot/164-boot-id naps62/maestro:reboot/165-resume-command naps62/maestro:reboot/163-prune-sidecars naps62/maestro:tuplet naps62/maestro:reboot/162-dormant naps62/maestro:reboot/161-agent-session-id naps62/maestro:sarabande naps62/maestro:glissando naps62/maestro:blitz/command-bar naps62/maestro:legato naps62/maestro:command-bar/159-web-leader-config naps62/maestro:command-bar/157-touch-entry naps62/maestro:command-bar/158-literal-leader naps62/maestro:command-bar/156-tui-literal-ctrlk naps62/maestro:command-bar/155-tui-drillin naps62/maestro:command-bar/151-web-drillin naps62/maestro:command-bar/154-tui-sigils naps62/maestro:command-bar/152-web-pane-ctrlk naps62/maestro:command-bar/150-web-sigils naps62/maestro:command-bar/153-tui-bar naps62/maestro:aubade naps62/maestro:command-bar/147-rust-matcher naps62/maestro:dominant naps62/maestro:command-bar/149-web-bar naps62/maestro:command-bar/145-daemon-focus naps62/maestro:command-bar/146-ts-matcher naps62/maestro:command-bar/148-web-registry naps62/maestro:harmony naps62/maestro:command-bar/144-contract naps62/maestro:coda naps62/maestro:oboe naps62/maestro:accordion naps62/maestro:snare naps62/maestro:feroce naps62/maestro:cantabile naps62/maestro:fix/tui-daemon-url-resolution naps62/maestro:haiky naps62/maestro:activity naps62/maestro:shortcuts naps62/maestro:dorian naps62/maestro:symphony naps62/maestro:colors naps62/maestro:flugelhorn naps62/maestro:andante naps62/maestro:trombone naps62/maestro:organ naps62/maestro:scherzo naps62/maestro:duduk naps62/maestro:sostenuto naps62/maestro:lullaby naps62/maestro:moderato-motif naps62/maestro:largo-piano naps62/maestro:moderato-bassoon naps62/maestro:lento-sonata naps62/maestro:animato-trumpet naps62/maestro:largo-lute naps62/maestro:feroce-violin naps62/maestro:grazioso-viola naps62/maestro:sostenuto-bassoon naps62/maestro:crescendo-rondo naps62/maestro:refresh naps62/maestro:marcato-nocturne naps62/maestro:brillante-fugue naps62/maestro:forte-lyre naps62/maestro:rename naps62/maestro:themes naps62/maestro:blitz/tui-shell naps62/maestro:issue/124-project-groups naps62/maestro:issue/122-theme-presets naps62/maestro:issue/123-focused-panels naps62/maestro:issue/121-tui-line2 naps62/maestro:issue/120-web-line2 naps62/maestro:issue/119-bare-maestro-tui naps62/maestro:issue/118-palette-roles naps62/maestro:issue/117-path-helpers naps62/maestro:issue/116-sidebar-contract naps62/maestro:blitz/sidebar-cards naps62/maestro:sidebar-cards/115-fourth-flake naps62/maestro:sidebar-cards/114-hook-error naps62/maestro:sidebar-cards/113-more-flakes naps62/maestro:sidebar-cards/106-hooks-install naps62/maestro:sidebar-cards/112-detail-render naps62/maestro:sidebar-cards/111-flaky-retention naps62/maestro:sidebar-cards/105-activity-endpoint naps62/maestro:sidebar-cards/110-lenient-activity naps62/maestro:sidebar-cards/108-tui-cards naps62/maestro:sidebar-cards/107-web-cards naps62/maestro:sidebar-cards/104-activity-clock naps62/maestro:sidebar-cards/103-session-env naps62/maestro:sidebar-cards/102-activity-wire naps62/maestro:sidebar-cards/101-sidebar-contract naps62/maestro:blitz/spawn-v2 naps62/maestro:spawn-v2/97-enter-submits naps62/maestro:spawn-v2/94-labels naps62/maestro:spawn-v2/96-tui-picker naps62/maestro:spawn-v2/93-collapse-worktree naps62/maestro:spawn-v2/98-flake-ci naps62/maestro:spawn-v2/95-project-picker naps62/maestro:spawn-v2/74-gitroot-debounce naps62/maestro:spawn-v2/76-preset-reset naps62/maestro:spawn-v2/73-draft-pane-swap naps62/maestro:spawn-v2/91-wt-toggle-default naps62/maestro:spawn-v2/92-form-width naps62/maestro:spawn-v2/70-fastforward-key naps62/maestro:spawn-v2/72-opendraft-reuse naps62/maestro:spawn-v2/75-projects-ttl naps62/maestro:blitz/worktree-lifecycle naps62/maestro:wl/83-blocked-work naps62/maestro:wl/88-e2e-lifecycle naps62/maestro:wl/87-drop-cleanup-flag naps62/maestro:wl/82-natural-exit naps62/maestro:wl/84-web-worktrees naps62/maestro:wl/81-force-retains naps62/maestro:wl/85-tui-worktrees naps62/maestro:wl/86-cli-worktrees naps62/maestro:wl/79-kill-guard naps62/maestro:wl/80-worktrees-api naps62/maestro:wl/77-worktree-collisions naps62/maestro:wl/78-retained-store naps62/maestro:spawn-v2/67-fastforward naps62/maestro:spawn-v2/66-e2e naps62/maestro:spawn-v2/65-tui-worktree naps62/maestro:spawn-v2/68-draft-teardown naps62/maestro:spawn-v2/62-drop-modal naps62/maestro:spawn-v2/64-tui-fields naps62/maestro:spawn-v2/61-wt-defaults naps62/maestro:spawn-v2/53-names naps62/maestro:spawn-v2/55-branches naps62/maestro:spawn-v2/59-projectlist naps62/maestro:spawn-v2/54-projects naps62/maestro:spawn-v2/60-autocomplete naps62/maestro:spawn-v2/63-tui-draft-pane naps62/maestro:spawn-v2/56-worktree-place naps62/maestro:spawn-v2/58-tui-textinput naps62/maestro:spawn-v2/57-draft-pane naps62/maestro:nix naps62/maestro:refactor naps62/maestro:dev-environment naps62/maestro:linear/nap-228-daemon-recover-leaves-stale-tmux-pipe-pane-attach-shows-no
..
pull from: naps62/maestro:android-app/266-terminal
Branches Tags
naps62/maestro:chorale naps62/maestro:main naps62/maestro:upbeat naps62/maestro:tritone-2 naps62/maestro:fermata-4 naps62/maestro:android-app/271-theme-apk naps62/maestro:blitz/android-app naps62/maestro:android-app/270-command-bar naps62/maestro:android-app/268-app-shell naps62/maestro:android-app/267-structured naps62/maestro:android-app/266-terminal naps62/maestro:android-app/269-spawn-form naps62/maestro:android-app/265-sidebar naps62/maestro:android-app/264-daemon-connection naps62/maestro:android-app/263-api-client naps62/maestro:android-app/262-project-scaffold naps62/maestro:rhapsody naps62/maestro:dominant-2 naps62/maestro:animato-2 naps62/maestro:glockenspiel naps62/maestro:septet naps62/maestro:mandolin naps62/maestro:chord naps62/maestro:timbre-2 naps62/maestro:aeolian naps62/maestro:cello-2 naps62/maestro:allegro naps62/maestro:lento naps62/maestro:lyre naps62/maestro:maestoso naps62/maestro:cadence-3 naps62/maestro:modulation-2 naps62/maestro:modulation naps62/maestro:xylophone-2 naps62/maestro:tuba-2 naps62/maestro:piccolo-2 naps62/maestro:grazioso-2 naps62/maestro:grazioso naps62/maestro:hymn naps62/maestro:xylophone naps62/maestro:blitz/react-tailwind-migration naps62/maestro:254-design-kit-react naps62/maestro:253-delete-vanilla-wire-react naps62/maestro:issue/252-tests-rtl naps62/maestro:issue/242-daemon-link-react naps62/maestro:issue/240-types-api-router naps62/maestro:issue/251-preview-mode-react naps62/maestro:issue/250-dialogs-drawer-react naps62/maestro:issue/249-layout-system-react naps62/maestro:247-command-bar-react naps62/maestro:issue/248-spawn-dialog-react naps62/maestro:246-structured-pane-react naps62/maestro:issue/245-terminal-pane-react naps62/maestro:244-sidebar-react naps62/maestro:issue/243-theme-tokens-tailwind naps62/maestro:issue/241-catalog-connection-zustand naps62/maestro:issue/239-scaffold-react-tailwind naps62/maestro:timpani naps62/maestro:staccato-2 naps62/maestro:trombone-2 naps62/maestro:grave-2 naps62/maestro:harpsichord-2 naps62/maestro:recorder-4 naps62/maestro:vivace naps62/maestro:sotto naps62/maestro:tuba naps62/maestro:chaconne naps62/maestro:etude naps62/maestro:arpeggio naps62/maestro:harpsichord naps62/maestro:cadence-2 naps62/maestro:brillante naps62/maestro:clarinet naps62/maestro:snare-2 naps62/maestro:staccato naps62/maestro:recorder-2 naps62/maestro:tritone naps62/maestro:balalaika naps62/maestro:timbre naps62/maestro:violin naps62/maestro:fix/web-nix-build naps62/maestro:blitz/codex-structured-sessions naps62/maestro:codex-structured-sessions/203-tui-spawn naps62/maestro:codex-structured-sessions/202-web-spawn naps62/maestro:codex-structured-sessions/201-codex-lifecycle naps62/maestro:codex-structured-sessions/200-select-acp-adapter naps62/maestro:blitz/structured-view naps62/maestro:vivo naps62/maestro:structured-view/199-command-resolution naps62/maestro:structured-view/198-viewport naps62/maestro:structured-view/197-lock-order naps62/maestro:structured-view/196-concurrent-handshakes naps62/maestro:structured-view/195-autoscroll naps62/maestro:structured-view/194-plan-row naps62/maestro:structured-view/193-expanded-reconnect naps62/maestro:structured-view/192-pty-gate naps62/maestro:structured-view/143-spawn-structured naps62/maestro:structured-view/191-accurate-diffs naps62/maestro:structured-view/190-web-tool-state naps62/maestro:structured-view/189-tui-approval-failure naps62/maestro:structured-view/188-web-submit naps62/maestro:structured-view/187-tui-spawn-race naps62/maestro:structured-view/141-tui-structured naps62/maestro:structured-view/140-web-structured naps62/maestro:structured-view/186-unknown-update-doc naps62/maestro:structured-view/185-lock-order naps62/maestro:structured-view/184-approval-persist naps62/maestro:structured-view/142-structured-activity naps62/maestro:structured-view/137-structured-docs naps62/maestro:fix/codex-attach-scroll naps62/maestro:structured-view/139-permission-requests naps62/maestro:structured-view/138-structured-api naps62/maestro:structured-view/136-transcript-projection naps62/maestro:structured-view/183-dismissal-race naps62/maestro:structured-view/182-natural-exit-race naps62/maestro:structured-view/181-recovery-provenance naps62/maestro:structured-view/180-shutdown-create naps62/maestro:structured-view/179-shutdown-drain naps62/maestro:structured-view/177-restart-worktree naps62/maestro:structured-view/178-pid-safe naps62/maestro:structured-view/135-event-log naps62/maestro:structured-view/134-acp-subprocess naps62/maestro:10-umbrella-feature-gate-tests naps62/maestro:structured-view/133-session-view naps62/maestro:contrabass naps62/maestro:fermata naps62/maestro:interlude naps62/maestro:crescendo naps62/maestro:reboot/173-timing-assert naps62/maestro:reboot/169-tui-dormant naps62/maestro:blitz/reboot-resilience naps62/maestro:reboot/171-scrollback naps62/maestro:reboot/176-session-id-refresh naps62/maestro:reboot/175-resume-races naps62/maestro:reboot/168-web-dormant naps62/maestro:reboot/174-bootid-strand naps62/maestro:reboot/167-resume-policy naps62/maestro:reboot/166-resume-route naps62/maestro:reboot/172-worktree-field naps62/maestro:reboot/164-boot-id naps62/maestro:reboot/165-resume-command naps62/maestro:reboot/163-prune-sidecars naps62/maestro:tuplet naps62/maestro:reboot/162-dormant naps62/maestro:reboot/161-agent-session-id naps62/maestro:sarabande naps62/maestro:glissando naps62/maestro:blitz/command-bar naps62/maestro:legato naps62/maestro:command-bar/159-web-leader-config naps62/maestro:command-bar/157-touch-entry naps62/maestro:command-bar/158-literal-leader naps62/maestro:command-bar/156-tui-literal-ctrlk naps62/maestro:command-bar/155-tui-drillin naps62/maestro:command-bar/151-web-drillin naps62/maestro:command-bar/154-tui-sigils naps62/maestro:command-bar/152-web-pane-ctrlk naps62/maestro:command-bar/150-web-sigils naps62/maestro:command-bar/153-tui-bar naps62/maestro:aubade naps62/maestro:command-bar/147-rust-matcher naps62/maestro:dominant naps62/maestro:command-bar/149-web-bar naps62/maestro:command-bar/145-daemon-focus naps62/maestro:command-bar/146-ts-matcher naps62/maestro:command-bar/148-web-registry naps62/maestro:harmony naps62/maestro:command-bar/144-contract naps62/maestro:coda naps62/maestro:oboe naps62/maestro:accordion naps62/maestro:snare naps62/maestro:feroce naps62/maestro:cantabile naps62/maestro:fix/tui-daemon-url-resolution naps62/maestro:haiky naps62/maestro:activity naps62/maestro:shortcuts naps62/maestro:dorian naps62/maestro:symphony naps62/maestro:colors naps62/maestro:flugelhorn naps62/maestro:andante naps62/maestro:trombone naps62/maestro:organ naps62/maestro:scherzo naps62/maestro:duduk naps62/maestro:sostenuto naps62/maestro:lullaby naps62/maestro:moderato-motif naps62/maestro:largo-piano naps62/maestro:moderato-bassoon naps62/maestro:lento-sonata naps62/maestro:animato-trumpet naps62/maestro:largo-lute naps62/maestro:feroce-violin naps62/maestro:grazioso-viola naps62/maestro:sostenuto-bassoon naps62/maestro:crescendo-rondo naps62/maestro:refresh naps62/maestro:marcato-nocturne naps62/maestro:brillante-fugue naps62/maestro:forte-lyre naps62/maestro:rename naps62/maestro:themes naps62/maestro:blitz/tui-shell naps62/maestro:issue/124-project-groups naps62/maestro:issue/122-theme-presets naps62/maestro:issue/123-focused-panels naps62/maestro:issue/121-tui-line2 naps62/maestro:issue/120-web-line2 naps62/maestro:issue/119-bare-maestro-tui naps62/maestro:issue/118-palette-roles naps62/maestro:issue/117-path-helpers naps62/maestro:issue/116-sidebar-contract naps62/maestro:blitz/sidebar-cards naps62/maestro:sidebar-cards/115-fourth-flake naps62/maestro:sidebar-cards/114-hook-error naps62/maestro:sidebar-cards/113-more-flakes naps62/maestro:sidebar-cards/106-hooks-install naps62/maestro:sidebar-cards/112-detail-render naps62/maestro:sidebar-cards/111-flaky-retention naps62/maestro:sidebar-cards/105-activity-endpoint naps62/maestro:sidebar-cards/110-lenient-activity naps62/maestro:sidebar-cards/108-tui-cards naps62/maestro:sidebar-cards/107-web-cards naps62/maestro:sidebar-cards/104-activity-clock naps62/maestro:sidebar-cards/103-session-env naps62/maestro:sidebar-cards/102-activity-wire naps62/maestro:sidebar-cards/101-sidebar-contract naps62/maestro:blitz/spawn-v2 naps62/maestro:spawn-v2/97-enter-submits naps62/maestro:spawn-v2/94-labels naps62/maestro:spawn-v2/96-tui-picker naps62/maestro:spawn-v2/93-collapse-worktree naps62/maestro:spawn-v2/98-flake-ci naps62/maestro:spawn-v2/95-project-picker naps62/maestro:spawn-v2/74-gitroot-debounce naps62/maestro:spawn-v2/76-preset-reset naps62/maestro:spawn-v2/73-draft-pane-swap naps62/maestro:spawn-v2/91-wt-toggle-default naps62/maestro:spawn-v2/92-form-width naps62/maestro:spawn-v2/70-fastforward-key naps62/maestro:spawn-v2/72-opendraft-reuse naps62/maestro:spawn-v2/75-projects-ttl naps62/maestro:blitz/worktree-lifecycle naps62/maestro:wl/83-blocked-work naps62/maestro:wl/88-e2e-lifecycle naps62/maestro:wl/87-drop-cleanup-flag naps62/maestro:wl/82-natural-exit naps62/maestro:wl/84-web-worktrees naps62/maestro:wl/81-force-retains naps62/maestro:wl/85-tui-worktrees naps62/maestro:wl/86-cli-worktrees naps62/maestro:wl/79-kill-guard naps62/maestro:wl/80-worktrees-api naps62/maestro:wl/77-worktree-collisions naps62/maestro:wl/78-retained-store naps62/maestro:spawn-v2/67-fastforward naps62/maestro:spawn-v2/66-e2e naps62/maestro:spawn-v2/65-tui-worktree naps62/maestro:spawn-v2/68-draft-teardown naps62/maestro:spawn-v2/62-drop-modal naps62/maestro:spawn-v2/64-tui-fields naps62/maestro:spawn-v2/61-wt-defaults naps62/maestro:spawn-v2/53-names naps62/maestro:spawn-v2/55-branches naps62/maestro:spawn-v2/59-projectlist naps62/maestro:spawn-v2/54-projects naps62/maestro:spawn-v2/60-autocomplete naps62/maestro:spawn-v2/63-tui-draft-pane naps62/maestro:spawn-v2/56-worktree-place naps62/maestro:spawn-v2/58-tui-textinput naps62/maestro:spawn-v2/57-draft-pane naps62/maestro:nix naps62/maestro:refactor naps62/maestro:dev-environment naps62/maestro:linear/nap-228-daemon-recover-leaves-stale-tmux-pipe-pane-attach-shows-no
5 Commits
android-app/269-spawn-form .. android-app/266-terminal
Author SHA1 Message Date
Miguel Palhas c90bdfbe42 feat(maestro): open terminal pane from a tapped sidebar session 
Tapping a session in the sidebar now opens TerminalScreen full-screen
instead of just closing the drawer. windowSoftInputMode=adjustResize
lets WindowInsets.isImeVisible drive the key bar's visibility.
 2026-09-13 01:07:32 +01:00
Miguel Palhas 27b6e647c1 feat(maestro): add Android terminal pane composable 
TerminalWebView wraps a WebView around the bundled xterm.js page, with
a JS bridge (maestroKey/maestroToggleMod/maestroFocus) the native key
bar drives; onModifierConsumed reports back when the page's own JS
folds an armed Ctrl/Alt into a soft-keyboard keystroke, so the native
toggle stays in sync. TerminalScreen composes the WebView with the key
bar, showing the bar only while WindowInsets.isImeVisible.
 2026-09-13 01:07:23 +01:00
Miguel Palhas 0631e69ef0 feat(maestro): add Android terminal extra key bar composable 
Termux-style row for the soft keyboard (issue #266): Tab, Esc, one-shot
Ctrl/Alt modifiers, and the four cursor arrows, scrollable horizontally
for narrow screens.
 2026-09-13 01:07:15 +01:00
Miguel Palhas f98c637cd9 feat(maestro): add Android terminal attach URL builder 
TerminalPageUrl builds the file:///android_asset/terminal/index.html
URL for one session, with the WS /api/attach/:id URL Routes already
knows how to build passed through as an encoded query param.
 2026-09-13 01:07:07 +01:00
Miguel Palhas 554182d956 feat(maestro): bundle xterm.js terminal page for Android WebView pane 
Vendors @xterm/xterm 5.5.0 and @xterm/addon-fit 0.10.0 as static assets
plus a small HTML/JS page that owns the WS /api/attach/:id connection
directly, the same shape as the web SPA's TerminalPane.tsx. Bundled
locally so the pane only needs LAN reachability to the daemon, not
internet access to a CDN.
 2026-09-13 01:06:59 +01:00
12 changed files with 755 additions and 24 deletions
Expand all files Collapse all files
android/app/src/main/AndroidManifest.xml
+1
View File
@@ -15,6 +15,7 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"
android:theme="@style/Theme.Maestro">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
android/app/src/main/assets/terminal/index.html
+165
View File
@@ -0,0 +1,165 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<link rel="stylesheet" href="vendor/xterm.css" />
<style>
html, body, #terminal { height: 100%; margin: 0; padding: 0; background: #121419; overflow: hidden; }
.xterm { padding: 4px; }
</style>
</head>
<body>
<div id="terminal"></div>
<script src="vendor/xterm.js"></script>
<script src="vendor/addon-fit.js"></script>
<script>
// Owns the `WS /api/attach/:id` connection directly, the same shape as
// web/src/components/terminal/TerminalPane.tsx — PTY bytes in binary
// frames both ways, `ClientControl` JSON in text frames. The native
// Android side (TerminalWebView.kt) never touches the socket; it only
// calls the maestro* bridge functions below for the extra key bar.
var params = new URLSearchParams(location.search);
var wsUrl = params.get("ws");
var term = new Terminal({
cursorBlink: true,
fontFamily: '"JetBrains Mono", ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace',
fontSize: 13,
convertEol: false,
scrollback: 2000,
theme: {
background: "#121419",
foreground: "#e6e8ec",
cursor: "#5fe3a1",
cursorAccent: "#121419",
selectionBackground: "#2b6b4f",
},
});
var fitAddon = new FitAddon.FitAddon();
term.loadAddon(fitAddon);
var container = document.getElementById("terminal");
term.open(container);
fitAddon.fit();
var ws = null;
var awaitingReplay = true;
var armed = { ctrl: false, alt: false };
function sendControl(msg) {
if (ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify(msg));
}
function sendInput(data) {
if (ws && ws.readyState === WebSocket.OPEN) ws.send(new TextEncoder().encode(data));
}
function connect() {
awaitingReplay = true;
ws = new WebSocket(wsUrl);
ws.binaryType = "arraybuffer";
ws.onopen = function () {
sendControl({ type: "Resize", cols: term.cols, rows: term.rows });
};
ws.onmessage = function (ev) {
if (typeof ev.data === "string") return; // control frame, nothing to render
var replay = awaitingReplay;
awaitingReplay = false;
term.write(new Uint8Array(ev.data), function () {
if (replay) term.scrollToBottom();
});
};
ws.onclose = function (ev) {
if (ev.code === 1000) return;
term.write("\r\n\x1b[31m[disconnected]\x1b[0m\r\n");
};
}
// Ctrl maps to the C0 control range (A-Z, [, \, ], ^, _); Alt prefixes ESC
// — the same encoding buildKeyBar/applyModsToChar use on the web client.
function applyModsToChar(ch, ctrl, alt) {
var out = ch;
if (ctrl) {
var code = ch.toUpperCase().charCodeAt(0);
if (code >= 64 && code <= 95) out = String.fromCharCode(code - 64);
}
if (alt) out = "\x1b" + out;
return out;
}
// CSI cursor sequence with the modifier parameter xterm expects:
// `1;<mod>` where 3=alt, 5=ctrl, 7=ctrl+alt.
function cursorSeq(final, ctrl, alt) {
if (!ctrl && !alt) return "\x1b[" + final;
var mod = 1 + (alt ? 2 : 0) + (ctrl ? 4 : 0);
return "\x1b[1;" + mod + final;
}
term.onData(function (data) {
if ((armed.ctrl || armed.alt) && data.length === 1) {
var hadCtrl = armed.ctrl;
var hadAlt = armed.alt;
sendInput(applyModsToChar(data, hadCtrl, hadAlt));
armed.ctrl = false;
armed.alt = false;
if (window.AndroidBridge) {
if (hadCtrl) AndroidBridge.onModConsumed("ctrl");
if (hadAlt) AndroidBridge.onModConsumed("alt");
}
} else {
sendInput(data);
}
});
term.onResize(function (size) {
sendControl({ type: "Resize", cols: size.cols, rows: size.rows });
});
container.addEventListener("click", function () {
term.focus();
});
var ro = new ResizeObserver(function () {
try {
fitAddon.fit();
} catch (e) {
// container not measurable yet (e.g. mid-teardown) — next observation retries
}
});
ro.observe(container);
// Bridge called from TerminalWebViewController via evaluateJavascript —
// the native extra key bar's Tab/Esc/arrow buttons and Ctrl/Alt toggles.
window.maestroKey = function (key) {
var ctrl = armed.ctrl;
var alt = armed.alt;
var seq;
switch (key) {
case "Tab": seq = "\t"; break;
case "Esc": seq = "\x1b"; break;
case "Up": seq = cursorSeq("A", ctrl, alt); break;
case "Down": seq = cursorSeq("B", ctrl, alt); break;
case "Right": seq = cursorSeq("C", ctrl, alt); break;
case "Left": seq = cursorSeq("D", ctrl, alt); break;
default: return;
}
sendInput(seq);
armed.ctrl = false;
armed.alt = false;
};
window.maestroToggleMod = function (name) {
if (name === "ctrl" || name === "alt") armed[name] = !armed[name];
};
window.maestroFocus = function () {
term.focus();
};
connect();
</script>
</body>
</html>
android/app/src/main/assets/terminal/vendor/addon-fit.js
Vendored
+2
View File
@@ -0,0 +1,2 @@
!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FitAddon=t():e.FitAddon=t()}(self,(()=>(()=>{"use strict";var e={};return(()=>{var t=e;Object.defineProperty(t,"__esModule",{value:!0}),t.FitAddon=void 0,t.FitAddon=class{activate(e){this._terminal=e}dispose(){}fit(){const e=this.proposeDimensions();if(!e||!this._terminal||isNaN(e.cols)||isNaN(e.rows))return;const t=this._terminal._core;this._terminal.rows===e.rows&&this._terminal.cols===e.cols||(t._renderService.clear(),this._terminal.resize(e.cols,e.rows))}proposeDimensions(){if(!this._terminal)return;if(!this._terminal.element||!this._terminal.element.parentElement)return;const e=this._terminal._core,t=e._renderService.dimensions;if(0===t.css.cell.width||0===t.css.cell.height)return;const r=0===this._terminal.options.scrollback?0:e.viewport.scrollBarWidth,i=window.getComputedStyle(this._terminal.element.parentElement),o=parseInt(i.getPropertyValue("height")),s=Math.max(0,parseInt(i.getPropertyValue("width"))),n=window.getComputedStyle(this._terminal.element),l=o-(parseInt(n.getPropertyValue("padding-top"))+parseInt(n.getPropertyValue("padding-bottom"))),a=s-(parseInt(n.getPropertyValue("padding-right"))+parseInt(n.getPropertyValue("padding-left")))-r;return{cols:Math.max(2,Math.floor(a/t.css.cell.width)),rows:Math.max(1,Math.floor(l/t.css.cell.height))}}}})(),e})()));
//# sourceMappingURL=addon-fit.js.map
android/app/src/main/assets/terminal/vendor/xterm.css
Vendored
+218
View File
@@ -0,0 +1,218 @@
/**
* Copyright (c) 2014 The xterm.js authors. All rights reserved.
* Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
* https://github.com/chjj/term.js
* @license MIT
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* Originally forked from (with the author's permission):
* Fabrice Bellard's javascript vt100 for jslinux:
* http://bellard.org/jslinux/
* Copyright (c) 2011 Fabrice Bellard
* The original design remains. The terminal itself
* has been extended to include xterm CSI codes, among
* other features.
*/
/**
* Default styles for xterm.js
*/
.xterm {
cursor: text;
position: relative;
user-select: none;
-ms-user-select: none;
-webkit-user-select: none;
}
.xterm.focus,
.xterm:focus {
outline: none;
}
.xterm .xterm-helpers {
position: absolute;
top: 0;
/**
* The z-index of the helpers must be higher than the canvases in order for
* IMEs to appear on top.
*/
z-index: 5;
}
.xterm .xterm-helper-textarea {
padding: 0;
border: 0;
margin: 0;
/* Move textarea out of the screen to the far left, so that the cursor is not visible */
position: absolute;
opacity: 0;
left: -9999em;
top: 0;
width: 0;
height: 0;
z-index: -5;
/** Prevent wrapping so the IME appears against the textarea at the correct position */
white-space: nowrap;
overflow: hidden;
resize: none;
}
.xterm .composition-view {
/* TODO: Composition position got messed up somewhere */
background: #000;
color: #FFF;
display: none;
position: absolute;
white-space: nowrap;
z-index: 1;
}
.xterm .composition-view.active {
display: block;
}
.xterm .xterm-viewport {
/* On OS X this is required in order for the scroll bar to appear fully opaque */
background-color: #000;
overflow-y: scroll;
cursor: default;
position: absolute;
right: 0;
left: 0;
top: 0;
bottom: 0;
}
.xterm .xterm-screen {
position: relative;
}
.xterm .xterm-screen canvas {
position: absolute;
left: 0;
top: 0;
}
.xterm .xterm-scroll-area {
visibility: hidden;
}
.xterm-char-measure-element {
display: inline-block;
visibility: hidden;
position: absolute;
top: 0;
left: -9999em;
line-height: normal;
}
.xterm.enable-mouse-events {
/* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
cursor: default;
}
.xterm.xterm-cursor-pointer,
.xterm .xterm-cursor-pointer {
cursor: pointer;
}
.xterm.column-select.focus {
/* Column selection mode */
cursor: crosshair;
}
.xterm .xterm-accessibility:not(.debug),
.xterm .xterm-message {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
z-index: 10;
color: transparent;
pointer-events: none;
}
.xterm .xterm-accessibility-tree:not(.debug) *::selection {
color: transparent;
}
.xterm .xterm-accessibility-tree {
user-select: text;
white-space: pre;
}
.xterm .live-region {
position: absolute;
left: -9999px;
width: 1px;
height: 1px;
overflow: hidden;
}
.xterm-dim {
/* Dim should not apply to background, so the opacity of the foreground color is applied
* explicitly in the generated class and reset to 1 here */
opacity: 1 !important;
}
.xterm-underline-1 { text-decoration: underline; }
.xterm-underline-2 { text-decoration: double underline; }
.xterm-underline-3 { text-decoration: wavy underline; }
.xterm-underline-4 { text-decoration: dotted underline; }
.xterm-underline-5 { text-decoration: dashed underline; }
.xterm-overline {
text-decoration: overline;
}
.xterm-overline.xterm-underline-1 { text-decoration: overline underline; }
.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; }
.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; }
.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; }
.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; }
.xterm-strikethrough {
text-decoration: line-through;
}
.xterm-screen .xterm-decoration-container .xterm-decoration {
z-index: 6;
position: absolute;
}
.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {
z-index: 7;
}
.xterm-decoration-overview-ruler {
z-index: 8;
position: absolute;
top: 0;
right: 0;
pointer-events: none;
}
.xterm-decoration-top {
z-index: 2;
position: relative;
}
android/app/src/main/assets/terminal/vendor/xterm.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
android/app/src/main/java/pt/naps/maestro/MainActivity.kt
+45 -24
View File
@@ -22,7 +22,10 @@ import androidx.compose.material3.rememberDrawerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
@@ -32,7 +35,10 @@ import kotlinx.coroutines.launch
import pt.naps.maestro.connection.DaemonLink
import pt.naps.maestro.connection.DaemonPrefs
import pt.naps.maestro.connection.LinkState
import pt.naps.maestro.data.Session
import pt.naps.maestro.ui.sidebar.SidebarContent
import pt.naps.maestro.ui.sidebar.sessionName
import pt.naps.maestro.ui.terminal.TerminalScreen
import pt.naps.maestro.ui.theme.MaestroTheme
class MainActivity : ComponentActivity() {
@@ -50,34 +56,49 @@ class MainActivity : ComponentActivity() {
setContent {
MaestroTheme {
val linkState by daemonLink.state.collectAsState()
val baseUrl by prefs.baseUrl.collectAsState()
val drawerState = rememberDrawerState(DrawerValue.Closed)
val scope = rememberCoroutineScope()
var openSession by remember { mutableStateOf<Session?>(null) }
ModalNavigationDrawer(
drawerState = drawerState,
drawerContent = {
ModalDrawerSheet(modifier = Modifier.width(320.dp)) {
SidebarContent(
catalogStore = daemonLink.catalog,
onOpenSession = { scope.launch { drawerState.close() } },
)
}
},
) {
Scaffold(
modifier = Modifier.fillMaxSize(),
topBar = {
TopAppBar(
title = { Text("Maestro") },
navigationIcon = {
IconButton(onClick = { scope.launch { drawerState.open() } }) {
Text("☰")
}
},
)
val session = openSession
if (session != null) {
TerminalScreen(
daemonBaseUrl = baseUrl,
sessionId = session.id,
sessionTitle = sessionName(session),
onBack = { openSession = null },
)
} else {
ModalNavigationDrawer(
drawerState = drawerState,
drawerContent = {
ModalDrawerSheet(modifier = Modifier.width(320.dp)) {
SidebarContent(
catalogStore = daemonLink.catalog,
onOpenSession = { s ->
openSession = s
scope.launch { drawerState.close() }
},
)
}
},
) { innerPadding ->
PlaceholderScreen(modifier = Modifier.padding(innerPadding), linkState = linkState)
) {
Scaffold(
modifier = Modifier.fillMaxSize(),
topBar = {
TopAppBar(
title = { Text("Maestro") },
navigationIcon = {
IconButton(onClick = { scope.launch { drawerState.open() } }) {
Text("☰")
}
},
)
},
) { innerPadding ->
PlaceholderScreen(modifier = Modifier.padding(innerPadding), linkState = linkState)
}
}
}
}
android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalKeyBar.kt
+76
View File
@@ -0,0 +1,76 @@
package pt.naps.maestro.ui.terminal
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
/** One button on the [TerminalKeyBar]. A [Modifier] toggles Ctrl/Alt state
* in the terminal page's own JS instead of sending a byte sequence. */
sealed class TerminalKeyAction(val label: String) {
data class Modifier(val name: String, val display: String) : TerminalKeyAction(display)
data class Send(val display: String, val key: String) : TerminalKeyAction(display)
}
/**
* Termux-style extra key row for the on-screen keyboard (issue #266): Tab,
* Esc, Ctrl/Alt, and the four cursor arrows. Ctrl/Alt are one-shot modifiers
* — armed here, then folded into the very next key (tapped on this bar or
* typed on the soft keyboard) by `assets/terminal/index.html`'s own JS.
*/
val TERMINAL_KEY_ACTIONS: List<TerminalKeyAction> = listOf(
TerminalKeyAction.Send("Esc", "Esc"),
TerminalKeyAction.Send("Tab", "Tab"),
TerminalKeyAction.Modifier("ctrl", "Ctrl"),
TerminalKeyAction.Modifier("alt", "Alt"),
TerminalKeyAction.Send("↑", "Up"),
TerminalKeyAction.Send("↓", "Down"),
TerminalKeyAction.Send("←", "Left"),
TerminalKeyAction.Send("→", "Right"),
)
@Composable
fun TerminalKeyBar(
armed: Set<String>,
onSend: (String) -> Unit,
onToggleModifier: (String) -> Unit,
modifier: Modifier = Modifier,
) {
Row(
modifier = modifier
.background(MaterialTheme.colorScheme.surfaceVariant)
.horizontalScroll(rememberScrollState())
.padding(horizontal = 4.dp, vertical = 2.dp),
) {
for (action in TERMINAL_KEY_ACTIONS) {
when (action) {
is TerminalKeyAction.Modifier -> {
val isArmed = action.name in armed
TextButton(onClick = { onToggleModifier(action.name) }) {
Text(
text = action.display,
color = if (isArmed) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurfaceVariant
},
)
}
}
is TerminalKeyAction.Send -> {
TextButton(onClick = { onSend(action.key) }) {
Text(text = action.display)
}
}
}
}
}
}
android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalPageUrl.kt
+21
View File
@@ -0,0 +1,21 @@
package pt.naps.maestro.ui.terminal
import java.net.URLEncoder
import pt.naps.maestro.api.Routes
import pt.naps.maestro.data.Uuid
/**
* The `file:///android_asset/terminal/index.html` URL a [TerminalWebView]
* loads for one session. The embedded xterm.js page reads its `ws` query
* param and opens that as its own `WS /api/attach/:id` connection directly
* — this object only computes the URL, it never touches the socket.
*/
object TerminalPageUrl {
private const val ASSET_URL = "file:///android_asset/terminal/index.html"
fun build(daemonBaseUrl: String, sessionId: Uuid): String {
val wsUrl = Routes.attachWsUrl(daemonBaseUrl, sessionId)
val encoded = URLEncoder.encode(wsUrl, "UTF-8")
return "$ASSET_URL?ws=$encoded"
}
}
android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalScreen.kt
+83
View File
@@ -0,0 +1,83 @@
package pt.naps.maestro.ui.terminal
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.isImeVisible
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import pt.naps.maestro.data.Uuid
/**
* Full-screen terminal pane for one session (issue #266): a [TerminalWebView]
* showing xterm.js bound to `WS /api/attach/:id`, plus the native
* [TerminalKeyBar] overlaid above the soft keyboard while it's open.
*/
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
fun TerminalScreen(
daemonBaseUrl: String,
sessionId: Uuid,
sessionTitle: String,
onBack: () -> Unit,
modifier: Modifier = Modifier,
) {
val pageUrl = remember(daemonBaseUrl, sessionId) { TerminalPageUrl.build(daemonBaseUrl, sessionId) }
var controller by remember { mutableStateOf<TerminalWebViewController?>(null) }
var armed by remember { mutableStateOf(emptySet<String>()) }
val keyboardOpen = WindowInsets.isImeVisible
Scaffold(
modifier = modifier,
topBar = {
TopAppBar(
title = { Text(sessionTitle) },
navigationIcon = {
IconButton(onClick = onBack) {
Text(text = "←", style = MaterialTheme.typography.titleLarge)
}
},
)
},
) { innerPadding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding),
) {
TerminalWebView(
pageUrl = pageUrl,
modifier = Modifier
.weight(1f)
.fillMaxSize(),
onReady = { controller = it },
onModifierConsumed = { name -> armed = armed - name },
)
if (keyboardOpen) {
TerminalKeyBar(
armed = armed,
onSend = { key ->
controller?.sendKey(key)
armed = emptySet()
},
onToggleModifier = { name ->
armed = if (name in armed) armed - name else armed + name
controller?.toggleModifier(name)
},
)
}
}
}
}
android/app/src/main/java/pt/naps/maestro/ui/terminal/TerminalWebView.kt
+89
View File
@@ -0,0 +1,89 @@
package pt.naps.maestro.ui.terminal
import android.annotation.SuppressLint
import android.os.Handler
import android.os.Looper
import android.view.ViewGroup
import android.webkit.JavascriptInterface
import android.webkit.WebSettings
import android.webkit.WebView
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.viewinterop.AndroidView
import org.json.JSONObject
/** Matches `#121419` in `assets/terminal/index.html` and the web SPA's own
* xterm theme, so the WebView doesn't flash white while the page loads. */
private const val TERMINAL_BACKGROUND_ARGB = 0xFF121419.toInt()
/**
* Drives the terminal page loaded into a [TerminalWebView] from native code
* — the extra key bar's Tab/Esc/arrow buttons and Ctrl/Alt toggles. The page
* itself owns the `WS /api/attach/:id` socket and the xterm.js instance;
* this controller only calls the `maestro*` bridge functions it exposes.
*/
class TerminalWebViewController internal constructor(private val webView: WebView) {
fun sendKey(key: String) {
val arg = JSONObject.quote(key)
webView.evaluateJavascript("window.maestroKey && window.maestroKey($arg)", null)
}
fun toggleModifier(name: String) {
val arg = JSONObject.quote(name)
webView.evaluateJavascript("window.maestroToggleMod && window.maestroToggleMod($arg)", null)
}
fun focus() {
webView.requestFocus()
webView.evaluateJavascript("window.maestroFocus && window.maestroFocus()", null)
}
}
/**
* Terminal pane composable for issue #266: a [WebView] loading the bundled
* xterm.js page (`assets/terminal/index.html`), which connects straight to
* the daemon's `WS /api/attach/:id` for this session. [onModifierConsumed]
* fires when the page's own JS folds an armed Ctrl/Alt into a key typed on
* the soft keyboard, so the native key bar can clear its toggle to match.
*/
@SuppressLint("SetJavaScriptEnabled")
@Composable
fun TerminalWebView(
pageUrl: String,
modifier: Modifier = Modifier,
onReady: (TerminalWebViewController) -> Unit = {},
onModifierConsumed: (String) -> Unit = {},
) {
val mainHandler = remember { Handler(Looper.getMainLooper()) }
AndroidView(
modifier = modifier,
factory = { context ->
WebView(context).apply {
layoutParams = ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT,
)
settings.javaScriptEnabled = true
settings.domStorageEnabled = true
settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
setBackgroundColor(TERMINAL_BACKGROUND_ARGB)
addJavascriptInterface(
object {
@JavascriptInterface
fun onModConsumed(name: String) {
mainHandler.post { onModifierConsumed(name) }
}
},
"AndroidBridge",
)
onReady(TerminalWebViewController(this))
loadUrl(pageUrl)
}
},
update = { webView ->
if (webView.url != pageUrl) webView.loadUrl(pageUrl)
},
onRelease = { it.destroy() },
)
}
android/app/src/test/java/pt/naps/maestro/ui/terminal/TerminalKeyBarActionsTest.kt
+24
View File
@@ -0,0 +1,24 @@
package pt.naps.maestro.ui.terminal
import org.junit.Assert.assertTrue
import org.junit.Test
class TerminalKeyBarActionsTest {
@Test
fun `contains tab esc and all four arrows`() {
val labels = TERMINAL_KEY_ACTIONS.map { it.label }
assertTrue(labels.containsAll(listOf("Tab", "Esc", "↑", "↓", "←", "→")))
}
@Test
fun `ctrl and alt are modifiers rather than sends`() {
val modifierNames = TERMINAL_KEY_ACTIONS.filterIsInstance<TerminalKeyAction.Modifier>().map { it.name }
assertTrue(modifierNames.containsAll(listOf("ctrl", "alt")))
}
@Test
fun `arrow keys carry the maestroKey names the terminal page expects`() {
val sendKeys = TERMINAL_KEY_ACTIONS.filterIsInstance<TerminalKeyAction.Send>().map { it.key }
assertTrue(sendKeys.containsAll(listOf("Up", "Down", "Left", "Right", "Tab", "Esc")))
}
}
android/app/src/test/java/pt/naps/maestro/ui/terminal/TerminalPageUrlTest.kt
+29
View File
@@ -0,0 +1,29 @@
package pt.naps.maestro.ui.terminal
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
class TerminalPageUrlTest {
@Test
fun `builds asset url with the encoded attach ws url`() {
val url = TerminalPageUrl.build("http://192.168.1.5:7070", "abc-123")
assertEquals(
"file:///android_asset/terminal/index.html" +
"?ws=ws%3A%2F%2F192.168.1.5%3A7070%2Fapi%2Fattach%2Fabc-123",
url,
)
}
@Test
fun `swaps an https base to wss`() {
val url = TerminalPageUrl.build("https://daemon.example.com", "s1")
assertTrue(url.contains("wss%3A%2F%2Fdaemon.example.com"))
}
@Test
fun `strips a trailing slash from the daemon base url`() {
val url = TerminalPageUrl.build("http://host:7070/", "s1")
assertTrue(url.contains("ws%3A%2F%2Fhost%3A7070%2Fapi%2Fattach%2Fs1"))
}
}