fix(users): filter removed members from tw users by default

package.json

@@ -51,7 +51,7 @@
     ],
     "dependencies": {
         "@doist/cli-core": "0.20.0",
-        "@doist/twist-sdk": "2.7.0",
+        "@doist/twist-sdk": "2.8.1",
         "@pnpm/tabtab": "0.5.4",
         "chalk": "5.6.2",
         "commander": "14.0.3",

skills/twist-cli/SKILL.md

@@ -204,8 +204,9 @@ tw search "query" --all          # Fetch all result pages
 tw user                          # Show current user info
 tw user --json                   # JSON output
 tw user --json --full            # Include all fields in JSON output
-tw users                         # List workspace users
+tw users                         # List active workspace users
 tw users --search <text>         # Filter by name/email
+tw users --include-removed       # Include users removed from the workspace
 tw channels                      # List active joined workspace channels (alias of: tw channel list)
 tw channels --state all          # Include archived joined channels too
 tw channels --scope discoverable # Active public channels you can see but have not joined

src/commands/user.test.ts

@@ -107,3 +107,72 @@ describe('user --json', () => {
         consoleSpy.mockRestore()
     })
 })
+
+describe('tw users --include-removed', () => {
+    const active = {
+        id: 1,
+        name: 'Active',
+        email: 'a@x',
+        userType: 'USER',
+        bot: false,
+        removed: false,
+    }
+    const removed = {
+        id: 2,
+        name: 'Ghost',
+        email: 'ghost@x',
+        userType: 'GUEST',
+        bot: false,
+        removed: true,
+    }
+
+    beforeEach(() => {
+        vi.clearAllMocks()
+        apiMocks.getCurrentWorkspaceId.mockResolvedValue(1)
+    })
+
+    it('passes includeRemoved: undefined by default so the SDK applies its default filter', async () => {
+        apiMocks.getWorkspaceUsers.mockResolvedValueOnce([active])
+        const program = createProgram()
+        const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
+
+        await program.parseAsync(['node', 'tw', 'users'])
+
+        expect(apiMocks.getWorkspaceUsers).toHaveBeenCalledWith(1, { includeRemoved: undefined })
+        expect(consoleSpy.mock.calls.flat().join('\n')).not.toMatch(/\[removed\]/)
+
+        consoleSpy.mockRestore()
+    })
+
+    it('passes includeRemoved: true and annotates removed users in text output', async () => {
+        apiMocks.getWorkspaceUsers.mockResolvedValueOnce([active, removed])
+        const program = createProgram()
+        const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
+
+        await program.parseAsync(['node', 'tw', 'users', '--include-removed'])
+
+        expect(apiMocks.getWorkspaceUsers).toHaveBeenCalledWith(1, { includeRemoved: true })
+        const lines = consoleSpy.mock.calls.flat().join('\n')
+        expect(lines).toMatch(/id:2.*Ghost.*\[removed\]/)
+        expect(lines).not.toMatch(/id:1.*Active.*\[removed\]/)
+
+        consoleSpy.mockRestore()
+    })
+
+    it('surfaces removed in curated --json output without --full', async () => {
+        apiMocks.getWorkspaceUsers.mockResolvedValueOnce([active, removed])
+        const program = createProgram()
+        const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
+
+        await program.parseAsync(['node', 'tw', 'users', '--include-removed', '--json'])
+
+        const parsed = JSON.parse(consoleSpy.mock.calls[0][0])
+        expect(parsed).toHaveLength(2)
+        expect(parsed[0]).toMatchObject({ id: 1, removed: false })
+        expect(parsed[1]).toMatchObject({ id: 2, removed: true })
+        // Curated, not --full: shortName must not leak in.
+        expect(parsed[0]).not.toHaveProperty('shortName')
+
+        consoleSpy.mockRestore()
+    })
+})