Merge branch 'main' into mwbrooks-config-experiments-type

Author: mwbrooks

.circleci/config.yml

@@ -113,7 +113,7 @@ jobs:
         default: "dev-build"
     docker: # run the steps with Docker
       # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
-      - image: cimg/go:1.26.0
+      - image: cimg/go:1.26.1
     steps: # steps that comprise the `build` job
       - checkout # check out source code to working directory
       - restore_cache: # restores saved cache if no changes are detected since last run

.claude/CLAUDE.md

@@ -135,6 +135,19 @@ func NewExampleCommand(clients *shared.ClientFactory) *cobra.Command {
 - Mock the `ClientFactory` and its dependencies for testing
 - Always mock file system operations using `afero.Fs` to enable testability
 
+### Test Naming Conventions
+
+Test function names use the format `Test_StructName_FunctionName` for methods on a struct, or `Test_FunctionName` for package-level functions:
+
+```go
+func Test_Client_GetAppStatus(t *testing.T) { ... }  // struct method
+func Test_getKeyLength(t *testing.T) { ... }         // package-level function
+```
+
+### Test Ordering Conventions
+
+Constructor functions (`NewXYZ`) should always be declared first, at the top of the test file. After constructors, test functions should be ordered alphabetically within each file. When a file has logical sections (separated by comments), tests should be alphabetical within each section. Getter and setter functions are grouped together under the base name — ignore the `Get` or `Set` prefix when determining order (e.g. `Test_AppName` and `Test_SetAppName` both sort under `A`). Exceptions to alphabetical ordering can be made when it doesn't work well for readability or logical grouping.
+
 ### Table-Driven Test Conventions
 
 **Preferred: Map pattern** - uses `tc` for test case variable:

.claude/skills/record-demo/SKILL.md

@@ -0,0 +1,44 @@
+---
+name: record-demo
+description: Record terminal demos as GIFs using VHS tape files. Use when asked to record a demo, create a terminal recording, or generate a GIF of CLI usage.
+argument-hint: <description>
+---
+
+Record a demo of `$ARGUMENTS` using VHS.
+
+1. **Check VHS is installed**: Run `which vhs`. If not found, tell the user to install it with `brew install vhs`.
+
+2. **Create a `.tape` file** in `demos/` (create the directory if needed). Use this template:
+
+   ```tape
+   # Demo: <description>
+   Output demos/<name>.gif    # Always use .gif format
+
+   Set Shell "zsh"
+   Set FontSize 16
+   Set Width 1200
+   Set Height 600
+   Set Theme "Catppuccin Mocha"
+   Set TypingSpeed 75ms
+   Set Padding 20
+
+   Type "<command>"
+   Sleep 500ms
+   Enter
+   Sleep 3s
+   ```
+
+3. **VHS Tape DSL reference**: For the full command reference, see [vhs-reference.md](vhs-reference.md).
+
+4. **Tips for good demos**:
+   - Add `Sleep` after commands to let output render and be readable
+   - Use `Hide`/`Show` to run setup commands invisibly
+   - Keep demos short and focused (under 30 seconds)
+   - Add a `Sleep 3s` at the end so viewers can see final output
+   - Always add a `Sleep 500ms` pause after each `Type` line (before `Enter`) to mimic a human pause
+   - For this project, use `./bin/slack` directly as the CLI binary path (do NOT export PATH)
+   - When demoing from an app directory, use `Hide` to `cd` into the app, then use `../bin/slack` as the binary path
+   - Prefer passing app IDs directly (e.g. `--app A12345`) to avoid interactive prompts when the ID is known
+5. **Run the recording**: Execute `vhs <filename>.tape` to generate the output file.
+
+6. **Review**: Open the `demos/` directory with `open demos/` so the user can review the output.

.claude/skills/record-demo/vhs-reference.md

@@ -0,0 +1,58 @@
+# VHS Tape DSL Reference
+
+## Output
+
+- `Output <path>.gif` - Create a GIF output at the given path
+
+## Require
+
+- `Require <string>` - Ensure a program is on the $PATH to proceed
+
+## Settings
+
+- `Set FontSize <number>` - Set the font size of the terminal
+- `Set FontFamily <string>` - Set the font family of the terminal
+- `Set Height <number>` - Set the height of the terminal
+- `Set Width <number>` - Set the width of the terminal
+- `Set LetterSpacing <float>` - Set the font letter spacing (tracking)
+- `Set LineHeight <float>` - Set the font line height
+- `Set LoopOffset <float>%` - Set the starting frame offset for the GIF loop
+- `Set Theme <json|string>` - Set the theme of the terminal
+- `Set Padding <number>` - Set the padding of the terminal
+- `Set Framerate <number>` - Set the framerate of the recording
+- `Set PlaybackSpeed <float>` - Set the playback speed of the recording
+- `Set MarginFill <file|#000000>` - Set the file or color the margin will be filled with
+- `Set Margin <number>` - Set the size of the margin (no effect without MarginFill)
+- `Set BorderRadius <number>` - Set terminal border radius, in pixels
+- `Set WindowBar <string>` - Set window bar type (Rings, RingsRight, Colorful, ColorfulRight)
+- `Set WindowBarSize <number>` - Set window bar size, in pixels (default: 40)
+- `Set TypingSpeed <time>` - Set the typing speed of the terminal (default: 50ms)
+
+## Sleep
+
+- `Sleep <time>` - Sleep for a set amount of time in seconds
+
+## Type
+
+- `Type "<characters>"` - Type characters into the terminal
+- `Type@<time> "<characters>"` - Type characters with a custom delay between each character
+
+## Keys
+
+All keys accept an optional `@<time>` delay and an optional repeat `[number]`.
+
+- `Escape` - Press the Escape key
+- `Backspace` - Press the Backspace key
+- `Delete` - Press the Delete key
+- `Insert` - Press the Insert key
+- `Enter` - Press the Enter key
+- `Space` - Press the Space key
+- `Tab` - Press the Tab key
+- `Up` / `Down` / `Left` / `Right` - Press arrow keys
+- `PageUp` / `PageDown` - Press Page Up/Down keys
+- `Ctrl+<key>` - Press Control + key (e.g. `Ctrl+C`)
+
+## Display
+
+- `Hide` - Hide subsequent commands from the output
+- `Show` - Show subsequent commands in the output

.github/MAINTAINERS_GUIDE.md

@@ -383,6 +383,34 @@ The branch name can also be set by changing
 for the `build-lint-test-e2e-test` workflow in the `.circleci/config.yml` file,
 but take care not to merge this change into `main`!
 
+#### Test naming conventions
+
+Test function names should use the format `Test_StructName_FunctionName` for methods
+on a struct, or `Test_FunctionName` for package-level functions. The underscore after
+`Test` separates the Go test prefix from the identifier being tested:
+
+```go
+// Testing a method on a struct
+func Test_Client_GetAppStatus(t *testing.T) { ... }
+
+// Testing a package-level function
+func Test_getKeyLength(t *testing.T) { ... }
+```
+
+#### Test ordering conventions
+
+Constructor functions (`NewXYZ`) should always be declared first, at the top of the
+test file. After constructors, test functions should be ordered alphabetically. When
+a file has logical sections (separated by comments), tests should be alphabetical
+within each section.
+
+Getter and setter functions should be grouped together under the base name. Ignore
+the `Get` or `Set` prefix when determining alphabetical order. For example,
+`Test_AppName` and `Test_SetAppName` are both sorted under `A` for `AppName`.
+
+Exceptions to alphabetical ordering can be made when it doesn't work well for
+readability or logical grouping.
+
 #### Contributing tests
 
 If you'd like to add tests, please review our

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
-          go-version: "1.26.0"
+          go-version: "1.26.1"
       - name: Lint
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
@@ -57,7 +57,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
-          go-version: "1.26.0"
+          go-version: "1.26.1"
       - name: Report health score
         uses: slackapi/slack-health-score@d58a419f15cdaff97e9aa7f09f95772830ab66f7 # v0.1.1
         with:

.gitignore

@@ -37,3 +37,6 @@ package-lock.json
 
 # End to End Test files
 test-e2e
+
+# VHS demo recordings
+demos/

cmd/datastore/count_test.go

@@ -251,7 +251,7 @@ func TestCountCommand(t *testing.T) {
 				}, nil)
 				cm.IO.On("InputPrompt", mock.Anything, "Enter an expression", iostreams.InputPromptConfig{
 					Required: false,
-				}).Return("")
+				}).Return("", nil)
 				cm.API.On("AppsDatastoreCount", mock.Anything, mock.Anything, mock.Anything).
 					Return(types.AppDatastoreCountResult{Datastore: "numbers", Count: 12}, nil)
 			},
