From ad1fff82fdbbba7a1595f5ca9b67b7bc97c33f35 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 00:57:01 +0000 Subject: [PATCH 1/7] Shorten README and remove obsolete screenshot --- README.md | 194 ++++----------------------------------- docs/images/workflow.png | Bin 76403 -> 0 bytes 2 files changed, 18 insertions(+), 176 deletions(-) delete mode 100644 docs/images/workflow.png diff --git a/README.md b/README.md index 057e4f55..4137d756 100644 --- a/README.md +++ b/README.md @@ -1,198 +1,40 @@ # Pipelines -Small, reusable AI workflows for coding, research and everyday project work, -plus chats with the coding agents you already use. - -Pipelines is one per-user server with two clients: - -- **The app** (Flutter): served as a web app behind a sign-in, and as an - **Android APK**. -- **CLI and TUI** (`pipelines`) for scripting, inspection and authoring. - -A **pipeline** is a versioned Markdown definition of stages (model, human -decision, notification). A **run** executes it in a project directory on the -server machine. A **chat** is a conversation with an agent harness (OpenCode, -Claude Code or Codex) that the server keeps going while you are away. - -**Alpha:** single-user, supervised work. Models make mistakes and editing -stages change files and run commands. Start in a disposable project, review -results, and expect provider charges. - -![Workflow](docs/images/workflow.png) +Pipelines is a per-user server and CLI for running reusable AI workflows and chatting with coding agents. ## Install -```sh -git clone https://git.a-wan.net/alan/pipelines.git -cd pipelines -./install # server + CLI + web app, login autostart -./install --web # rebuild only the web app after app changes -./install --apk # optional: Android app, offered to phones for update -./install --linux # Linux x64 client archive, built in Docker -./install --macos --flutter /path/to/flutter # native macOS client archive -``` - -Needs Go (version in `go.mod`), Node.js 18+, Python 3.9+, git, curl, a C -compiler, a **running Docker** (the web app is built in Docker; the install -refuses without it) and an existing OpenCode on `PATH`. The installer never -installs these for you. See [Installation](docs/install.md). - -Then open the URL the installer prints (default `http://localhost:8082/`) -and sign in with the password you chose. Put the CLI on your `PATH` as in the -[terminal quick start](#terminal-quick-start). - -### Linux quick start (Debian/Ubuntu) +From this checkout, run: ```sh -# Prerequisites: git, curl, a C compiler, Python 3, Node.js 18+ and Docker. -sudo apt update -sudo apt install -y git curl build-essential python3 nodejs npm docker.io -sudo usermod -aG docker "$USER" # then log out and back in (or: newgrp docker) - -# Go: the version in go.mod is newer than most distro packages; use go.dev. -curl -fsSL "https://go.dev/dl/$(curl -fsSL 'https://go.dev/VERSION?m=text' | head -1).linux-amd64.tar.gz" \ - | sudo tar -C /usr/local -xz -export PATH="/usr/local/go/bin:$PATH" - -# OpenCode (required: it runs pipeline stages and chat by default). -curl -fsSL https://opencode.ai/install | bash - -git clone https://git.a-wan.net/alan/pipelines.git && cd pipelines ./install - -# Keep the server running after you log out (systemd --user service). -sudo loginctl enable-linger "$USER" ``` -Check `node --version` is 18 or newer (older distros: install Node from -nodejs.org or NodeSource). On ARM machines use `linux-arm64` in the Go URL. - -### Set up harnesses - -One command per harness (native or Docker install). Each checks the CLI is -installed (printing the install command if not), signs in with the harness's -own login when needed, picks default models for OpenCode/Pi, and verifies it -the way the server does. No restart needed. +If `pipelines` is not already on your `PATH`, add it: ```sh -pipelines harness setup opencode # stages + chat (required; ./install configured it) -pipelines harness setup pi # pipeline stages -pipelines harness setup claude # chat -pipelines harness setup codex # chat -pipelines harness list # status of all four +export PATH="$HOME/.local/share/pipelines/bin:$PATH" ``` -## What you can do +## Set up harnesses -**Runs** -- Runs list with filters, sorting (including largest on disk and most tokens) - and multi-select delete. Each row shows the run's size and reported token - total (`≥` when some stages did not report). -- Run detail: Summary (with size, tokens split fresh versus cached, and the - reported cost), Timeline, and Artifacts and Changes when the run has any. -- Artifacts viewer for files a stage produced, including the recorded session - export (`session.html`), with a full-screen view where HTML pages scroll, - zoom and open their links. -- Changes: the file diffs each stage made in the workspace. -- Human decision stages: a run waits for you; decide in the app or with - `pipelines decide`. -- Retry from the failed stage, cancel, rename, per-run model overrides. - -**Pipelines** -- A new install starts with four [example pipelines](examples/README.md), - from one stage to a review loop and a human decision; they are also the - template set. -- Draft-first authoring with a harness, versioned publishing, import/export - as ZIP. -- [Schedules](docs/schedules.md): recurring runs of an existing pipeline. -- Search across pipelines, versions, runs, steps, fields and artifacts. - -**Chat** -- Chat with **OpenCode**, **Claude Code** or **Codex** in any folder on the - server, picked with the folder picker. -- Send messages while the agent is working: Claude Code and Codex receive them - mid-turn; otherwise the server queues them durably and delivers them in order - when the turn ends, even with no client attached. -- Approvals, questions, uploads, model choice and interrupt in the app. -- Adopt an existing harness session with `pipelines chat-adopt`. - -**Notifications** -- The Android app keeps its own connection and shows notifications in the - background (no ntfy app needed). -- Settings: any run ended, chat needs you, chat reply finished, and - **Also send to ntfy** for devices that still use ntfy. - -Pi runs pipeline stages (`harness=pi`) but is not offered as a chat harness. -Claude Code runs chats and pipeline stages (`harness=claude`). -See [Harnesses](docs/harnesses.md). - -## Architecture - -``` - browser / Android app ──HTTPS (tailscale serve) or HTTP──┐ - ▼ - web proxy (node, 0.0.0.0:8082) ── sign-in, web app, /updates/ - │ same-origin /connect, /artifacts/ - ▼ - pipelines CLI/TUI ──ws://127.0.0.1:8080/connect──► pipelines-server (SQLite) - │ - ┌────────────────────┬───────────────┼───────────────┐ - ▼ ▼ ▼ ▼ - opencode serve pi (RPC) claude (stdio) Codex App Server - stages + chat stages chat chat (socket) - │ - ▼ - ntfy (8090, optional fallback) -``` - -- **One server process** (`pipelines-server`) owns the database, runs, chats - and notifications. Its API has no authentication and binds to - `127.0.0.1:8080` by default. -- **One web app.** The authenticated Node proxy (`web/serve.mjs`) serves the - installed web build and proxies to the server. Every address (localhost, - LAN, tailnet) reaches this same proxy. -- **Tailnet HTTPS.** When `PIPELINES_WEB_PUBLIC_URL` is an `https://*.ts.net` - address, `./install` runs `tailscale serve` to point it at the proxy. -- **ntfy** is built from source and runs alongside, for optional fallback - delivery and stage notification hooks. -- A login service (launchd on macOS, `systemd --user` on Linux) supervises the - server, web proxy and ntfy together. - -## Terminal quick start +Run the command for each harness you want to use: ```sh -export PATH="$HOME/.local/share/pipelines/bin:$PATH" # add to ~/.bashrc or ~/.zshrc -pipelines status -cd /path/to/your/project -pipelines # TUI -pipelines run "pipeline name" "Describe a small task" -pipelines runs -pipelines inspect 1 -pipelines doctor +pipelines harness setup claude +pipelines harness setup codex +pipelines harness setup opencode +pipelines harness setup pi ``` -Runs use the directory you start them from, on the server machine. A browser -on another computer does not upload its files. +## Update -## Documentation +```sh +pipelines update +``` -- [Installation and lifecycle](docs/install.md) -- [Harnesses: OpenCode, Claude Code, Codex, Pi](docs/harnesses.md) -- [Notifications](docs/notifications.md) · [ntfy reference](docs/ntfy.md) -- [CLI and authoring](docs/cli.md) -- [Schedules](docs/schedules.md) -- [Pipeline format](internal/author/skill/references/format.md) -- [Reasoning effort and stage limits](docs/harnesses-and-control.md) -- [Chat backend details](docs/chat-backends.md) -- [Artifacts](docs/stage-artifacts.md) · [File diffs](docs/stage-file-diffs.md) -- [Transfer pipeline definitions](docs/pipeline-transfer.md) -- [Docker installation](docs/docker.md) -- [Web proxy](web/README.md) -- [Alpha walkthrough and known limits](docs/first-version-testing.md) +## Uninstall -When reporting a problem, include your OS, install mode, reproduction steps, -`pipelines version --json` and `pipelines ping --json`. Redact credentials and -private content; do not post your database or harness session storage. - -To completely reset Pipelines, including its password and data, run `./uninstall` -from this checkout, then `./install` for a fresh setup. The checkout is retained. +```sh +./uninstall +``` diff --git a/docs/images/workflow.png b/docs/images/workflow.png deleted file mode 100644 index 5b6d48334a189115c53d4395189335fbed9d3a16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76403 zcmcG#2Q*x7+c%m*1Q8M~qDBpZ=-ng{y+!W?5uNB!CqbeG(L0IWhUjf{qW5kvdK;ZF zm@&@wf8OtT-m|`Uo%5};*4b+>>z=Xa-uJ%ltNni0wL{;j$`KJfCAf9#7LkJdTa8<{ za9`cJbvNk#9pIaT!3U?eZr{44@bDC z#`JVc>+R&nz?4*%;*fiJh{{x$q^kEHePzlI}UnB%|Y=xMC*;Q#B3*2Hkl!DptoJpcD; zTQ|qPWiZ@_Ij=VQ3r3+lwG|Yc4Ghi)sTFuk1q_sj+njqYiG&ll*%ejD6)x5Ut6Ay9 zhtT5ty{nr(9$**VXs6miKYyRMOk{@X=T(zlIOdWB4)PkZf4$e9!;VOE$jM5%lT1_6 zC#P5dL7y{O~!l6L4{IRl`KwTep^!eivJfD!pr^s(e};h!;L4_2QTP`z;Zx$QlT3V6QSU{+Xmp-3#GFa|QVtJ7H&yO`Gvd z$AuLUtI~iP4|Us}{y;nz3k!Bf-SN4fasnz3^ns&j~6zbdWzPL6RBefnN#USxBt2g?9mG!5=o7U+CBGFPNspBiEt^*W|uRY$~v+c7c! SNH zMN?CFIPRdHw~g~-dt)zy@6gb8Y25=JE*Tjp^YK;u&!1ak)jrevO#;=`c13oJe_Omh4|55#rS>&IEvlCD zC!rUzta*e9r5JQ;X89bEn@o~BK#!8g2X|3b=s`ZiHb^Z%%iHYX@Da3AP z=NH{};gl|Rc6eom!*M^CSlD;ABW9Y7-xyp@)p9z%FlKBsCo-x1+LmMR@_3Jrg#}`4 zOz$xN$$c4f*KGCjiB=6Kc_cW?&EC1_op=ow7wFyB8bw7hF{jgI z5$MyaKj?;rB34$XOfPj&0%p<8w{nGsdIAO+kSxah(hO4M^0>ho&c3>_ar$}9LqM-G zbDXTx5>qu7Iyu|ikVGGO&cy^pZO|L=Ncy?r?0k?9Hs(A02@5l`_t_r!>^wRhY+taU zrII3*YF^aveWQK7SWiO(yoYr?s2PljiK(RY9kf4Ou-_^u?~sl1LC)L3@~XRu_c*!O zg#?6_Ssc!7kaGtu`1l0!YAX8ZD`7w=Tj>&3fF`f9s-e7=tKB<>7c+>_qSJ6A8&`Y% zS^X1AtDOA3xr*i1A;^(a7HuPPB|qk%ELjH6Sn`TGarnCVEI81oMnPWDxB9av$ePVm zH%SA3B1S$GQZny%^tdKW@pPe4YufB3CX$|WsOR}`|B0l_+t-G$f@!pd*g%>LN#{7I zHsPaX{Q8CzyirbFciOG>3kBJ(W~wDlnutkCy0-c|lI@MWf^4Sz->)qjIsX3DsBk&T z$k1kCiIE{WG zKT;fH*MbU(o<&!2nw`lnsWZ%$zT8t}7Rj~zYNeXEzLBuLaW73w-_V%rj~4!-$+WZArtJFK1-XN{@e)Onk5Pa! zyrNknC*$brPgUHT^nB%|zug3z?(grb;NzE=cih^cPBL&?;%R;VQexhTf?_Q(fvm-Q zKewp#cTUM07Wa`qmsV-lqCOQ2pt8Dx!%NWSdEquY8eM{&W~zVHa*=!yZH3HYw8 z_5j`CrpGJKk>o7H^#@;G+pzcYWJ*Fx3PK(b;uB&=kY5m2Rf*7gvIm3;iRc6Nk>$4!|MT3Q-Yqx{w|4Z%i2Nhbz7 zRegPRgQDp(2f!XQO@-N5Q&4j11|0b%%99hjdzDtm7LfaX%%jKc>|E=)I%H&PEh-~5 z)tkr*G7V#6V>6fI7ST;ooM+iNS}EyVpBh=HsOINVN=*j|Tb#MX`NA|8p^X8P@yM3u z2`!yTD4Hs-rbtmk_IqOI`G6SIfdR{_MI&tSx}Yqk-`?{!$(^txn6{iX%s6iqC!YX&Cc!v8{3)JtNO|No-DgU zs1bLfaPnylw)gE_>Fo0v6nuSWXQzUn|1&s|j1qWOHXhUS{bDk&qWW*z?Wr?iVW<|` zxCAo5%O@u#1`pA_wCw-er}dP^64pPI!#4Hk061X#97rwO`kV*y7=jb zhx-Q$ArM+I+kun(s8~|CPBU6n=}}lnc`%-`c~*h zabeNQ)Wjj1Xl|~(<@%+!8DH+&+7Iuu70~T|P0p;cjQNzOjt+b1P|quQDrI~Q7+3!w z60=H-X4kw2G45svNt;R14Ssk;f0?@j&nR|xcgLu9oyF$QsHI?h5B95mF_?s`H(2om zwvo9+^{5yAFXLM*m?r;*%f+d!IWfp3yLWloIKn-cW^%FrW~xGn{U@+HPcv~C;3|f`)>u@sC9h=tW|6oOVL`*tV!>g6oAP zS$q*E$0==NGvN|fMd~=XnSnhN)%@k7%@G}tGJi>mOGx-*xt^jJA8mHRw0v3SK%?s5 z0QoTxO#P<1x*Btsfs%gJ;drQ$%a^Q7B?S9hN_t&rPv@`ZuU~)37%y}^b;oPy!98gm zol>)?!0$eC>N+3)0zUTH+akaWSGHI0-Xl&Ib>e+ZQrN5DD9mm3j+&+D`q%HPwBY&k zO-$-cL0=dFt>jfM=e68bn;vg`(R$#FU}8>{fTl(ay|H|6zizXSa!X|YdR$_ckM|{= z=nDqIXsN#nmW}LKf8dPa(MXZK~#^cA22b)OIyxfU~`udL^Zyorb?66Tj z2Mf>qga(*<@uMkYH;r_4bxm~o60ZKp5ur*Qy54^4e)~;HK_S`m58bku|4xZlW36LO zMV23B_tGu+pPwjrVO-qvg&p*##^Ton!{!R1MOs|+ou#+}VtPl|cN62WF|qw>@=Gco zgMtcDk_e2NDsqzG#`?_99c%L{__inepL+_65)nl|C}m}5($v)M%@o)j{qcyfprEwm z=g$P&BWxISAlb|eP-j_5P*d2;+{dP=%uenrQUQ<_xpo@d<*4_XTslwgD8)a0^3K@A zaXvrFIaBHe4(--6C=bn!s_!HuTt*seVth4y{UCCYG3r`5*jvz-2GD=x^|0-$KM=e< z(m~KW-?=#LMwhQ%4FNK|C;JzZx+BYq%x2GJ1wT<}?s~k~X^Rkg!nEB2q-}-8#g*li zY`tGQ3S;bFO7M53jgM;}i6YKpF<*}ix;t$udowdPKZ!(}J!|I4U}rBD*zJE+(E@Bk z8rU=y07KP#Y#fk6cO@kyW@hH|7ISOFj$p0U9>bTiVuTR*YgS}rNs0mLTewnXBBsrPJ+EJ zG->|r*&nTH8r6y@wQgREIHCt|Z=Z0E&9s8&g8Z)RUKj0aYk;fh|J_lfsA#aMa?G{J z1n4SBFp%NGDHl78yWOh}2F%N=+}$?0jq=V9RwK$XK=JXh^!s8aI;yHlhE_9M&Qvyq zWO%VmsB?tG{!Y1LJ{bGmrBG6o z*6eQ%x4@((-BY9gxp$DdRiOIN*d6)c!_4k})1`rX6`tkN~83 z+f$Wlu1YLt+^5h)nG?2dT3>ie9K1JKQ=RU5!gVGAgn+-JrM>!eCFZz?rhfa4z1OqZ zaPOr>0wTljg-~PGF9wv#uHgZ3ncGUJTO;Hbgx>}B5Rl%)t!p`I;dis#_{V#BxVXJV zg-C-2qu$nEMLEoZt)Q)4w!bpgx36Q_l44@GsfGFVOG*w8H+?*bFOkCjMK66iPd1kC z3c8-$24Q-1G#H;ez#3MwPq`BIz4(kI?N;LBv;X^J`v^G}7J#Yij)F^g_b5Hi(|W^b z6T1dc?U`eEwl?Z?M2GK676b}Vsn#=l$F3bvo0webDr06QtM?q4{VK!N!!0f-=Y#DR zkkh+MATV4eF4j&N&Zo>V1u(E?N^lkDO?`SX1^_^e+Qjt@Sz_+8IaR$|GH^RESS3xU zxGIPF1@rS=_;h=IE_0@&^M}KcX!vzQVP1onkl0EFjA-W>O(<|V6WWvLsgTQT5q(Zh zu98xire@63Nc@9ke|{dGT3z_<>~1w~E_Q#~CF-?<@t462ExO*9_cT8a#l|KAC}Z^vtCITD9G73H{qnBydTO~I-vAQQC6Vx(I@56jCk zqY=)Vc|kdyX);PIEX<_vzi=RU{3xSPH>zde8Q!~G2PQk)S`fb2gXKrE|-G zjf|1bUuo}To1h0*Ub-es7N}F^O|_I#{gOP#%&l$K-ngGzw@jZ7wJ<%bx#Is{9MOpR zf9RxNf(;}8#S+~Tb^HBagwi?9FG9(GehiRf|BYr+h<5AzuS;%~x6}Urz*OD(|AYSe z|2C-t2Vo)gY)A|9$VZo0Ms@VR_1h=F!Z2c&ONm9 zNa0(o0@I@eLAttHHE*b@#0*d-<>$+nTrA1@5I6apTxGn|YB%SEnAnqZOA9X(siWMT zO^FXVh#*=1gL=5{WzXvBH;DM$pmCi&Y@^z%UX*Cl^UuDB(@_|$;nd~_%dmQ=Y1T*D zY@Nz|RJxOSHg}rT-_#F$$%Y=ZzWd0|y}#>1FUW6}UBw!1GPOFThTiNRS9pD-!eueF z;L@I#ye?x2R$0{1)$L9dT|pn!NQ;48yi6PySdnypK3QioACMCJaZ9dVIjp^(vXcd? zknY*4y4&i-9Ds%^R`?3mln-u6aY}?S+>dyeKy>#r@Yf4J6hhimD<#MuOQ*D<)Y}Vy zCm@Tic6Xlp2B8MC_Y9ND4QW~pj!#T1)}9bMf56H-g7e-`uD3|&EB9%O`Zz4(*W5~w z<4kb5bkADTmc}cwg9AZN|8Vc8Lz(tlJtf96`rqh>Yj^GV&!*W;*ytAKKZUaQ?us^D zcMeu!QyL}#w6#OS+->|K^V#kiqpv#y#q@vW!@T_R#Z$nw)EQ+Y<4z# zRhiiZOrK26u2}J~a;yZ$D}6%K-mK=y{U}Q4i<6+}o72lEarCLgUhQLmW~W9qXFBPUAqXBV}*^H==2zxIb*@KT`ke=grH) zTvuHUg&iDxls%z*H!->|;uzPED;n4~5E_Z!>;}nN>L_CfYY+uVG&O6`FpymW>@56 zTvmoESH2i0Bgbi9L{W@}iAJzlAViMnMAT)>W8PYnsCsN*_t(ia88fTqESwDf?uQZPRRC&6RMCmq{)mjE%TFOCC13VmRkX3e=do#BGL!xuak<{OesIDoczv0AfSo(Ba#=B4 zq;a5K&<0^VcD77`IgJ}pjQ3Z*)o#WHqt25(4<>7^4zN#C47$2xo|WCDTWHbLG+wBY zd!5w42xmI7*?Ce}XooqNRssI`0%8w9v4A_6d&IN=N8@+47JWJqcV;wvv)v;`DS2~Y zDT;u3ggsUKxFG&H)AwyiKw6lu!QWu+HJsNt3uojCLs|8AhuJxYBY%v#?zU$#l@($oSwnsUDRh0+XzruLOo$ z^Uv|b22)vziwrVMK`SZ#)7*mEX+K8pFS`!;k(%}|TkGj>bWOvvCbr(IgV9&;=e5}g z`2YsrsEi`+GUBE?YNj-2-A?xwXuO2WF95vB=-6xB2v^&SOc(EhO z){Z=v@9iZ5_&NnD8*JJ{>$Ja|TDW^Q&g%!X+lnNe7n*XMi?rW3Db=peVf4l{jkuTS z5aw%oFuG}Z?YE!!W73uT0b8IR7D3UY`svlnj;EJmB0cc!1ui@1@u|t!XfwPEbV6d{ zBb+0#kuoz|I5x0PQE9=+WZ9+O(lXc6(Kx;K^SAok$<(CF+qBP%N($;W{bNz61=vAm zn7X?5p7^K3EAiSpzNS;4_ZlW=?P!H!+HVQ8Ovg7i_RM`}tXea%G*kKU=N~KP*(WD1 zCnv{?f4jBg64}_AtFMKNYast@70I*8{RDkyDs9Vng*JSox=GZ-vIXpkU;O+^Wihp? ziJqT?phPIc{b43LAXa7iY$2)&;;KT{lB}YsMho{izYO2UFN2g$x$a^%%&t&QSEa^$ zZ#wKmX_j3#rY6=pJ8j(lgfzRF>S)WTN=vRx(fSwVxd*3h>6x6G(4Ub}Qs(8@=%ok~ zER6?JdzP}^&k|ruG&HmmHycRBQ#)QEO%deCC@NR?f1^R0*q=HOUQEyRZn86kzIA$X zl04rE%A>9BSLKZm{w6y$7TZEzlXG3a><@Iuweca{&32MBi%8E8^f6cyn!htLzsfx1hMAWt9s$5F(Eb zwP4YE0cf%qH>$(fku{d3e`?Phggwmo-VerfytZ6sE2_@=HL`h#U;Kz$GLh>8$yi!Rf}b1IBeF z%?Gj?D-p$%=fv{;J%9SC*Qp z@=2qHALoun^Zi>%R*YL&+!fP3xi~mTJqa}(73~(g#GT`?k{;sK0ep5KI}&xzN=Xit z#S6#ODnRKDpyC6Qr{3nwRM0LIVBxbbaO z7O>Ka3JoE2hx&VA5ylk?@<+hQ%EIDcW6AH0Sxa`Mbbvt<61DX8pTT}HYiNuC#7+El zO+uhEy^0H&eKd>h*1NNDvr_-& zv>}6hvm=#T7L zI<}|x&U;{wGC@Q`-?EjT2t*Z5+ z1uk9>_?@xiT#E=$<@zirU|N!PHSxeK0oLR#-3kAt&F~+BP{!U%-yc z84-E5%BnKW|MG)^f{m?>r}GvCC3P40*Jb@Qsi@b5x&>QrZ?7F)Zt-Z92eJ+j=GFDuHaVz>Ye7f@P# zkh*fMjX>PrG;L0dODKK8%`LB}ip)Pfd9CxI>PJOI$3QQ^oIzT}@xWnENGkpJ?%3&f zp0lT%V3(fD%+FvW(~20+%B%ISEe=L`@?T9z%EJ%&i6Wld14LuDAKxk+1_Wz~peVbE_(-65wABiv%#zEYHI? zyC#*a5C`z)(0Z4n0fxj!Ox-_*<&}`WYs-AT0$|=n!lsK@_*GQ~svF3@1O^m`TdgUVnRVnweP&S5gdITOR9$Td%tymI#bvlQo7Ok z_Iu+3w2xRH2+~eQ^)GuY-k8sr2)lGb&1$rWC z8gNam$wtWKnqE?eT8$RABfEST#SmqTgu5?XL#Nz*hkqCUeQv|9OBSCimz#k;JIETi z^M>q+fp-ABp~Ue6Q%uBbbX@9bra#e*)dBhW!|J~yTmKs0VqpG%X?XcJGQaiTyJ+G} znEn@g;XwF5^}bkK`mb*ceRR=cn?@<%0AxVD`F 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%0D+Cv~e9;xh0ue6+l^ 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 Z_Lpo^ts_4ANP%WDJzf1=);T3K0RTV=ef$6b From 5ca6de310e338329d918d9d964e09abac696c983 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 01:00:46 +0000 Subject: [PATCH 2/7] Quiet native installer output --- scripts/app_build.py | 5 ++ scripts/setup-native.py | 120 ++++++++++++++++++++-------------- scripts/test_manage_native.py | 21 ++++++ 3 files changed, 97 insertions(+), 49 deletions(-) diff --git a/scripts/app_build.py b/scripts/app_build.py index b0c0a05a..e51250a3 100644 --- a/scripts/app_build.py +++ b/scripts/app_build.py @@ -48,6 +48,7 @@ SKIPPED = {"build", ".dart_tool", ".gradle", ".cxx", "local.properties", ".DS_St # generated cannot be mistaken for complete web releases. WEB_CACHE_SCHEMA = "web-release-metadata-v1" WEB_RELEASE_SCHEMA = 1 +VERBOSE = False def flutter_version(app=APP): @@ -103,6 +104,7 @@ def web_cache_complete(entry): def docker(runner, *args, quiet=False): + quiet = quiet or not VERBOSE result = runner(["docker", *args], capture_output=quiet, text=True) if result.returncode: detail = (result.stderr or "").strip().splitlines()[-1:] if quiet else [] @@ -410,12 +412,15 @@ def main(argv=None): parser.add_argument("--publish", action="store_true", help="Publish desktop archive and update feed to this installation") parser.add_argument("--output", type=Path, help="Desktop archive output directory (default: build cache)") parser.add_argument("--flutter", help="Native Flutter executable for macOS and Android (or PIPELINES_FLUTTER/PATH)") + parser.add_argument("--verbose", action="store_true", help="Show full build and tool output") build_mode = parser.add_mutually_exclusive_group() build_mode.add_argument("--native", dest="native", action="store_true", default=None, help="APK: build on this machine with the host Flutter and Android SDK") build_mode.add_argument("--docker", dest="native", action="store_false", help="APK: build in Docker even when a host toolchain exists") args = parser.parse_args(argv) + global VERBOSE + VERBOSE = args.verbose if args.kind in ("linux", "macos"): spec = importlib.util.spec_from_file_location("pipelines_desktop_build", Path(__file__).with_name("app_desktop_build.py")) desktop = importlib.util.module_from_spec(spec) diff --git a/scripts/setup-native.py b/scripts/setup-native.py index 6a3a6b16..7c343d28 100644 --- a/scripts/setup-native.py +++ b/scripts/setup-native.py @@ -72,6 +72,29 @@ class Setup: self.popen = popen self.resolver = resolver or release_lookup.resolve_ntfy self.environ = environ if environ is not None else os.environ + self.verbose = False + self.install_log = None + + def command(self, arguments, **kwargs): + """Run an installer command, keeping tool output out of normal output.""" + if self.verbose: + return self.runner(arguments, **kwargs) + kwargs = dict(kwargs) + kwargs.update(capture_output=True, text=True) + result = self.runner(arguments, **kwargs) + if self.install_log: + self.install_log.parent.mkdir(parents=True, exist_ok=True) + with self.install_log.open("a") as log: + log.write(f"$ {shlex.join(map(str, arguments))}\n") + if result.stdout: + log.write(result.stdout) + if result.stderr: + log.write(result.stderr) + log.write(f"[exit {result.returncode}]\n") + return result + + def step(self, text): + print(f"• {text}") # --- detection ------------------------------------------------------- @@ -261,7 +284,7 @@ class Setup: for field, flag in (("model", "--model"), ("pipeline_model", "--pipeline-model")): if self._valid_model(current.get(field)): command.extend([flag, current[field]]) - result = self.runner(command, cwd=str(Path.home()), env=dict(self.environ)) + result = self.command(command, cwd=str(Path.home()), env=dict(self.environ)) if result.returncode: raise ValueError("Model selection did not complete; native setup is not ready. Rerun ./install or supply --model PROVIDER/MODEL.") return self.configure_harnesses(harness, model, allow_picker=False) @@ -340,7 +363,7 @@ class Setup: # Tool-manager shims dispatch by their invoked name (for example Volta). # Resolving the symlink would run volta-shim instead of node. node = str(Path(shutil.which("node")).absolute()) - version = self.runner([node, "--version"], capture_output=True, text=True) + version = self.command([node, "--version"], capture_output=True, text=True) try: major = int(version.stdout.strip().removeprefix("v").split(".")[0]) except (ValueError, AttributeError): @@ -425,7 +448,7 @@ class Setup: raise ValueError("Docker is not running, so the web app cannot be built. The server is never " "installed without it; start Docker and rerun ./install.") try: - built = app_build.build("web", runner=self.runner, + built = app_build.build("web", runner=self.command, arguments=app_build.update_signing.dart_defines(self.environ)) except RuntimeError as error: raise ValueError(f"The web app build failed ({error}); nothing was installed") from None @@ -453,7 +476,7 @@ class Setup: plist = Path.home() / f"Library/LaunchAgents/{self.LEGACY_WEB_LABEL}.plist" if not plist.is_file(): return - self.runner(["launchctl", "bootout", f"gui/{os.getuid()}/{self.LEGACY_WEB_LABEL}"], + self.command(["launchctl", "bootout", f"gui/{os.getuid()}/{self.LEGACY_WEB_LABEL}"], capture_output=True, text=True) plist.rename(plist.with_name(plist.name + ".disabled")) print(f"Retired the old standalone web agent {self.LEGACY_WEB_LABEL} (kept as {plist.name}.disabled).") @@ -468,7 +491,7 @@ class Setup: if not tailscale: raise ValueError(f"The public web URL {public_url} is a tailnet address but tailscale is not on PATH") port = parsed.port or 443 - result = self.runner([tailscale, "serve", "--bg", f"--https={port}", f"http://127.0.0.1:{web_port}"], + result = self.command([tailscale, "serve", "--bg", f"--https={port}", f"http://127.0.0.1:{web_port}"], capture_output=True, text=True) if result.returncode: raise ValueError(f"tailscale serve could not point {public_url} at the web app: " @@ -488,7 +511,7 @@ class Setup: shutil.rmtree(staging, ignore_errors=True) staging.mkdir(parents=True) for command in self.COMMANDS: - result = self.runner( + result = self.command( ["go", "build", "-trimpath", "-o", str(staging / command), "./cmd/" + command], cwd=str(self.directory)) if result.returncode: @@ -557,7 +580,7 @@ class Setup: return f"{version} (commit {commit})" if commit else str(version) def install_skill(self, prefix): - result = self.runner([str(prefix / "bin/pipelines"), "skill", "install"], cwd=str(self.directory)) + result = self.command([str(prefix / "bin/pipelines"), "skill", "install"], cwd=str(self.directory)) if result.returncode: raise ValueError("pipelines skill install failed; the native install is incomplete") @@ -588,10 +611,10 @@ class Setup: return path self.require_compiler() pinned = f"{module}@{version}" - result = self.runner(["go", "mod", "download", pinned], cwd=str(self.directory)) + result = self.command(["go", "mod", "download", pinned], cwd=str(self.directory)) if result.returncode: raise ValueError(f"go mod download {pinned} failed; the native install is incomplete") - cache = self.runner(["go", "env", "GOMODCACHE"], cwd=str(self.directory), + cache = self.command(["go", "env", "GOMODCACHE"], cwd=str(self.directory), capture_output=True, text=True) if cache.returncode or not (cache.stdout or "").strip(): raise ValueError("Could not locate the Go module cache to build ntfy from") @@ -606,7 +629,7 @@ class Setup: shutil.copytree(source, checkout, symlinks=True) # The module cache is read-only and carries no built web assets; the # upstream Makefile creates the same placeholders for local builds. - self.runner(["chmod", "-R", "u+w", str(checkout)]) + self.command(["chmod", "-R", "u+w", str(checkout)]) (checkout / "server/docs").mkdir(parents=True, exist_ok=True) (checkout / "server/site").mkdir(parents=True, exist_ok=True) (checkout / "server/docs/index.html").touch() @@ -614,7 +637,7 @@ class Setup: built = Path(staging) / "ntfy" env = dict(self.environ) env["CGO_ENABLED"] = "1" - build = self.runner( + build = self.command( ["go", "build", "-trimpath", "-tags", NTFY_BUILD_TAGS, "-ldflags", f"-s -w -X main.version={version}", "-o", str(built), "."], cwd=str(checkout), env=env) @@ -670,7 +693,7 @@ class Setup: if password is not None: # `ntfy user add` takes the password from here instead of a prompt. env["NTFY_PASSWORD"] = password - result = self.runner([str(prefix / "bin/ntfy"), *args], capture_output=capture, text=True, env=env) + result = self.command([str(prefix / "bin/ntfy"), *args], capture_output=capture, text=True, env=env) if result.returncode: step = " ".join(args[:2]) raise ValueError(f"ntfy {step} failed; the native install is incomplete") @@ -726,7 +749,7 @@ class Setup: def docker_volumes(self): try: - result = self.runner(["docker", "volume", "ls", "--format", "{{.Name}}"], + result = self.command(["docker", "volume", "ls", "--format", "{{.Name}}"], capture_output=True, text=True) except FileNotFoundError: # No Docker CLI at all: there is no Docker installation to migrate. @@ -743,7 +766,7 @@ class Setup: return tuple(name for name in ("pipelines_pipelines-data", "pipelines_ntfy-data") if name in names) def _migration_image(self): - result = self.runner(["docker", "image", "ls", "--format", "{{.Repository}}:{{.Tag}}"], + result = self.command(["docker", "image", "ls", "--format", "{{.Repository}}:{{.Tag}}"], capture_output=True, text=True) if result.returncode: return None @@ -759,12 +782,12 @@ class Setup: print(f"Keeping existing native {destination.name}; not overwriting it during migration.") return False name = f"pipelines-migrate-{os.getpid()}" - created = self.runner(["docker", "create", "--name", name, "--volume", f"{volume}:/mnt:ro", image], + created = self.command(["docker", "create", "--name", name, "--volume", f"{volume}:/mnt:ro", image], capture_output=True, text=True) if created.returncode: raise ValueError(f"Could not open Docker volume {volume} for migration; install aborted") try: - result = self.runner(["docker", "cp", f"{name}:/mnt/{inner}", str(destination)], + result = self.command(["docker", "cp", f"{name}:/mnt/{inner}", str(destination)], capture_output=True, text=True) if result.returncode: raise ValueError(f"Could not copy {inner} from Docker volume {volume}; install aborted") @@ -774,12 +797,12 @@ class Setup: for suffix in ("-wal",): sidecar = Path(str(destination) + suffix) sidecar.unlink(missing_ok=True) - copy = self.runner(["docker", "cp", f"{name}:/mnt/{inner}{suffix}", str(sidecar)], + copy = self.command(["docker", "cp", f"{name}:/mnt/{inner}{suffix}", str(sidecar)], capture_output=True, text=True) if copy.returncode or not sidecar.exists() or sidecar.stat().st_size == 0: sidecar.unlink(missing_ok=True) finally: - self.runner(["docker", "rm", "-f", name], capture_output=True, text=True, check=False) + self.command(["docker", "rm", "-f", name], capture_output=True, text=True, check=False) return True def migrate_docker(self, prefix, replace=False): @@ -871,9 +894,12 @@ class Setup: resolution = self.resolve_ntfy() # All or nothing: the web app and the server are both built before # either is installed, and a failed build leaves the old pair running. + self.step("Building the web app") web_build = self.build_app_web() self.prepare_layout(prefix) + self.step("Building Pipelines") self.build(prefix) + self.step("Configuring the installation") web = self.configure_web(prefix, args, web_build) self.install_binaries(prefix) self.check_path_shadow(prefix) @@ -909,7 +935,7 @@ class Setup: if self.environ.get(key): opencode_env[key] = self.environ[key] opencode_env["PIPELINES_DEFAULT_MODEL"] = args.model or pipeline_model - web_url = f"http://{web_access.default_url_host(web, lan_ip, web_access.tailnet_ipv4(self.runner))}:{args.web_port}" + web_url = f"http://{web_access.default_url_host(web, lan_ip, web_access.tailnet_ipv4(self.command))}:{args.web_port}" opencode_env["PIPELINES_WEB_PUBLIC_URL"] = web_public_url or web_url path_value = str(prefix / "bin") + os.pathsep + self.environ.get("PATH", "") manifest = { @@ -949,14 +975,9 @@ class Setup: # Docker address. endpoint = f"ws://127.0.0.1:{args.port}/connect" client_path = configure.configure_client(endpoint, self.environ) - print(f"Saved native client default: {endpoint} ({client_path}). Restart the TUI.") - override = self.environ.get("PIPELINES_URL", "") - if override and override != endpoint: - print("WARNING: PIPELINES_URL overrides the saved native address; unset it or pass --url explicitly.") - print(f"Native Pipelines installed at {prefix}." - f" ntfy {resolution.get('tag') or resolution.get('version')} was built from source.") + self.step("Starting the services") # Parity with the Docker installer: leave the server and ntfy running. - started = self.runner([python, str(prefix / "lib/manage.py"), "start", "--prefix", str(prefix)]) + started = self.command([python, str(prefix / "lib/manage.py"), "start", "--prefix", str(prefix)]) if started.returncode: raise ValueError( "The native services were installed but could not be started; run " @@ -965,29 +986,18 @@ class Setup: f"{args.port}, {args.ntfy_port} and {args.web_port} are free (a running Docker installation may use them).") self.retire_legacy_web() self.serve_on_tailnet(opencode_env["PIPELINES_WEB_PUBLIC_URL"], args.web_port) - print(f"ntfy is configured for {base_url}; server, web proxy and ntfy have login autostart ({service_path}).") - print("Phone notifications: subscribe to the 'pipelines' topic as phone-reader with the web password.") - print(f"Web: {web_url}/ (sign-in password in {web['auth_file']}; existing credentials retained).") - print("Web proxy access: " + ("loopback + tailnet" + (" + LAN" if args.web_lan else "") - if args.web_host == web_access.TAILNET else f"bound to {args.web_host}")) - for note in (*web_warnings, web_access.public_url_warning(opencode_env["PIPELINES_WEB_PUBLIC_URL"], web), - web_access.firewall_note(self.runner)): - if note: - print(note) - print("Login autostart is already enabled. To enable/start it again, run:\n " - + shlex.join([str(prefix / "bin/pipelines"), "service", "enable"])) - print("Android app (optional, slower): ./install --apk builds it in Docker and offers it at " - f"{opencode_env['PIPELINES_WEB_PUBLIC_URL']}/updates/.") - print("Configured server role: " + ("single-user authoring enabled (web pipeline creation/publication allowed)." - if allow_authoring else "execution-only (pipeline publication disabled).")) - if args.bind_address == "0.0.0.0": - print(f"Phone client server URL: ws://{lan_ip}:{args.port}/connect " - "(use a workspace path that exists on this server).") - else: - print(f"Unauthenticated API bound to {args.bind_address}:{args.port}; use the authenticated web URL.") + print("\nPipelines installed") + print(f"Install location: {prefix}") app_build.print_web_urls(manifest, lan_host=lan_ip) - print("OpenCode is required (default stage and chat harness) and is set up by ./install.") - print("Next: set up your agent harnesses: pipelines harness setup claude|codex|opencode|pi") + bin_dir = prefix / "bin" + path_entries = self.environ.get("PATH", "").split(os.pathsep) + if str(bin_dir) not in path_entries: + shell = Path(self.environ.get("SHELL", "")).name + rc = "~/.bashrc" if shell == "bash" else "~/.zshrc" if shell == "zsh" else "~/.profile" + displayed_bin = "$HOME/.local/share/pipelines/bin" if bin_dir == Path.home() / ".local/share/pipelines/bin" else str(bin_dir) + print(f"Add commands to PATH: echo 'export PATH=\"{displayed_bin}:$PATH\"' >> {rc}") + print(f"Update later: {prefix / 'bin/pipelines'} update") + print(f"Set up harnesses: {prefix / 'bin/pipelines'} harness setup claude|codex|opencode|pi") def arguments(argv=None): @@ -1020,17 +1030,29 @@ def arguments(argv=None): help="Start with empty data even when an earlier Docker installation's volumes exist") parser.add_argument("--replace-data", action="store_true", help="Allow Docker migration to replace an existing native database/auth store") + parser.add_argument("--verbose", action="store_true", help="Show full build and tool output") parsed = parser.parse_args(argv) parsed.argv = list(sys.argv[1:] if argv is None else argv) return parsed if __name__ == "__main__": + installer = Setup(Path(__file__).resolve().parents[1]) try: - Setup(Path(__file__).resolve().parents[1]).run(arguments()) + parsed = arguments() + installer.verbose = parsed.verbose + app_build.VERBOSE = parsed.verbose + prefix = parsed.prefix or Path(os.environ.get("PIPELINES_PREFIX") or DEFAULT_PREFIX).expanduser().resolve() + (prefix / "logs").mkdir(parents=True, exist_ok=True) + installer.install_log = prefix / "logs/install.log" + installer.run(parsed) except KeyboardInterrupt: print("\nNative setup canceled; existing configuration and data were retained.", file=sys.stderr) sys.exit(130) except (ValueError, OSError, json.JSONDecodeError, subprocess.SubprocessError, ZoneInfoNotFoundError) as error: + if installer.install_log and installer.install_log.is_file() and not installer.verbose: + tail = installer.install_log.read_text(errors="replace").splitlines()[-8:] + detail = "\n".join(tail) + sys.exit(f"Native setup incomplete: {error}\nBuild/tool log: {installer.install_log}\n{detail}") sys.exit(f"Native setup incomplete: {error}") diff --git a/scripts/test_manage_native.py b/scripts/test_manage_native.py index af699494..0463977f 100644 --- a/scripts/test_manage_native.py +++ b/scripts/test_manage_native.py @@ -26,6 +26,27 @@ class FakeProcess: class ManageNativeTests(unittest.TestCase): + def test_native_command_logs_tool_output_when_not_verbose(self): + with tempfile.TemporaryDirectory() as directory: + log = Path(directory) / "logs/install.log" + calls = [] + + def runner(command, **kwargs): + calls.append((command, kwargs)) + return subprocess.CompletedProcess(command, 1, stdout="build output\n", stderr="failure\n") + + installer = setup_native.Setup(directory, runner=runner) + installer.install_log = log + result = installer.command(["go", "build", "./cmd/pipelines"]) + self.assertEqual(result.returncode, 1) + self.assertIn("build output", log.read_text()) + self.assertIn("failure", log.read_text()) + self.assertTrue(calls[0][1]["capture_output"]) + + def test_native_arguments_accept_verbose(self): + parsed = setup_native.arguments(["--verbose"]) + self.assertTrue(parsed.verbose) + def service_config(self, home, system): config = self.config(home / "prefix") config["opencode_env"] = {"XDG_CONFIG_HOME": str(home / ".config")} From 5834b9c504b52df4f615e61a769afdf5fccad083 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 01:01:25 +0000 Subject: [PATCH 3/7] Mark the chat center-stage edges Add subtle outlineVariant hairlines around the centered chat column so its boundary remains clear without changing the reading width or split layout. Cover light and dark center-stage visibility with focused widget and geometry tests. --- .../workspace/chat_center_stage_edges.dart | 48 +++++++++++++ .../workspace/chat_workspace_surface.dart | 7 ++ app/notes/center-stage-column-edges.md | 40 +++++++++++ .../workspace/chat_center_stage_test.dart | 69 +++++++++++++++++++ 4 files changed, 164 insertions(+) create mode 100644 app/lib/features/chat/workspace/chat_center_stage_edges.dart create mode 100644 app/notes/center-stage-column-edges.md diff --git a/app/lib/features/chat/workspace/chat_center_stage_edges.dart b/app/lib/features/chat/workspace/chat_center_stage_edges.dart new file mode 100644 index 00000000..27f16de1 --- /dev/null +++ b/app/lib/features/chat/workspace/chat_center_stage_edges.dart @@ -0,0 +1,48 @@ +import 'package:flutter/material.dart'; + +import 'chat_center_stage_layout.dart'; + +/// Hairline thickness of a center-stage edge. +const double chatCenterStageEdgeThickness = 1; + +/// Where the stage's two hairlines sit: each in the gap beside the stage, or on +/// the workspace edge when the stage reaches it. Returns (left, right). +(Rect, Rect) chatCenterStageEdgeRects(Rect stage, Size size) { + final half = chatCenterStageGap / 2; + const t = chatCenterStageEdgeThickness; + final maxX = size.width - t; + final leftX = stage.left <= 0 + ? 0.0 + : (stage.left - half - t / 2).clamp(0.0, maxX).toDouble(); + final rightX = stage.right >= size.width + ? maxX + : (stage.right + half - t / 2).clamp(0.0, maxX).toDouble(); + return ( + Rect.fromLTWH(leftX, 0, t, size.height), + Rect.fromLTWH(rightX, 0, t, size.height), + ); +} + +/// The stage's left and right hairlines in the workspace's stack, drawn in the +/// theme's outlineVariant so the centred chat column has a visible boundary. +/// Only center stage calls this; the split layout keeps its own dividers. +List chatCenterStageEdges({ + required BuildContext context, + required Rect rect, + required Size size, +}) { + final color = Theme.of(context).colorScheme.outlineVariant; + final (left, right) = chatCenterStageEdgeRects(rect, size); + return [ + Positioned.fromRect( + key: const ValueKey('chat-center-stage-edge-left'), + rect: left, + child: ColoredBox(color: color), + ), + Positioned.fromRect( + key: const ValueKey('chat-center-stage-edge-right'), + rect: right, + child: ColoredBox(color: color), + ), + ]; +} diff --git a/app/lib/features/chat/workspace/chat_workspace_surface.dart b/app/lib/features/chat/workspace/chat_workspace_surface.dart index ea55ea46..d958d5bd 100644 --- a/app/lib/features/chat/workspace/chat_workspace_surface.dart +++ b/app/lib/features/chat/workspace/chat_workspace_surface.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'chat_center_stage_edges.dart'; import 'chat_center_stage_motion.dart'; import 'chat_center_stage_strip.dart'; import 'chat_mobile_panes.dart'; @@ -138,6 +139,12 @@ Widget chatWorkspaceSurface({ for (final pane in livePanes) if (pane.key == ValueKey('chat-workspace-${motion.topPaneId}')) pane, + if (stage.stage case final layout?) + ...chatCenterStageEdges( + context: context, + rect: stage.rectFor(layout.stageId)!, + size: size, + ), if (mobile?.peekId != null && !motion.isAnimating) Positioned( top: mobile!.contentHeight - 12, diff --git a/app/notes/center-stage-column-edges.md b/app/notes/center-stage-column-edges.md new file mode 100644 index 00000000..999f8326 --- /dev/null +++ b/app/notes/center-stage-column-edges.md @@ -0,0 +1,40 @@ +# Center stage column edges + +## Change +- In center stage (Alt+E / Option+E), the centred chat column had no visible + boundary: its neighbours are strips or the workspace background, so the + column's end read as unfinished. +- Added two 1px `outlineVariant` hairlines (`ChatCenterStageEdges` in + `app/lib/features/chat/workspace/chat_center_stage_edges.dart`). Each sits + centred in the 12px gap beside the stage, or on the workspace edge when the + stage reaches it. +- Painted from `chat_workspace_surface.dart`, only while a stage layout exists. + The split layout, phone/collapsed layouts and single-chat workspaces draw + nothing new. +- Reading width is unchanged (stage stays `chatCenterStageWidth`, 950 at the + test size). The lines travel with the stage's animated rectangle. + +## Focused results +- `tool/memwatch/full.sh 'test/features/chat/workspace/chat_center_stage_test.dart'` + → PASS: 21 passed, 0 failed, 0 skipped; peak 893 MB; 8s; exit 0. + New tests among them: + - `the stage edges sit in the gaps beside the stage, or on the workspace edge` + - `center stage draws the column edges in the light theme, only on stage` + - `center stage draws the column edges in the dark theme, only on stage` +- `tool/analyze.sh` → clean, exit 0. +- Not run: other `test/features/chat/workspace/*` files use `ChatWorkspace` + without `centerStage` on stage, so the new branch is not reached there. The + land gate runs the suites. + +## Affected states (code-level only) +- Center stage on, 3 panes, light and dark: both hairlines present, colour is + the theme's `outlineVariant`. +- Center stage off: no hairlines (asserted in both themes). +- Stage with a neighbour on each side (gaps) and stage at a workspace edge + (line on the edge) are both covered by the geometry test. + +## Limitations +- No browser or device capture was made; `ui-review` owns visual evidence. + Visual weight of a 1px `outlineVariant` line in light and dark is unverified. +- Hairlines hide at once when leaving center stage (same as the split + dividers); they do not fade. diff --git a/app/test/features/chat/workspace/chat_center_stage_test.dart b/app/test/features/chat/workspace/chat_center_stage_test.dart index 52bc959f..1c637ef2 100644 --- a/app/test/features/chat/workspace/chat_center_stage_test.dart +++ b/app/test/features/chat/workspace/chat_center_stage_test.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/chat/workspace/chat_center_stage_controller.dart'; +import 'package:pipelines_app/features/chat/workspace/chat_center_stage_edges.dart'; import 'package:pipelines_app/features/chat/workspace/chat_center_stage_keys.dart'; import 'package:pipelines_app/features/chat/workspace/chat_center_stage_layout.dart'; import 'package:pipelines_app/features/chat/workspace/chat_center_stage_strip.dart'; @@ -82,7 +83,10 @@ Widget host( List? fieldKeys, bool actionBars = false, bool filesProbe = false, + ThemeMode themeMode = ThemeMode.light, }) => MaterialApp( + themeMode: themeMode, + darkTheme: ThemeData.dark(), home: MediaQuery( data: MediaQueryData(disableAnimations: reduceMotion), child: Scaffold( @@ -410,6 +414,71 @@ void main() { }, ); + test( + 'the stage edges sit in the gaps beside the stage, or on the workspace edge', + () { + final (left, right) = chatCenterStageEdgeRects( + const Rect.fromLTWH(418, 0, 950, 800), + const Size(1368, 800), + ); + expect(left, const Rect.fromLTWH(411.5, 0, 1, 800)); + expect(right, const Rect.fromLTWH(1367, 0, 1, 800)); + + // A stage that reaches the workspace's right edge keeps its hairline inside. + final (edgeLeft, edgeRight) = chatCenterStageEdgeRects( + const Rect.fromLTWH(650, 0, 950, 800), + const Size(1600, 800), + ); + expect(edgeLeft, const Rect.fromLTWH(643.5, 0, 1, 800)); + expect(edgeRight, const Rect.fromLTWH(1599, 0, 1, 800)); + }, + ); + + for (final mode in [ThemeMode.light, ThemeMode.dark]) { + testWidgets( + 'center stage draws the column edges in the ${mode.name} theme, only on stage', + (tester) async { + wide(tester); + final workspace = threePanes(); + final stage = ChatCenterStageController(store: _MemoryStore()); + addTearDown(workspace.dispose); + addTearDown(stage.dispose); + await tester.pumpWidget(host(workspace, stage, themeMode: mode)); + await tester.pumpAndSettle(); + const leftKey = ValueKey('chat-center-stage-edge-left'); + const rightKey = ValueKey('chat-center-stage-edge-right'); + expect(find.byKey(leftKey), findsNothing); + expect(find.byKey(rightKey), findsNothing); + + stage.value = true; + await tester.pumpAndSettle(); + final outline = Theme.of( + tester.element(find.byType(ChatWorkspace)), + ).colorScheme.outlineVariant; + for (final key in [leftKey, rightKey]) { + expect( + tester + .widget( + find.descendant( + of: find.byKey(key), + matching: find.byType(ColoredBox), + ), + ) + .color, + outline, + ); + } + // The hairlines frame the stage; the reading width is unchanged. + expect(widthOf(tester, 'three'), 950); + + stage.value = false; + await tester.pumpAndSettle(); + expect(find.byKey(leftKey), findsNothing); + expect(find.byKey(rightKey), findsNothing); + }, + ); + } + testWidgets('reduced motion stages at once', (tester) async { wide(tester); final workspace = threePanes(); From 1e07ab1ddc053f15d01869312b7a79c76f4cbfd7 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 01:02:11 +0000 Subject: [PATCH 4/7] Remove Templates from Settings Keep the Templates destination available through its direct routes while removing the obsolete Settings entry and wiring. Update navigation coverage and document the preserved route behavior. --- app/lib/application/pipelines_app.dart | 1 - app/lib/features/settings/settings_keys.dart | 1 - .../settings/settings_schedules_section.dart | 2 +- .../features/settings/settings_screen.dart | 6 -- .../settings/settings_templates_section.dart | 30 -------- .../settings/settings_topic_pages.dart | 9 +-- app/notes/remove-templates-from-settings.md | 58 +++++++++++++++ .../templates_behind_bar_test.dart | 8 +- .../application/templates_wiring_test.dart | 74 ++++++------------- .../settings/settings_library_test.dart | 66 +++++++++++++++++ 10 files changed, 155 insertions(+), 100 deletions(-) delete mode 100644 app/lib/features/settings/settings_templates_section.dart create mode 100644 app/notes/remove-templates-from-settings.md create mode 100644 app/test/features/settings/settings_library_test.dart diff --git a/app/lib/application/pipelines_app.dart b/app/lib/application/pipelines_app.dart index d44478e7..6746219e 100644 --- a/app/lib/application/pipelines_app.dart +++ b/app/lib/application/pipelines_app.dart @@ -923,7 +923,6 @@ class _PipelinesAppState extends State store: SharedPreferencesSettingsStore( serverId: widget.serverId ?? '', ), - onOpenTemplates: _delegate.openTemplates, notifications: _notifications, deliveryService: _deliveryService, deliveryServiceController: _deliveryController, diff --git a/app/lib/features/settings/settings_keys.dart b/app/lib/features/settings/settings_keys.dart index cd9a56b6..337757ff 100644 --- a/app/lib/features/settings/settings_keys.dart +++ b/app/lib/features/settings/settings_keys.dart @@ -9,7 +9,6 @@ abstract final class SettingsKeys { static const reconnect = ValueKey('settings.reconnect'); static const workspace = ValueKey('settings.workspace'); static const saveWorkspace = ValueKey('settings.saveWorkspace'); - static const templates = ValueKey('settings.templates'); static const schedules = ValueKey('settings.schedules'); static const keyboardShortcuts = ValueKey( 'settings.keyboardShortcuts', diff --git a/app/lib/features/settings/settings_schedules_section.dart b/app/lib/features/settings/settings_schedules_section.dart index a531ad0a..54f4efed 100644 --- a/app/lib/features/settings/settings_schedules_section.dart +++ b/app/lib/features/settings/settings_schedules_section.dart @@ -6,7 +6,7 @@ import 'settings_row.dart'; /// The Settings entry to the saved-schedule list. /// /// The row only opens the route; the list's own controller performs the single -/// `list_schedules` read, exactly like the Templates entry. +/// `list_schedules` read. const String settingsSchedulesLabel = 'Browse schedules'; const String settingsSchedulesSecondary = 'Saved run configurations for every pipeline.'; diff --git a/app/lib/features/settings/settings_screen.dart b/app/lib/features/settings/settings_screen.dart index f63093ec..1e63875d 100644 --- a/app/lib/features/settings/settings_screen.dart +++ b/app/lib/features/settings/settings_screen.dart @@ -33,7 +33,6 @@ import 'security/settings_security_section.dart'; import 'settings_updates_section.dart'; import '../updates/app_updates.dart'; import 'settings_store.dart'; -import 'settings_templates_section.dart'; import 'server_connections.dart'; import 'saved_servers_section.dart'; import 'managed_connection_section.dart'; @@ -58,7 +57,6 @@ class SettingsScreen extends StatefulWidget { this.ping, this.embedded = false, this.navigationScope, - this.onOpenTemplates, this.onOpenSchedules, this.notifications, this.showSignIn = false, @@ -108,10 +106,6 @@ class SettingsScreen extends StatefulWidget { /// The logical server scope used to restore the last Settings category. final String? navigationScope; - /// Opens the Templates gallery. Null keeps Settings standalone/incomplete - /// without a dead row that would go nowhere. - final VoidCallback? onOpenTemplates; - /// Opens the saved-schedule list above Settings. final VoidCallback? onOpenSchedules; diff --git a/app/lib/features/settings/settings_templates_section.dart b/app/lib/features/settings/settings_templates_section.dart deleted file mode 100644 index 0334b5ad..00000000 --- a/app/lib/features/settings/settings_templates_section.dart +++ /dev/null @@ -1,30 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'settings_keys.dart'; -import 'settings_row.dart'; - -/// The Settings entry to the Templates gallery. -/// -/// The row wording matches the web Settings page: `Browse templates` with the -/// server-catalogue secondary line. It only opens the route; loading the -/// catalogue is the gallery's own read. -const String settingsTemplatesLabel = 'Browse templates'; -const String settingsTemplatesSecondary = - 'Reusable pipeline definitions offered by the server.'; - -/// A navigation row (chevron) for a Settings group. -class SettingsTemplatesSection extends StatelessWidget { - const SettingsTemplatesSection({super.key, required this.onOpen}); - - final VoidCallback onOpen; - - @override - Widget build(BuildContext context) => SettingsRow( - key: SettingsKeys.templates, - leading: const Icon(Icons.widgets_outlined), - title: const Text(settingsTemplatesLabel), - subtitle: const Text(settingsTemplatesSecondary), - chevron: true, - onTap: onOpen, - ); -} diff --git a/app/lib/features/settings/settings_topic_pages.dart b/app/lib/features/settings/settings_topic_pages.dart index 2be494de..8d89bd49 100644 --- a/app/lib/features/settings/settings_topic_pages.dart +++ b/app/lib/features/settings/settings_topic_pages.dart @@ -87,16 +87,11 @@ extension _SettingsTopicPages on _SettingsScreenState { leadingRows: true, children: const [SettingsKeyboardShortcutsSection()], ), - if (widget.onOpenSchedules != null || widget.onOpenTemplates != null) + if (widget.onOpenSchedules case final open?) SettingsGroup( title: 'Library', leadingRows: true, - children: [ - if (widget.onOpenSchedules case final open?) - SettingsSchedulesSection(onOpen: open), - if (widget.onOpenTemplates case final open?) - SettingsTemplatesSection(onOpen: open), - ], + children: [SettingsSchedulesSection(onOpen: open)], ), ], ), diff --git a/app/notes/remove-templates-from-settings.md b/app/notes/remove-templates-from-settings.md new file mode 100644 index 00000000..00e47a74 --- /dev/null +++ b/app/notes/remove-templates-from-settings.md @@ -0,0 +1,58 @@ +# Remove the Templates entry from Settings + +## What changed +- Deleted `lib/features/settings/settings_templates_section.dart` (the + `Browse templates` chevron row and its label constants). +- Removed `SettingsKeys.templates`, the `onOpenTemplates` parameter and its + doc comment from `SettingsScreen`, and the Templates row from the Tools + topic's Library group (`settings_topic_pages.dart`). The Library group now + renders only when a Schedules route is supplied. +- `pipelines_app.dart` no longer passes `onOpenTemplates`. +- `settings_schedules_section.dart`: doc comment no longer refers to the + Templates entry. + +## Kept on purpose +- The Templates destination (`lib/application/templates_destination.dart`), + the `AppRoute.templates` kind, its codec (`/templates`, `/settings/templates` + aliases), `AppRouter.openTemplates`/`closeTemplates`, and the templates + feature under `lib/features/templates/`. They remain reachable by URL + (`/templates`, `/settings/templates`) and by `AppRouter.openTemplates`, so + they are not solely reachable from the removed row. Removing them is a + separate follow-up if the route itself should go. + +## Tests +- `test/application/templates_wiring_test.dart` and + `test/application/templates_behind_bar_test.dart` used to reach Templates by + tapping the Settings row. They now boot at `/pipelines` and push `/templates` + by route, then assert the same embedded page, bar, refresh, detail and + create expectations. The Settings-only assertions (edited server URL + surviving the detour, the Settings row being present, the `ping` answer) + were removed with the row. +- `readTemplates` in `templates_wiring_test.dart` settles the frame after the + list reply before answering `validate`, because the shell's own `ping` + shares the request queue. +- New `test/features/settings/settings_library_test.dart`: Tools shows + `Library` with Schedules and no `Browse templates`; Schedules still calls its + route; without a Schedules route the Library group is absent. + +## Focused results (app/, `tool/memwatch/full.sh`) +- Baseline on the untouched worktree, 4 files: 31 passed, 0 failed. +- After the change, 10 files (the 4 above plus `settings_library_test.dart`, + `settings_topic_restore_test.dart`, `settings_screen_test.dart`, + `settings_layout_test.dart`, `settings_tabs_test.dart`, + `settings_shell_background_test.dart`): 61 passed, 0 failed. +- `tool/analyze.sh`: clean. +- Not run: the whole `test` directory (left to the land gate), and no UI + capture was made. + +## Affected states (not yet captured) +- Settings > Tools: Library group shows Schedules only. +- `/templates` and `/settings/templates` deep links: still open the embedded + Templates page; Back returns to Settings. + +## Known leftovers +- `app/tool/templates_wiring_probe*`, `templates_gallery_probe*` and + `template_create_probe.dart` drive Settings > Templates and will fail + against this build. They were not edited or run here. +- `app/PARITY.md`, `app/WORK.md` and `app/pipelines/flutter-design.md` may + still describe the Settings entry; they were not reviewed. diff --git a/app/test/application/templates_behind_bar_test.dart b/app/test/application/templates_behind_bar_test.dart index 4036a787..1ed93027 100644 --- a/app/test/application/templates_behind_bar_test.dart +++ b/app/test/application/templates_behind_bar_test.dart @@ -8,7 +8,7 @@ import 'package:pipelines_app/ui/adaptive/segmented_bar.dart'; import '../core/transport/pipelines_client_test.dart' show FakeChannel; import '../features/pipelines/fixtures.dart'; import 'pipelines_replies.dart'; -import 'templates_wiring_test.dart' show openSettings, openTemplates, pumpApp; +import 'templates_wiring_test.dart' show pumpApp, readTemplates; /// The app-level Templates page: one bar (Back + Refresh), the gallery and an /// open template reach the top edge, start below the bar at rest and scroll @@ -23,8 +23,10 @@ void main() { addTearDown(provider.dispose); await pumpApp(tester, channel: channel, client: client, provider: provider); await replyPipelines(tester, channel, PipelineFixture()); - await openSettings(tester, channel, provider); - await openTemplates(tester, channel, provider); + await provider.didPushRouteInformation( + RouteInformation(uri: Uri.parse('/templates')), + ); + await readTemplates(tester, channel); await tester.pumpAndSettle(); final bar = find.ancestor( diff --git a/app/test/application/templates_wiring_test.dart b/app/test/application/templates_wiring_test.dart index a3afe0dd..20bf9c87 100644 --- a/app/test/application/templates_wiring_test.dart +++ b/app/test/application/templates_wiring_test.dart @@ -5,7 +5,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/application/pipelines_app.dart'; import 'package:pipelines_app/application/templates_destination.dart'; import 'package:pipelines_app/core/transport/pipelines_client.dart'; -import 'package:pipelines_app/features/settings/settings_keys.dart'; import 'package:pipelines_app/features/templates/screen.dart'; import 'package:pipelines_app/features/templates/ui/template_create_wording.dart'; import 'package:pipelines_app/features/templates/ui/template_detail.dart' @@ -18,7 +17,6 @@ import '../features/templates/ui/template_gallery_test_support.dart' show GalleryGateway, galleryTemplates, pumpGallery, templatesReply; import 'pipelines_app_test.dart' show webServer; import 'pipelines_replies.dart'; -import '../features/settings/settings_topic_test_helper.dart'; import 'package:pipelines_app/ui/adaptive/segmented_bar.dart'; List> requestsOf(FakeChannel channel, String type) => @@ -85,38 +83,13 @@ Future pumpApp( await tester.pump(); } -Future openSettings( +/// Answers the reads a Templates page makes when it opens by route. +Future readTemplates( WidgetTester tester, - FakeChannel channel, - PlatformRouteInformationProvider provider, -) async { - await tester.tap(find.byKey(const Key('pipelines-open-settings'))); - await tester.pump(); - await tester.pump(); - expect(provider.value.uri.path, '/settings'); - // Settings pings the shared socket; answer it so later reads are not queued. - await reply(tester, channel, 'ping', 1, { - 'type': 'pong', - 'build': {'version': 'probe'}, - 'time': 'fixture', - }); - // Hidden notification settings do not load during this navigation flow. - expect(requestsOf(channel, 'notification_settings'), isEmpty); - await selectSettingsTopic(tester, 'Connection'); -} - -Future openTemplates( - WidgetTester tester, - FakeChannel channel, - PlatformRouteInformationProvider provider, { + FakeChannel channel, { int listRead = 1, }) async { - await selectSettingsTopic(tester, 'Tools'); - await tester.ensureVisible(find.byKey(SettingsKeys.templates)); - await tester.tap(find.byKey(SettingsKeys.templates)); - await tester.pump(); await tester.pump(const Duration(milliseconds: 600)); - expect(provider.value.uri.path, '/templates'); await reply(tester, channel, 'list_templates', listRead, { 'type': 'templates', 'templates': [ @@ -129,6 +102,9 @@ Future openTemplates( }, ], }); + // The shell's own ping shares the request queue; let it go out before the + // gallery's validate reads, as the list read is followed by the shell's ping. + await tester.pumpAndSettle(); await reply(tester, channel, 'validate', listRead, { 'type': 'graph', 'graph': {'stages': []}, @@ -153,7 +129,7 @@ void main() { }); testWidgets( - 'Settings opens the embedded Templates page and Back restores it', + 'a /templates link opens the embedded page and Back restores Settings', (tester) async { final fixture = PipelineFixture(); final channel = FakeChannel()..readyCompleter.complete(); @@ -176,14 +152,12 @@ void main() { provider: provider, ); await replyPipelines(tester, channel, fixture); + await provider.didPushRouteInformation( + RouteInformation(uri: Uri.parse('/templates')), + ); + await readTemplates(tester, channel); + await tester.pumpAndSettle(); - await openSettings(tester, channel, provider); - // An edit that only Settings owns must survive the Templates detour. - await tester.enterText(find.byType(EditableText).first, 'edited url'); - await tester.pump(); - expect(find.text('edited url'), findsOneWidget); - - await openTemplates(tester, channel, provider); final screen = tester.widget( find.byType(TemplatesScreen), ); @@ -214,8 +188,8 @@ void main() { expect(find.byKey(templateDetailBackKey), findsOneWidget); expect(find.byKey(templatesPageBackKey), findsNothing); - // Detail Back returns to the gallery, then the page Back restores the - // same Settings state. + // Detail Back returns to the gallery, then the page Back closes the + // page to Settings. await tester.tap(find.byKey(templateDetailBackKey)); await tester.pump(); // The gallery hands the bar back to the page's Back on the next frame. @@ -225,15 +199,14 @@ void main() { expect(provider.value.uri.path, '/settings'); expect(find.byType(TemplatesScreen), findsNothing); - expect(find.byKey(SettingsKeys.templates), findsOneWidget); - await selectSettingsTopic(tester, 'Connection'); - expect(find.text('edited url'), findsOneWidget); - expect(find.text('Server URL'), findsOneWidget); expect(sockets, 1); - expect(requestsOf(channel, 'ping'), hasLength(1)); // Browser Back from /templates follows the same close path. - await openTemplates(tester, channel, provider, listRead: 2); + await provider.didPushRouteInformation( + RouteInformation(uri: Uri.parse('/templates')), + ); + await readTemplates(tester, channel, listRead: 2); + await tester.pumpAndSettle(); expect(find.byType(TemplatesScreen), findsOneWidget); await provider.didPushRouteInformation( RouteInformation(uri: Uri.parse('/settings')), @@ -241,9 +214,6 @@ void main() { await tester.pumpAndSettle(); expect(provider.value.uri.path, '/settings'); expect(find.byType(TemplatesScreen), findsNothing); - expect(find.byKey(SettingsKeys.templates), findsOneWidget); - await selectSettingsTopic(tester, 'Connection'); - expect(find.text('edited url'), findsOneWidget); expect(requestsOf(channel, 'list_templates'), hasLength(2)); expect(sockets, 1); @@ -271,13 +241,15 @@ void main() { await pumpApp(tester, channel: channel, client: client, provider: provider); await replyPipelines(tester, channel, fixture); + await provider.didPushRouteInformation( + RouteInformation(uri: Uri.parse('/templates')), + ); expect( find.byKey(const Key('pipeline-row-41'), skipOffstage: false), findsNothing, ); - await openSettings(tester, channel, provider); - await openTemplates(tester, channel, provider); + await readTemplates(tester, channel); await tester.tap(find.byKey(templateRowKey('release'))); await tester.pump(); await tester.tap(find.byKey(templateCreateActionKey)); diff --git a/app/test/features/settings/settings_library_test.dart b/app/test/features/settings/settings_library_test.dart new file mode 100644 index 00000000..6fa165b3 --- /dev/null +++ b/app/test/features/settings/settings_library_test.dart @@ -0,0 +1,66 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/core/transport/pipelines_client.dart' + as transport; +import 'package:pipelines_app/features/settings/settings_keys.dart'; +import 'package:pipelines_app/features/settings/settings_screen.dart'; +import 'package:pipelines_app/features/settings/settings_store.dart'; + +import 'fake_channel.dart'; +import 'settings_topic_test_helper.dart'; + +/// The Tools topic's Library group lists Schedules only: Templates left +/// Settings, and Schedules keeps its own route. +void main() { + Future pump( + WidgetTester tester, { + VoidCallback? onOpenSchedules, + }) async { + await tester.binding.setSurfaceSize(const Size(560, 1000)); + addTearDown(() => tester.binding.setSurfaceSize(null)); + final factory = FakeChannelFactory(); + final client = transport.PipelinesClient(channelFactory: factory.call); + addTearDown(client.dispose); + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: SettingsScreen( + client: client, + store: MemorySettingsStore(), + embedded: true, + onOpenSchedules: onOpenSchedules, + ), + ), + ), + ); + await tester.pump(); + await selectSettingsTopic(tester, 'Tools'); + } + + testWidgets('Tools offers Schedules and no Templates entry', (tester) async { + var opened = 0; + await pump(tester, onOpenSchedules: () => opened++); + + expect(find.text('Library'), findsOneWidget); + expect(find.text('Browse templates'), findsNothing); + expect( + find.byKey(const ValueKey('settings.templates')), + findsNothing, + ); + + await tester.ensureVisible(find.byKey(SettingsKeys.schedules)); + await tester.tap(find.byKey(SettingsKeys.schedules)); + await tester.pump(); + expect(opened, 1); + }); + + testWidgets('without a Schedules route the Library group is absent', ( + tester, + ) async { + await pump(tester); + + expect(find.text('Library'), findsNothing); + expect(find.text('Browse templates'), findsNothing); + expect(find.byKey(SettingsKeys.schedules), findsNothing); + }); +} From dbd525a7b11b0bbb30b162f6f95921680a9e4383 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 01:02:31 +0000 Subject: [PATCH 5/7] Clarify empty server states Show calm, actionable empty states for pipelines, runs, and chats while keeping filtered and failed loads distinct. Add focused widget coverage and document the remaining verification limits. --- .../chat/ui/sessions/chat_sessions_body.dart | 2 +- .../features/pipelines/pipeline_filter.dart | 11 +++- .../widgets/pipeline_list_panel.dart | 9 +++ app/lib/features/runs/ui/runs_list.dart | 26 ++++++-- app/notes/empty-server-states.md | 61 +++++++++++++++++++ .../ui/sessions/chat_ios_material_test.dart | 4 +- .../sessions/chat_sessions_screen_test.dart | 7 ++- .../pipelines/pipeline_filter_test.dart | 2 +- .../pipelines_empty_server_test.dart | 50 +++++++++++++++ .../pipelines_screen_filter_test.dart | 3 +- .../runs/ui/runs_list_widget_test.dart | 43 ++++++++++++- 11 files changed, 201 insertions(+), 17 deletions(-) create mode 100644 app/notes/empty-server-states.md create mode 100644 app/test/features/pipelines/pipelines_empty_server_test.dart diff --git a/app/lib/features/chat/ui/sessions/chat_sessions_body.dart b/app/lib/features/chat/ui/sessions/chat_sessions_body.dart index c0195db6..7cddbbb2 100644 --- a/app/lib/features/chat/ui/sessions/chat_sessions_body.dart +++ b/app/lib/features/chat/ui/sessions/chat_sessions_body.dart @@ -84,7 +84,7 @@ class ChatSessionsBody extends StatelessWidget { emptyMessageOverride ?? (sessions.isEmpty ? error == null - ? 'No chat sessions on this server yet.' + ? 'No chats yet. Use New chat to start one.' : null : 'No chats match "${query.trim()}".'); diff --git a/app/lib/features/pipelines/pipeline_filter.dart b/app/lib/features/pipelines/pipeline_filter.dart index 9ed8a8ca..77f5c3da 100644 --- a/app/lib/features/pipelines/pipeline_filter.dart +++ b/app/lib/features/pipelines/pipeline_filter.dart @@ -77,11 +77,13 @@ class PipelineFilters { ); } -/// The empty-state sentence for the list plus its optional reset action. +/// The empty-state sentence for the list, an optional line naming the next +/// step, and an optional reset action. class PipelineEmptyState { - const PipelineEmptyState(this.message, {this.clearAction}); + const PipelineEmptyState(this.message, {this.detail, this.clearAction}); final String message; + final String? detail; final String? clearAction; } @@ -153,7 +155,10 @@ PipelineEmptyState? pipelineListEmptyState( ) { if (items.isNotEmpty) return null; if (all.isEmpty) { - return const PipelineEmptyState('No pipelines are defined on this server.'); + return const PipelineEmptyState( + 'No pipelines yet.', + detail: 'Create one from a template in Templates.', + ); } final name = filters.name; final onlyName = diff --git a/app/lib/features/pipelines/widgets/pipeline_list_panel.dart b/app/lib/features/pipelines/widgets/pipeline_list_panel.dart index f03b518d..20cb037d 100644 --- a/app/lib/features/pipelines/widgets/pipeline_list_panel.dart +++ b/app/lib/features/pipelines/widgets/pipeline_list_panel.dart @@ -192,6 +192,15 @@ class PipelineListPanel extends StatelessWidget { textAlign: TextAlign.center, style: _mutedStyle(context), ), + if (empty.detail != null) + Padding( + padding: const EdgeInsets.only(top: 4), + child: Text( + empty.detail!, + textAlign: TextAlign.center, + style: _mutedStyle(context), + ), + ), if (empty.clearAction != null) PipelineTextButton( label: empty.clearAction!, diff --git a/app/lib/features/runs/ui/runs_list.dart b/app/lib/features/runs/ui/runs_list.dart index 3f5d149f..00817b55 100644 --- a/app/lib/features/runs/ui/runs_list.dart +++ b/app/lib/features/runs/ui/runs_list.dart @@ -163,18 +163,32 @@ class RunsList extends StatelessWidget { // Filtered and sorted once per build: the getter recomputes every read. final visible = controller.visibleRuns; if (visible.isNotEmpty) return _groupedRuns(context, header, visible); + // A server with no runs at all is not a filter problem: say what the list + // is for and where its first run comes from. A free-text query counts as + // a filter too, so a search on an empty server reads as "nothing found". + final noRunsAtAll = controller.runs.isEmpty && + controller.activeFilterCount == 0 && + controller.query.trim().isEmpty; return BelowTopBar( child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ ...header, Expanded( - child: _state( - context, - icon: const Icon(Icons.inbox_outlined), - title: 'No runs found.', - subtitle: 'Try changing or clearing the filters.', - ), + child: noRunsAtAll + ? _state( + context, + icon: const Icon(Icons.inbox_outlined), + title: 'No runs yet.', + subtitle: + 'Start one from Pipelines and its runs appear here.', + ) + : _state( + context, + icon: const Icon(Icons.inbox_outlined), + title: 'No runs found.', + subtitle: 'Try changing or clearing the filters.', + ), ), ], ), diff --git a/app/notes/empty-server-states.md b/app/notes/empty-server-states.md new file mode 100644 index 00000000..5869c91e --- /dev/null +++ b/app/notes/empty-server-states.md @@ -0,0 +1,61 @@ +# Empty-server states (Pipelines, Runs, Chat) + +On a brand-new server (no pipelines, runs or chats) the healthy empty reply +should read as "nothing here yet" with the next step, not as a filter problem +or a missing list. Real failures keep their error treatment and never show the +empty copy. + +## Changed states + +| Destination | Before (empty, healthy server) | After | +| --- | --- | --- | +| Pipelines list | "No pipelines are defined on this server." | "No pipelines yet." + "Create one from a template in Templates." | +| Runs list | "No runs found." + "Try changing or clearing the filters." | "No runs yet." + "Start one from Pipelines and its runs appear here." | +| Runs list, filter hides every run | (same as above) | unchanged: "No runs found." + filter hint | +| Chat list | "No chat sessions on this server yet." | "No chats yet. Use New chat to start one." | + +Source: `lib/features/pipelines/pipeline_filter.dart`, +`lib/features/pipelines/widgets/pipeline_list_panel.dart` (renders the new +`PipelineEmptyState.detail` line), `lib/features/runs/ui/runs_list.dart`, +`lib/features/chat/ui/sessions/chat_sessions_body.dart`. + +Unchanged error paths: a failed Pipelines list shows its error banner with +Retry; a failed Runs list shows the error with Retry; a failed chat load hides +the empty message and shows the reason. + +## Focused results + +Command (from `app/`): `tool/memwatch/full.sh 'test/features/pipelines/pipelines_empty_server_test.dart test/features/pipelines/pipeline_filter_test.dart test/features/pipelines/pipelines_screen_filter_test.dart test/features/runs/ui/runs_list_widget_test.dart test/features/chat/ui/sessions/chat_sessions_screen_test.dart test/features/chat/ui/sessions/chat_ios_material_test.dart'` + +- Before the source change (new and updated expectations): 18 passed, 6 failed, + as expected on the old copy. The new test file also failed to compile + (missing `Key` import), fixed before the rerun. +- After the change: PASS, 25 passed, 0 failed, peak 1484 MB, 5s. +- Review fix (runs must-fix): the no-runs state now also requires an empty + free-text query, so an empty server with a search query shows "No runs + found." with the filter hint. Covered by a new widget test in + `runs_list_widget_test.dart`. Focused rerun of that file: PASS, 6 passed, + 0 failed, peak 768 MB, 4s. +- `tool/analyze.sh`: clean (rerun after the review fix). + +New or extended coverage: + +- `test/features/pipelines/pipelines_empty_server_test.dart`: empty server shows + the no-pipelines state and next step, with no spinner, list or Retry; a failed + list still shows the error and not the empty copy. +- `test/features/runs/ui/runs_list_widget_test.dart`: loading, error, and + server-empty states stay distinct; a status filter that hides every run keeps + the "No runs found." filter state. +- Chat and pipeline-filter expectations updated to the new copy. + +## Not verified here + +- No UI build or capture; `ui-review` owns rendered evidence. +- Schedules, Search, Settings, Usage/stats, Needs-you and Templates were read, + not changed or tested. Their empty copy is already calm, except that + "No schedules yet." has no next step because the list has no add action. + Stats says "No runs loaded." (secondary text, not an error). +- Runs and other error text still shows the raw error string (`'$e'`); this is + not an empty-server path and was not changed. +- Server gap: this stage did not check Go's empty-database replies. The client + treats an empty list as healthy. No Go change was made. diff --git a/app/test/features/chat/ui/sessions/chat_ios_material_test.dart b/app/test/features/chat/ui/sessions/chat_ios_material_test.dart index 35a82fd5..6643b588 100644 --- a/app/test/features/chat/ui/sessions/chat_ios_material_test.dart +++ b/app/test/features/chat/ui/sessions/chat_ios_material_test.dart @@ -17,7 +17,7 @@ void main() { expect(find.byType(Scaffold), findsWidgets); - const message = 'No chat sessions on this server yet.'; + const message = 'No chats yet. Use New chat to start one.'; expect(find.text(message), findsOneWidget); expectNormalTextStyle(tester, message); }); @@ -39,7 +39,7 @@ void main() { 'for this operator'; expect(find.text(message), findsOneWidget); expectNormalTextStyle(tester, message); - expect(find.text('No chat sessions on this server yet.'), findsNothing); + expect(find.text('No chats yet. Use New chat to start one.'), findsNothing); expect( find.ancestor( of: find.text('Retry'), diff --git a/app/test/features/chat/ui/sessions/chat_sessions_screen_test.dart b/app/test/features/chat/ui/sessions/chat_sessions_screen_test.dart index 1d01144a..c40846a4 100644 --- a/app/test/features/chat/ui/sessions/chat_sessions_screen_test.dart +++ b/app/test/features/chat/ui/sessions/chat_sessions_screen_test.dart @@ -91,7 +91,10 @@ void main() { ) async { final gateway = FakeChatGateway(); await pumpMaterialChat(tester, gateway); - expect(find.text('No chat sessions on this server yet.'), findsOneWidget); + expect( + find.text('No chats yet. Use New chat to start one.'), + findsOneWidget, + ); expect(find.textContaining('No chats match'), findsNothing); }); @@ -111,7 +114,7 @@ void main() { 'Bad state: server unavailable while listing chat sessions ' 'for this operator'; expect(find.text(message), findsOneWidget); - expect(find.text('No chat sessions on this server yet.'), findsNothing); + expect(find.text('No chats yet. Use New chat to start one.'), findsNothing); final messageBox = tester.renderObject(find.text(message)); expect( messageBox.size.height, diff --git a/app/test/features/pipelines/pipeline_filter_test.dart b/app/test/features/pipelines/pipeline_filter_test.dart index db91004c..18e5e34f 100644 --- a/app/test/features/pipelines/pipeline_filter_test.dart +++ b/app/test/features/pipelines/pipeline_filter_test.dart @@ -132,7 +132,7 @@ void main() { const [], const PipelineFilters(), )?.message, - 'No pipelines are defined on this server.', + 'No pipelines yet.', ); expect(pipelineListEmptyState(all, all, const PipelineFilters()), isNull); }); diff --git a/app/test/features/pipelines/pipelines_empty_server_test.dart b/app/test/features/pipelines/pipelines_empty_server_test.dart new file mode 100644 index 00000000..8c85ff51 --- /dev/null +++ b/app/test/features/pipelines/pipelines_empty_server_test.dart @@ -0,0 +1,50 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'fixtures.dart'; +import 'test_helpers.dart'; + +/// A brand-new server: every list is empty and healthy. +FakeGateway emptyServerGateway() => FakeGateway( + (type, fields) => switch (type) { + 'list_pipelines' => pipelineListReply(const []), + 'list_runs' => runListReply(const []), + 'list_schedules' => {'type': 'schedules', 'schedules': []}, + _ => errorReply('unexpected $type'), + }, +); + +void main() { + testWidgets( + 'an empty server shows a calm no-pipelines state with the next step', + (tester) async { + await pumpWide(tester, emptyServerGateway()); + + expect(find.text('No pipelines yet.'), findsOneWidget); + expect( + find.text('Create one from a template in Templates.'), + findsOneWidget, + ); + expect(find.text('Loading pipelines…'), findsNothing); + expect(find.byKey(const Key('pipeline-list')), findsNothing); + expect(find.textContaining('not defined'), findsNothing); + expect(find.text('Retry'), findsNothing); + expect(tester.takeException(), isNull); + }, + ); + + testWidgets( + 'a failed list stays an error and never reads as an empty server', + (tester) async { + await pumpWide( + tester, + gatewayFor(PipelineFixture(), listFails: true, summaries: const []), + ); + + expect(find.textContaining('server offline'), findsOneWidget); + expect(find.text('No pipelines yet.'), findsNothing); + expect(find.text('Loading pipelines…'), findsNothing); + expect(tester.takeException(), isNull); + }, + ); +} diff --git a/app/test/features/pipelines/pipelines_screen_filter_test.dart b/app/test/features/pipelines/pipelines_screen_filter_test.dart index 65a5d88d..cab57568 100644 --- a/app/test/features/pipelines/pipelines_screen_filter_test.dart +++ b/app/test/features/pipelines/pipelines_screen_filter_test.dart @@ -98,8 +98,9 @@ void main() { MaterialApp(home: PipelinesScreen(gateway: emptyGateway)), ); await tester.pumpAndSettle(); + expect(find.text('No pipelines yet.'), findsOneWidget); expect( - find.text('No pipelines are defined on this server.'), + find.text('Create one from a template in Templates.'), findsOneWidget, ); }); diff --git a/app/test/features/runs/ui/runs_list_widget_test.dart b/app/test/features/runs/ui/runs_list_widget_test.dart index b316d8e6..607228b7 100644 --- a/app/test/features/runs/ui/runs_list_widget_test.dart +++ b/app/test/features/runs/ui/runs_list_widget_test.dart @@ -162,9 +162,50 @@ void main() { gateway.reply = {'runs': []}; await controller.load(); await tester.pumpAndSettle(); - expect(find.text('No runs found.'), findsOneWidget); + expect(find.text('No runs yet.'), findsOneWidget); + expect(find.textContaining('Start one from Pipelines'), findsOneWidget); + expect(find.text('No runs found.'), findsNothing); expect(find.textContaining('offline'), findsNothing); expect(tester.takeException(), isNull); + + // A filter that hides every run is a different state: say so and offer + // the filter as the way back, not a server with no runs. + controller.setStatus('failed'); + await tester.pumpAndSettle(); + expect(find.text('No runs found.'), findsOneWidget); + expect(find.text('No runs yet.'), findsNothing); + expect( + find.text('Try changing or clearing the filters.'), + findsOneWidget, + ); + expect(tester.takeException(), isNull); + }, + variant: TargetPlatformVariant.only(TargetPlatform.android), + ); + + testWidgets( + 'an empty server with a search query reads as no match, not no runs', + (tester) async { + gateway.failure = null; + gateway.gate = null; + gateway.reply = {'runs': []}; + await controller.load(); + controller.setQuery('deploy'); + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: RunsList(controller: controller, onSelected: (_) {}), + ), + ), + ); + await tester.pumpAndSettle(); + expect(find.text('No runs found.'), findsOneWidget); + expect(find.text('No runs yet.'), findsNothing); + expect( + find.text('Try changing or clearing the filters.'), + findsOneWidget, + ); + expect(tester.takeException(), isNull); }, variant: TargetPlatformVariant.only(TargetPlatform.android), ); From 7dc054763b12fc607673a462c17638f8fa41835c Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 01:04:09 +0000 Subject: [PATCH 6/7] Cycle floating chats with Ctrl+Tab Route Ctrl+Tab and Ctrl+Shift+Tab between visible floating chat windows while preserving tiled-pane and terminal tab behavior. Add regression coverage and document the shortcut semantics. --- .../features/chat/chat_screen_workspace.dart | 5 +- app/lib/features/chat/screen.dart | 1 + .../chat/windows/chat_window_tabs.dart | 39 ++++++ .../features/chat/windows/chat_windows.dart | 40 +++++- app/notes/chat-floating-pane.md | 25 ++++ .../chat/chat_floating_pane_test.dart | 117 ++++++++++++++++++ 6 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 app/lib/features/chat/windows/chat_window_tabs.dart diff --git a/app/lib/features/chat/chat_screen_workspace.dart b/app/lib/features/chat/chat_screen_workspace.dart index 5f0d6cc2..b5c2bdb4 100644 --- a/app/lib/features/chat/chat_screen_workspace.dart +++ b/app/lib/features/chat/chat_screen_workspace.dart @@ -147,11 +147,14 @@ mixin _ChatScreenWorkspace on State { /// focus. Over a single pane it swaps in the chat shown before this one /// instead, and back again (see [_toggleRecentChat]). Command+Tab stays /// with the operating system's application switcher. While the app's - /// terminal is shown, Ctrl+Tab moves between its tabs instead. + /// terminal is shown, Ctrl+Tab moves between its tabs instead. While a + /// floating chat window holds the keyboard, Ctrl+Tab cycles those windows + /// (see [ChatWindows]). bool _cycleChatKey(KeyEvent event) { final keyboard = HardwareKeyboard.instance; if (event is! KeyDownEvent || TerminalScope.peek(context)?.claimsTabKeys == true || + keyboardWindow()?.entry.kind == chatWindowKind || event.logicalKey != LogicalKeyboardKey.tab || !keyboard.isControlPressed || keyboard.isMetaPressed || diff --git a/app/lib/features/chat/screen.dart b/app/lib/features/chat/screen.dart index 77b66fd5..d3544afa 100644 --- a/app/lib/features/chat/screen.dart +++ b/app/lib/features/chat/screen.dart @@ -1,5 +1,6 @@ import 'chat_pane_content.dart'; import 'chat_runtime.dart'; +import 'windows/chat_window_tabs.dart'; import 'windows/chat_windows.dart'; import 'workspace/federated_workspace_store.dart'; import '../../core/servers/chat/federated_chat_gateway.dart'; diff --git a/app/lib/features/chat/windows/chat_window_tabs.dart b/app/lib/features/chat/windows/chat_window_tabs.dart new file mode 100644 index 00000000..4bcc9763 --- /dev/null +++ b/app/lib/features/chat/windows/chat_window_tabs.dart @@ -0,0 +1,39 @@ +import 'package:flutter/services.dart'; +import 'package:flutter/widgets.dart'; + +import '../../../shell/windows/window_entry.dart'; +import '../../../shell/windows/window_scope.dart'; + +/// The step Ctrl+Tab (1) or Ctrl+Shift+Tab (-1) moves between floating chat +/// windows, or null for any other key. Command+Tab stays with the system. +int? chatWindowTabStep(KeyEvent event, HardwareKeyboard keyboard) { + if (event is! KeyDownEvent || + event.logicalKey != LogicalKeyboardKey.tab || + !keyboard.isControlPressed || + keyboard.isMetaPressed || + keyboard.isAltPressed) { + return null; + } + return keyboard.isShiftPressed ? -1 : 1; +} + +/// The window [step] away from the window [currentId] in [visible] (bottom +/// to top), wrapping around. Null when [currentId] is not listed or there is +/// no other window to move to. +WindowEntry? chatWindowAfter( + List visible, + String currentId, + int step, +) { + final at = visible.indexWhere((w) => w.id == currentId); + if (at < 0 || visible.length < 2) return null; + return visible[(at + step) % visible.length]; +} + +/// The floating window whose content holds the keyboard, if one does. Read +/// from the focused node's ancestors, so it needs no reference to the host. +WindowScope? keyboardWindow() { + final context = FocusManager.instance.primaryFocus?.context; + if (context == null) return null; + return context.findAncestorWidgetOfExactType(); +} diff --git a/app/lib/features/chat/windows/chat_windows.dart b/app/lib/features/chat/windows/chat_windows.dart index 247dd879..c2c7fb59 100644 --- a/app/lib/features/chat/windows/chat_windows.dart +++ b/app/lib/features/chat/windows/chat_windows.dart @@ -8,11 +8,13 @@ import '../../../shell/list_detail_policy.dart'; import '../../../shell/windows/window_entry.dart'; import '../../../shell/windows/window_kind.dart'; import '../../../shell/windows/window_manager.dart'; +import '../../terminal/terminal_scope.dart'; import '../chat_runtime.dart'; import '../domain/chat_commands.dart'; import '../workspace/chat_float_shortcut.dart'; import '../workspace/chat_float_store.dart'; import 'chat_window_content.dart'; +import 'chat_window_tabs.dart'; const chatWindowKind = 'chat'; @@ -79,7 +81,9 @@ class ChatWindows { if (_started) return; _started = true; manager.kinds.register(kind); - FocusManager.instance.addEarlyKeyEventHandler(_key); + FocusManager.instance + ..addEarlyKeyEventHandler(_key) + ..addEarlyKeyEventHandler(_tabKey); runtime.addSessionReplacedListener(_replacedElsewhere); runtime.sessions.addListener(_rowsChanged); manager.addListener(_rowsChanged); @@ -89,7 +93,9 @@ class ChatWindows { void dispose() { if (!_started) return; _started = false; - FocusManager.instance.removeEarlyKeyEventHandler(_key); + FocusManager.instance + ..removeEarlyKeyEventHandler(_key) + ..removeEarlyKeyEventHandler(_tabKey); runtime.removeSessionReplacedListener(_replacedElsewhere); runtime.sessions.removeListener(_rowsChanged); manager.removeListener(_rowsChanged); @@ -224,6 +230,36 @@ class ChatWindows { if (event is KeyDownEvent) manager.toggleOrRaiseGroup(chatWindowKind); return KeyEventResult.handled; } + + /// Ctrl+Tab and Ctrl+Shift+Tab while a floating chat window holds the + /// keyboard: the next (previous) visible chat window, in stacking order and + /// wrapping, comes to the top. The window host then gives it the keyboard, + /// its composer. Left alone when another window or the tiling has the + /// keyboard, when the terminal claims tab keys, or with one window. + KeyEventResult _tabKey(KeyEvent event) { + final step = chatWindowTabStep(event, HardwareKeyboard.instance); + if (step == null || !_wide) return KeyEventResult.ignored; + final scope = keyboardWindow(); + if (scope == null || + scope.entry.kind != chatWindowKind || + _terminalClaimsTabs()) { + return KeyEventResult.ignored; + } + final target = chatWindowAfter( + windows.where(manager.isVisible).toList(), + scope.entry.id, + step, + ); + if (target == null) return KeyEventResult.ignored; + manager.raise(target.id); + return KeyEventResult.handled; + } + + bool _terminalClaimsTabs() { + final context = FocusManager.instance.primaryFocus?.context; + return context != null && + TerminalScope.peek(context)?.claimsTabKeys == true; + } } class _Never implements Listenable { diff --git a/app/notes/chat-floating-pane.md b/app/notes/chat-floating-pane.md index 54407bbc..e17dcb38 100644 --- a/app/notes/chat-floating-pane.md +++ b/app/notes/chat-floating-pane.md @@ -29,6 +29,14 @@ every destination and come back at app start without Chat being opened. terminal). On macOS Ctrl+Y in a terminal always goes to the shell. - **Focus**: a window that shows or comes to the top puts the keyboard in its composer; hiding the last window gives it back to what had it. +- **Cycle**: while a floating chat window's content holds the keyboard (a + composer, a Files page inside it), Ctrl+Tab brings the next visible chat + window to the top and Ctrl+Shift+Tab the previous one, wrapping round. The + order is the stacking order, bottom to top, and the window's composer takes + the keyboard. Command+Tab stays with the system. With the tiling focused, + Ctrl+Tab still cycles its panes; while the terminal claims tab keys (shown) + it switches terminal tabs. Alt+` (`windowCycleShortcut`) still cycles every + kind of window, not only chats. - **Popups**: sheets, dialogs, menus and tooltips opened from a floating chat are above every window. Files opens as a page inside the window, and a file opened from it stays in the window. Because the window's own title bar names @@ -60,6 +68,23 @@ every destination and come back at app start without Chat being opened. ## Checks +- Focused, 2026-11-12, `tool/memwatch/full.sh` with + `test/features/chat/chat_floating_pane_test.dart` and + `test/features/terminal/terminal_chat_tab_test.dart`: 16 passed, 0 failed. + New in the first: Ctrl+Tab and Ctrl+Shift+Tab over three floating chats + (order, wrap, composer focus, Command+Tab ignored); with the tiling focused + Ctrl+Tab moves the active pane and leaves the windows alone, and with one + window focused it does nothing; a terminal that claims tab keys keeps + Ctrl+Tab over a focused chat window. +- `tool/analyze.sh` on the changed paths: clean. +- Affected states: two or more floating chats; one floating chat; tiling + focused; a window focused with the terminal shown (claimed); Command+Tab. +- Not covered: the terminal's own tab switching (the test app has no terminal + surface), real browser or device keys, and captures (ui-review's). +- Observed, not changed: in the widget harness, floating from a pane's More + menu does not leave the keyboard in the new window's composer (the window + takes it); the chord and Ctrl+Tab do. + - `test/features/chat/chat_floating_pane_test.dart` (the Chat screen with the window host), `test/features/chat/windows/chat_windows_test.dart`, `test/features/chat/workspace/chat_workspace_float_test.dart`, diff --git a/app/test/features/chat/chat_floating_pane_test.dart b/app/test/features/chat/chat_floating_pane_test.dart index d5b13fea..9ae25bda 100644 --- a/app/test/features/chat/chat_floating_pane_test.dart +++ b/app/test/features/chat/chat_floating_pane_test.dart @@ -11,6 +11,7 @@ import 'package:pipelines_app/features/chat/windows/chat_windows.dart'; import 'package:pipelines_app/features/chat/workspace/chat_float_store.dart'; import 'package:pipelines_app/features/chat/workspace/chat_workspace.dart'; import 'package:pipelines_app/features/chat/workspace/chat_workspace_store.dart'; +import 'package:pipelines_app/features/terminal/terminal_scope.dart'; import 'package:pipelines_app/shell/windows/window_frame.dart'; import 'package:pipelines_app/shell/windows/window_host.dart'; import 'package:pipelines_app/shell/windows/window_kind.dart'; @@ -48,6 +49,16 @@ class _Store implements WindowStore { } } +class _ClaimingTerminal implements TerminalActions { + const _ClaimingTerminal(); + @override + void toggle() {} + @override + bool get claimsTabKeys => true; + @override + Future openAt(ApiGateway gateway, String cwd) async => null; +} + class _TerminalKind extends WindowKind { @override String get key => 'terminal'; @@ -105,6 +116,7 @@ class _App { WidgetTester tester, { Size size = const Size(1800, 1000), bool terminalSurface = false, + bool terminalClaimsTabs = false, }) async { tester.view.physicalSize = size; tester.view.devicePixelRatio = 1; @@ -124,6 +136,13 @@ class _App { ); await tester.pumpWidget( MaterialApp( + // A terminal that shows its tabs: it claims Ctrl+Tab. + builder: terminalClaimsTabs + ? (context, child) => TerminalScope( + actions: const _ClaimingTerminal(), + child: child!, + ) + : null, home: Scaffold( body: Stack( fit: StackFit.expand, @@ -218,6 +237,19 @@ Future _chord(WidgetTester tester) async { await tester.pumpAndSettle(); } +/// Ctrl+Tab, or Ctrl+Shift+Tab with [shift]. +Future _tab(WidgetTester tester, {bool shift = false}) async { + await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); + if (shift) await tester.sendKeyDownEvent(LogicalKeyboardKey.shiftLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.tab); + if (shift) await tester.sendKeyUpEvent(LogicalKeyboardKey.shiftLeft); + await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft); + await tester.pumpAndSettle(); +} + +bool _composerFocused(WidgetTester tester, String id) => + tester.widget(_input(id)).focusNode.hasPrimaryFocus; + Future _controlChord(WidgetTester tester) async { await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); await tester.sendKeyEvent(LogicalKeyboardKey.keyY); @@ -452,6 +484,91 @@ void main() { await app.stop(tester); }); + testWidgets('Ctrl+Tab and Ctrl+Shift+Tab cycle the floating chat windows, ' + 'each composer taking the keyboard', (tester) async { + await _saved('a', 'b', 'c'); + final app = _App(_Store()); + await app.start(tester); + await _menu(tester, 'b', 'Float (Alt+Y)'); + await _menu(tester, 'c', 'Float (Alt+Y)'); + await _menu(tester, 'a', 'Float (Alt+Y)'); + expect(app.floating, ['b', 'c', 'a']); + + // Command+Tab belongs to the system. + await tester.sendKeyDownEvent(LogicalKeyboardKey.metaLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.tab); + await tester.sendKeyUpEvent(LogicalKeyboardKey.metaLeft); + await tester.pumpAndSettle(); + expect(app.floating, ['b', 'c', 'a']); + + await _tab(tester); + expect(app.floating, ['c', 'a', 'b']); + expect(_composerFocused(tester, 'b'), isTrue); + // Past the top, the bottom window comes up again. + await _tab(tester); + expect(app.floating, ['a', 'b', 'c']); + expect(_composerFocused(tester, 'c'), isTrue); + await _tab(tester, shift: true); + expect(app.floating, ['a', 'c', 'b']); + expect(_composerFocused(tester, 'b'), isTrue); + await _tab(tester, shift: true); + expect(app.floating, ['a', 'b', 'c']); + expect(_composerFocused(tester, 'c'), isTrue); + expect(tester.takeException(), isNull); + await app.stop(tester); + }); + + testWidgets('with the tiling focused Ctrl+Tab cycles its panes and leaves ' + 'the windows alone', (tester) async { + await _saved('a', 'b', 'c'); + final app = _App(_Store()); + await app.start(tester); + await _menu(tester, 'c', 'Float (Alt+Y)'); + expect(app.floating, ['c']); + final controller = _workspace(tester); + + await tester.tapAt(tester.getCenter(_input('a'))); + await tester.pump(); + expect(controller.activePane?.sessionId, 'a'); + await _tab(tester); + expect(controller.activePane?.sessionId, 'b'); + expect(_composerFocused(tester, 'b'), isTrue); + expect(app.floating, ['c']); + + // With a window focused, the panes stay where they are; a single window + // has nothing to cycle to. + await tester.tapAt(tester.getCenter(_input('c'))); + await tester.pump(); + expect(_composerFocused(tester, 'c'), isTrue); + await _tab(tester); + expect(controller.activePane?.sessionId, 'b'); + expect(app.floating, ['c']); + expect(tester.takeException(), isNull); + await app.stop(tester); + }); + + testWidgets('a terminal that claims tab keys keeps Ctrl+Tab over a focused ' + 'floating chat', (tester) async { + await _saved('a', 'b', 'c'); + final app = _App(_Store()); + await app.start(tester, terminalClaimsTabs: true); + await _menu(tester, 'b', 'Float (Alt+Y)'); + await _menu(tester, 'c', 'Float (Alt+Y)'); + expect(app.floating, ['b', 'c']); + await tester.tapAt(tester.getCenter(_input('c'))); + await tester.pump(); + expect(_composerFocused(tester, 'c'), isTrue); + + // The terminal's tabs get the key (its own handler is not in this app); + // neither the windows nor the panes move. + await _tab(tester); + expect(app.floating, ['b', 'c']); + expect(_composerFocused(tester, 'c'), isTrue); + expect(_workspace(tester).activePane?.sessionId, 'a'); + expect(tester.takeException(), isNull); + await app.stop(tester); + }); + testWidgets('a floating chat types, runs its tickers, hides and shows over ' 'another destination', (tester) async { await _saved('a', 'b'); From ac5f28bb83abece1faadf3afd95055a323ed171c Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 12 Nov 2026 01:08:18 +0000 Subject: [PATCH 7/7] Add global shortcuts for opening Chat Allow Ctrl+K and Alt+K to switch to Chat from any destination, while preserving terminal Ctrl+K behavior and focusing the active composer. Register the shortcuts in help and cover matching, navigation, terminal handling, and composer focus with regression tests. --- app/lib/application/pipelines_app.dart | 8 + .../settings/keyboard_shortcuts_registry.dart | 8 + app/lib/shell/adaptive_shell.dart | 22 ++- app/lib/shell/shell_chat_shortcut.dart | 29 +++ app/notes/ctrl-k-alt-k-open-chat.md | 32 ++++ .../application/chat_open_shortcut_test.dart | 93 +++++++++ .../keyboard_shortcuts_help_test.dart | 17 ++ app/test/shell/shell_chat_shortcut_test.dart | 181 ++++++++++++++++++ 8 files changed, 389 insertions(+), 1 deletion(-) create mode 100644 app/lib/shell/shell_chat_shortcut.dart create mode 100644 app/notes/ctrl-k-alt-k-open-chat.md create mode 100644 app/test/application/chat_open_shortcut_test.dart create mode 100644 app/test/shell/shell_chat_shortcut_test.dart diff --git a/app/lib/application/pipelines_app.dart b/app/lib/application/pipelines_app.dart index d44478e7..c80a5345 100644 --- a/app/lib/application/pipelines_app.dart +++ b/app/lib/application/pipelines_app.dart @@ -689,6 +689,13 @@ class _PipelinesAppState extends State AppRoute? _chatWorkspaceRoute; Set? _availableChatSessionIds; + /// After Ctrl+K or Alt+K shows Chat: the keyboard goes to the open chat's + /// composer, if a chat is open. + void _focusOpenChatComposer() { + final id = _chatWorkspaceRoute?.chatSessionId; + if (id != null) _chatRuntime.composerFocus.request(id); + } + void _selectDestination(AppDestination destination) { final current = tabForRoute(_delegate.route); final last = _tabRoutes[destination]; @@ -825,6 +832,7 @@ class _PipelinesAppState extends State runningRunCount: counts.running, destination: _destinationOf(route.kind), onDestinationSelected: _selectDestination, + onOpenChat: _focusOpenChatComposer, onClosePage: () => _delegate.goTo( _bodyRoutes[AppDestination.pipelines] ?? AppRoute.pipelines, ), diff --git a/app/lib/features/settings/keyboard_shortcuts_registry.dart b/app/lib/features/settings/keyboard_shortcuts_registry.dart index a4ce79f4..22f12a9d 100644 --- a/app/lib/features/settings/keyboard_shortcuts_registry.dart +++ b/app/lib/features/settings/keyboard_shortcuts_registry.dart @@ -4,6 +4,7 @@ import '../chat/workspace/chat_center_stage_controller.dart'; import '../chat/workspace/chat_float_shortcut.dart'; import '../terminal/terminal_shortcuts.dart'; import '../../shell/windows/window_shortcuts.dart'; +import '../../shell/shell_chat_shortcut.dart'; import '../../shell/shell_search_shortcut_labels.dart'; /// A shortcut entry shown in the in-app help. Keeping these entries together @@ -53,6 +54,13 @@ class KeyboardShortcutRegistry { caveat: 'Brings a chat forward from Terminal and focuses its message input.', ), + KeyboardShortcutEntry( + action: 'Open Chat', + keys: shellChatShortcutLabels(platform).join(', '), + caveat: web + ? 'Shows the open chat and focuses its message input. The browser may reserve Ctrl+K.' + : 'Shows the open chat and focuses its message input. In the terminal Ctrl+K stays kill-line; Alt+K still opens Chat.', + ), KeyboardShortcutEntry( action: 'Toggle Center Stage', keys: diff --git a/app/lib/shell/adaptive_shell.dart b/app/lib/shell/adaptive_shell.dart index e74e3266..60a97fa4 100644 --- a/app/lib/shell/adaptive_shell.dart +++ b/app/lib/shell/adaptive_shell.dart @@ -9,6 +9,7 @@ import 'destination.dart'; import 'list_detail.dart'; import 'list_pane_widths.dart'; import 'shell_bar.dart'; +import 'shell_chat_shortcut.dart'; import 'shell_list_shortcuts.dart'; import 'shell_search_shortcut_labels.dart'; import 'tab_history.dart'; @@ -22,6 +23,7 @@ class AdaptiveShell extends StatefulWidget { this.onDestinationSelected, this.onClosePage, this.onSearch, + this.onOpenChat, this.attentionCount = 0, this.runningRunCount, this.listPaneWidthStore = const SharedPreferencesListPaneWidthStore(), @@ -47,6 +49,10 @@ class AdaptiveShell extends StatefulWidget { /// shell tests and compositions without routing keep their tab set only. final VoidCallback? onSearch; + /// Runs after Ctrl+K or Alt+K has shown the Chat destination (also when it + /// was already shown), so the open chat's composer can take the keyboard. + final VoidCallback? onOpenChat; + /// Runs needing the operator today, retained in the tab's accessible label. final int attentionCount; @@ -271,9 +277,16 @@ class _AdaptiveShellState extends State { /// fields. Split-pane navigation belongs to the chat workspace; tab changes /// have no global keyboard chord. bool _handleDestinationKeyEvent(KeyEvent event) { + final keyboard = HardwareKeyboard.instance; + // Ctrl+K is the terminal's kill-line while the terminal has the keyboard; + // Alt+K still opens Chat there. + if (shellChatShortcut(event, keyboard) && + (keyboard.isAltPressed || !primaryFocusIsTypingSurface())) { + if (event is KeyDownEvent) _openChat(); + return true; + } // A terminal keeps its keys (Escape, Ctrl+/, Ctrl+digits). if (primaryFocusIsTypingSurface()) return false; - final keyboard = HardwareKeyboard.instance; if (_selected == AppDestination.search && event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.escape && @@ -299,6 +312,13 @@ class _AdaptiveShellState extends State { return _bar.lists.open(AppDestination.chat, listIndex); } + /// Shows Chat (the tab's own selection, so its open chat returns) and then + /// lets the app focus that chat's composer. + void _openChat() { + if (_selected != AppDestination.chat) _select(AppDestination.chat); + widget.onOpenChat?.call(); + } + /// A popup or nested viewer owns Escape before the underlying Search tab. bool _searchEscape() { final route = ModalRoute.of(context); diff --git a/app/lib/shell/shell_chat_shortcut.dart b/app/lib/shell/shell_chat_shortcut.dart new file mode 100644 index 00000000..52cb1de4 --- /dev/null +++ b/app/lib/shell/shell_chat_shortcut.dart @@ -0,0 +1,29 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; + +/// Whether [event] opens the Chat destination from any destination: Ctrl+K, +/// or Alt+K (Option+K on Apple platforms). Alt+K is recognised by key position +/// too, because Option+K yields a dead-key symbol on a Mac. Shift, Cmd and +/// chords with both Ctrl and Alt are not the shortcut. Repeats of a held chord +/// match as well, so the caller can swallow them; only its first press acts. +bool shellChatShortcut(KeyEvent event, HardwareKeyboard keyboard) { + if (event is KeyUpEvent || + keyboard.isShiftPressed || + keyboard.isMetaPressed) { + return false; + } + final control = keyboard.isControlPressed; + final alt = keyboard.isAltPressed; + if (control == alt) return false; + if (event.logicalKey == LogicalKeyboardKey.keyK) return true; + return alt && event.physicalKey == PhysicalKeyboardKey.keyK; +} + +/// The chords that open Chat as they read on this platform, for the help +/// page. Alt (Option on Apple platforms) leads, as it does for the floating +/// chats; Ctrl+K is the other chord everywhere. +List shellChatShortcutLabels([TargetPlatform? platform]) { + final target = platform ?? defaultTargetPlatform; + final apple = target == TargetPlatform.macOS || target == TargetPlatform.iOS; + return [apple ? 'Option+K' : 'Alt+K', 'Ctrl+K']; +} diff --git a/app/notes/ctrl-k-alt-k-open-chat.md b/app/notes/ctrl-k-alt-k-open-chat.md new file mode 100644 index 00000000..d50457b8 --- /dev/null +++ b/app/notes/ctrl-k-alt-k-open-chat.md @@ -0,0 +1,32 @@ +# Ctrl+K / Alt+K open Chat + +Run 391 (ctrl-k-and-alt-k-open-chat), stage 01-implement. Not committed. + +## Behaviour +- Ctrl+K, or Alt+K (Option+K on Apple platforms, matched by physical key so the dead-key symbol still counts), switches the shell to the Chat destination from any destination, then calls `AdaptiveShell.onOpenChat`. +- The app passes `_focusOpenChatComposer`, which requests the composer of the last workspace chat (`_chatWorkspaceRoute`) through `ChatRuntime.composerFocus`. +- Ctrl+K is left to the terminal while the terminal has the keyboard (`primaryFocusIsTypingSurface`). Alt+K still switches there. +- Shift, Meta, or Ctrl+Alt together do not match. Repeats are swallowed; only the first key-down acts. +- The help page has an "Open Chat" entry: `Option+K, Ctrl+K` on macOS, `Alt+K, Ctrl+K` elsewhere. + +## Changed paths +- `app/lib/shell/shell_chat_shortcut.dart` (new): `shellChatShortcut`, `shellChatShortcutLabels`. +- `app/lib/shell/adaptive_shell.dart`: key handling, `_openChat`, `onOpenChat` parameter. +- `app/lib/application/pipelines_app.dart`: `_focusOpenChatComposer`, wired as `onOpenChat`. +- `app/lib/features/settings/keyboard_shortcuts_registry.dart`: "Open Chat" entry. +- `app/test/shell/shell_chat_shortcut_test.dart` (new): matcher, switch from another destination, controlled shell callback, terminal exception. +- `app/test/application/chat_open_shortcut_test.dart` (new): the full `PipelinesApp` opens `/chat/s1`, moves to Runs, then Alt+K and Ctrl+K each return to `/chat/s1` and put the keyboard in the `s1` composer (primary focus). +- `app/test/features/settings/keyboard_shortcuts_help_test.dart`: "Open Chat" help entry test. + +## Focused results +- Review follow-up (composer focus), `tool/memwatch/full.sh 'test/application/chat_open_shortcut_test.dart test/shell/shell_chat_shortcut_test.dart test/features/settings/keyboard_shortcuts_help_test.dart'`: PASS, 12 passed, 0 failed, peak 1306 MB, 5s, exit 0. Run after `dart format` on the new test. +- Mutation check: with the `_focusOpenChatComposer` request removed from `pipelines_app.dart`, `chat_open_shortcut_test.dart` fails on the composer focus expectation. The source was restored afterwards; `git diff` shows the original wiring. +- Earlier stage run (not repeated here): `test/shell/destination_shortcuts_test.dart`, `test/shell/search_shortcuts_test.dart`, `test/features/chat/workspace/chat_float_shortcut_test.dart` passed with the shell test and help test (21 passed, 0 failed, peak 1062 MB). +- `tool/analyze.sh`: clean. +- Tests that press K chords: none outside the new files. The new shell check returns false for every other key, so the earlier typing-surface and search paths keep their order. + +## Not covered +- The composer-focus test drives the real app with a fake channel; it does not cover a chat opened only through a route with no history yet. +- No UI capture or device run (ui-review owns that). +- Ctrl+Y: the float chord is not left to the terminal. `chatFloatShortcut` matches Ctrl+Y on every platform, and `chat_floating_pane_test.dart` covers Ctrl+Y from the terminal on macOS. Ctrl+K was made the only terminal exception, as the task asked. +- On web, the browser may keep Ctrl+K (address/search focus); the help caveat says so. diff --git a/app/test/application/chat_open_shortcut_test.dart b/app/test/application/chat_open_shortcut_test.dart new file mode 100644 index 00000000..17440c4d --- /dev/null +++ b/app/test/application/chat_open_shortcut_test.dart @@ -0,0 +1,93 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/application/pipelines_app.dart'; +import 'package:pipelines_app/core/transport/pipelines_client.dart'; +import 'package:pipelines_app/features/chat/conversation/chat_thread_view.dart'; + +import '../core/transport/pipelines_client_test.dart' show FakeChannel; +import 'chat_registration_test.dart' + show replyHistory, replySessions, replySubscribe, webServer; + +bool _composerFocused(WidgetTester tester, String id) => tester + .widget( + find.descendant( + of: find.byKey(ValueKey('chat-composer-$id')), + matching: find.byType(EditableText), + ), + ) + .focusNode + .hasPrimaryFocus; + +Future _chord(WidgetTester tester, LogicalKeyboardKey modifier) async { + await tester.sendKeyDownEvent(modifier); + await tester.sendKeyEvent(LogicalKeyboardKey.keyK); + await tester.sendKeyUpEvent(modifier); + await tester.pump(); + await tester.pump(); +} + +void main() { + testWidgets( + 'Ctrl+K and Alt+K from another destination focus the open chat composer', + (tester) async { + tester.view.physicalSize = const Size(900, 900); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + + final channel = FakeChannel()..readyCompleter.complete(); + final client = PipelinesClient(channelFactory: (_) => channel); + final provider = PlatformRouteInformationProvider( + initialRouteInformation: RouteInformation(uri: Uri.parse('/chat/s1')), + ); + addTearDown(provider.dispose); + + await tester.pumpWidget( + PipelinesApp( + androidSupported: false, + server: webServer(), + client: client, + routeInformationProvider: provider, + ), + ); + await tester.pump(); + await replySessions(tester, channel); + await replySubscribe(tester, channel); + await replyHistory(tester, channel); + await tester.pumpAndSettle(); + + expect(find.byType(ChatThreadView), findsOneWidget); + expect(_composerFocused(tester, 's1'), isFalse); + + // Leave Chat for another destination, then clear any focus left over. + await tester.tap(find.byKey(const ValueKey('shell.destination.runs'))); + await tester.pump(const Duration(milliseconds: 600)); + FocusManager.instance.primaryFocus?.unfocus(); + await tester.pump(); + expect(provider.value.uri.path, '/runs'); + + await _chord(tester, LogicalKeyboardKey.altLeft); + expect(provider.value.uri.path, '/chat/s1'); + expect(find.byType(ChatThreadView), findsOneWidget); + expect(_composerFocused(tester, 's1'), isTrue); + expect(tester.takeException(), isNull); + + // Ctrl+K does the same from another destination. + await tester.tap(find.byKey(const ValueKey('shell.destination.runs'))); + await tester.pump(const Duration(milliseconds: 600)); + FocusManager.instance.primaryFocus?.unfocus(); + await tester.pump(); + expect(_composerFocused(tester, 's1'), isFalse); + + await _chord(tester, LogicalKeyboardKey.controlLeft); + expect(provider.value.uri.path, '/chat/s1'); + expect(find.byType(ChatThreadView), findsOneWidget); + expect(_composerFocused(tester, 's1'), isTrue); + expect(tester.takeException(), isNull); + + await tester.pumpWidget(const SizedBox.shrink()); + await tester.pump(); + }, + ); +} diff --git a/app/test/features/settings/keyboard_shortcuts_help_test.dart b/app/test/features/settings/keyboard_shortcuts_help_test.dart index 80fa97e1..f070d2e7 100644 --- a/app/test/features/settings/keyboard_shortcuts_help_test.dart +++ b/app/test/features/settings/keyboard_shortcuts_help_test.dart @@ -23,6 +23,23 @@ void main() { expect(search.caveat, contains('browser')); }); + test( + 'Open Chat lists Option+K or Alt+K with Ctrl+K and the terminal rule', + () { + KeyboardShortcutEntry openChat(TargetPlatform platform) => + KeyboardShortcutRegistry( + platform: platform, + web: false, + ).entries.firstWhere((entry) => entry.action == 'Open Chat'); + + expect(openChat(TargetPlatform.macOS).keys, 'Option+K, Ctrl+K'); + final linux = openChat(TargetPlatform.linux); + expect(linux.keys, 'Alt+K, Ctrl+K'); + expect(linux.caveat, contains('kill-line')); + expect(openChat(TargetPlatform.windows).keys, 'Alt+K, Ctrl+K'); + }, + ); + test('uses the shell primary modifier rule on iOS', () { final entries = const KeyboardShortcutRegistry( platform: TargetPlatform.iOS, diff --git a/app/test/shell/shell_chat_shortcut_test.dart b/app/test/shell/shell_chat_shortcut_test.dart new file mode 100644 index 00000000..69a873d4 --- /dev/null +++ b/app/test/shell/shell_chat_shortcut_test.dart @@ -0,0 +1,181 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/shell/adaptive_shell.dart'; +import 'package:pipelines_app/shell/destination.dart'; +import 'package:pipelines_app/shell/shell_chat_shortcut.dart'; +import 'package:pipelines_app/ui/input/keyboard_owner.dart'; + +const _k = KeyDownEvent( + physicalKey: PhysicalKeyboardKey.keyK, + logicalKey: LogicalKeyboardKey.keyK, + timeStamp: Duration.zero, +); + +void main() { + test('Ctrl+K and Alt+K open Chat; other modifiers and plain K do not', () { + bool chord(Set held, [KeyEvent event = _k]) => + shellChatShortcut(event, _FakeKeyboard(held)); + expect(chord({}), isFalse); + expect(chord({LogicalKeyboardKey.controlLeft}), isTrue); + expect(chord({LogicalKeyboardKey.altLeft}), isTrue); + expect( + chord({LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.altLeft}), + isFalse, + ); + expect( + chord({LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.shiftLeft}), + isFalse, + ); + expect(chord({LogicalKeyboardKey.metaLeft}), isFalse); + expect( + chord({LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.metaLeft}), + isFalse, + ); + expect( + shellChatShortcut( + const KeyUpEvent( + physicalKey: PhysicalKeyboardKey.keyK, + logicalKey: LogicalKeyboardKey.keyK, + timeStamp: Duration.zero, + ), + _FakeKeyboard({LogicalKeyboardKey.controlLeft}), + ), + isFalse, + ); + }); + + test('Option+K matches by key position though it types a symbol', () { + // On a Mac, Option+K produces ˚: the logical key is not K. + const ring = KeyDownEvent( + physicalKey: PhysicalKeyboardKey.keyK, + logicalKey: LogicalKeyboardKey(0x02da), + character: '˚', + timeStamp: Duration.zero, + ); + expect( + shellChatShortcut(ring, _FakeKeyboard({LogicalKeyboardKey.altLeft})), + isTrue, + ); + // Without Alt the same symbol is ordinary typing. + expect(shellChatShortcut(ring, _FakeKeyboard({})), isFalse); + }); + + test('labels name the Option chord on Apple platforms', () { + expect(shellChatShortcutLabels(TargetPlatform.linux), ['Alt+K', 'Ctrl+K']); + expect(shellChatShortcutLabels(TargetPlatform.macOS), [ + 'Option+K', + 'Ctrl+K', + ]); + }); + + testWidgets('Ctrl+K and Alt+K show Chat from another destination', ( + tester, + ) async { + var opened = 0; + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + destinationBodies: { + for (final destination in shellTabDestinations) + destination: (_) => Text('${destination.name} body'), + }, + onOpenChat: () => opened++, + ), + ), + ); + expect(find.text('pipelines body'), isOnstage); + // Chat is built on its first visit only. + expect(find.text('chat body'), findsNothing); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyK); + await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft); + await tester.pump(); + // The outgoing tab fades out while still mounted, so Chat being built + // and onstage is the switch. + expect(find.text('chat body'), isOnstage); + expect(opened, 1); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.altLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyK); + await tester.sendKeyUpEvent(LogicalKeyboardKey.altLeft); + await tester.pump(); + expect(find.text('chat body'), isOnstage); + // Already in Chat, the chord still hands the keyboard to the composer. + expect(opened, 2); + expect(tester.takeException(), isNull); + }); + + testWidgets('a controlled shell reports the switch to Chat', (tester) async { + final selected = []; + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + destination: AppDestination.runs, + onDestinationSelected: selected.add, + destinationBodies: { + for (final destination in shellTabDestinations) + destination: (_) => Text('${destination.name} body'), + }, + ), + ), + ); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.altLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyK); + await tester.sendKeyUpEvent(LogicalKeyboardKey.altLeft); + await tester.pump(); + expect(selected, [AppDestination.chat]); + }); + + testWidgets( + 'terminal keeps Ctrl+K for kill-line but Alt+K still opens Chat', + (tester) async { + final terminal = FocusNode(); + addTearDown(terminal.dispose); + var opened = 0; + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + onOpenChat: () => opened++, + destinationBodies: { + AppDestination.pipelines: (_) => TypingSurface( + child: Focus( + focusNode: terminal, + child: const Text('terminal'), + ), + ), + AppDestination.chat: (_) => const Text('chat body'), + }, + ), + ), + ); + terminal.requestFocus(); + await tester.pump(); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyK); + await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft); + await tester.pump(); + expect(find.text('chat body'), findsNothing); + expect(find.text('terminal'), isOnstage); + expect(opened, 0); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.altLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyK); + await tester.sendKeyUpEvent(LogicalKeyboardKey.altLeft); + await tester.pump(); + expect(find.text('chat body'), isOnstage); + expect(opened, 1); + expect(tester.takeException(), isNull); + }, + ); +} + +class _FakeKeyboard extends HardwareKeyboard { + _FakeKeyboard(this.pressed); + final Set pressed; + @override + bool isLogicalKeyPressed(LogicalKeyboardKey key) => pressed.contains(key); +}