@@ -298,16 +298,16 @@ func TestCountCommand(t *testing.T) {
 				}, nil)
 				cm.IO.On("InputPrompt", mock.Anything, "Enter an expression", iostreams.InputPromptConfig{
 					Required: false,
-				}).Return("#n < :num AND #n <> :zero AND #prime = :bool")
+				}).Return("#n < :num AND #n <> :zero AND #prime = :bool", nil)
 				cm.IO.On("InputPrompt", mock.Anything, "Enter a value for ':num'", iostreams.InputPromptConfig{
 					Required: true,
-				}).Return("12")
+				}).Return("12", nil)
 				cm.IO.On("InputPrompt", mock.Anything, "Enter a value for ':zero'", iostreams.InputPromptConfig{
 					Required: true,
-				}).Return("0")
+				}).Return("0", nil)
 				cm.IO.On("InputPrompt", mock.Anything, "Enter a value for ':bool'", iostreams.InputPromptConfig{
 					Required: true,
-				}).Return("true")
+				}).Return("true", nil)
 				cm.API.On("AppsDatastoreCount", mock.Anything, mock.Anything, mock.Anything).
 					Return(types.AppDatastoreCountResult{Datastore: "numbers", Count: 6}, nil)
 			},

cmd/datastore/delete_test.go

@@ -186,7 +186,7 @@ func TestDeleteCommand(t *testing.T) {
 				}, nil)
 				clientsMock.IO.On("InputPrompt", mock.Anything, "Enter a task_id", iostreams.InputPromptConfig{
 					Required: true,
-				}).Return("1234")
+				}).Return("1234", nil)
 			},
 			Teardown: func() {
 				os.Args = os.Args[:len(os.Args)-1]

cmd/datastore/get_test.go

@@ -185,7 +185,7 @@ func TestGetCommand(t *testing.T) {
 				}, nil)
 				clientsMock.IO.On("InputPrompt", mock.Anything, "Enter a task_id", iostreams.InputPromptConfig{
 					Required: true,
-				}).Return("1234")
+				}).Return("1234", nil)
 			},
 			Teardown: func() {
 				os.Args = os.Args[:len(os.Args)-1]