diff --git a/README.md b/README.md
index 545af500..043ee6d2 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ here's how it works:
 ```bash
 linear config               # setup your repo, it writes a config file
 
-linear issue list           # list unstarted issues assigned to you
-linear issue list -A        # list unstarted issues assigned to anyone
-linear issue search "login bug"  # search issues in your configured team
+linear issue mine           # list unstarted issues assigned to you
+linear issue query --all-teams  # query issues across all teams
+linear issue query --search "login bug"  # search issues in your configured team
 linear issue start          # choose an issue to start, creates a branch
 linear issue start ABC-123  # start a specific issue
 linear issue view           # see current branch's issue as markdown
@@ -135,8 +135,9 @@ linear issue list      # list your issues in a table view (supports -s/--state a
 linear issue list --project "My Project" --milestone "Phase 1"  # filter by milestone
 linear issue list -w   # open issue list in web browser
 linear issue list -a   # open issue list in Linear.app
-linear issue search "login bug"         # search issues by text in your configured team
-linear issue search "oauth timeout" --team ENG --json  # structured search output for agents
+linear issue query --search "login bug"  # search issues by text in your configured team
+linear issue query --search "oauth timeout" --team ENG --json  # structured search output for agents
+linear issue query --all-teams --json --limit 0  # export all issues as JSON
 linear issue start     # create/switch to issue branch and mark as started
 linear issue create    # create a new issue (interactive prompts)
 linear issue create -t "title" -d "description"  # create with flags
diff --git a/deno.lock b/deno.lock
index 13d94898..4f68a90a 100644
--- a/deno.lock
+++ b/deno.lock
@@ -4,6 +4,7 @@
     "jsr:@cliffy/ansi@1": "1.0.0",
     "jsr:@cliffy/ansi@1.0.0": "1.0.0",
     "jsr:@cliffy/command@1": "1.0.0",
+    "jsr:@cliffy/command@1.0.0": "1.0.0",
     "jsr:@cliffy/flags@1.0.0": "1.0.0",
     "jsr:@cliffy/internal@1": "1.0.0",
     "jsr:@cliffy/internal@1.0.0": "1.0.0",
@@ -40,6 +41,7 @@
     "jsr:@std/testing@^1.0.17": "1.0.17",
     "jsr:@std/text@^1.0.17": "1.0.17",
     "jsr:@std/toml@^1.0.11": "1.0.11",
+    "npm:@graphql-codegen/cli@*": "6.2.1_graphql@16.13.2",
     "npm:@graphql-codegen/cli@^6.2.1": "6.2.1_graphql@16.13.2",
     "npm:@graphql-typed-document-node/core@^3.2.0": "3.2.0_graphql@16.13.2",
     "npm:@types/mdast@^4.0.4": "4.0.4",
diff --git a/skills/linear-cli/SKILL.md b/skills/linear-cli/SKILL.md
index 76e424fc..b0b3507b 100644
--- a/skills/linear-cli/SKILL.md
+++ b/skills/linear-cli/SKILL.md
@@ -79,8 +79,8 @@ linear auth migrate
 
 linear issue
 linear issue id
-linear issue list
-linear issue search
+linear issue mine
+linear issue query
 linear issue title
 linear issue start
 linear issue view
diff --git a/skills/linear-cli/references/issue.md b/skills/linear-cli/references/issue.md
index ff3cf152..ae23cb0b 100644
--- a/skills/linear-cli/references/issue.md
+++ b/skills/linear-cli/references/issue.md
@@ -19,8 +19,8 @@ Options:
 Commands:
 
   id                                      - Print the issue based on the current git branch    
-  list                                    - List your issues                                   
-  search            <term>                - Search issues by text                              
+  mine, list, l                           - List your issues                                   
+  query, q                                - Query issues with structured filters               
   title             [issueId]             - Print the issue title                              
   start             [issueId]             - Start working on an issue                          
   view, v           [issueId]             - View issue details (default) or open in browser/app
@@ -57,76 +57,78 @@ Options:
   --workspace  <slug>  - Target workspace (uses credentials)
 ```
 
-### list
+### mine
 
 > List your issues
 
 ```
-Usage:   linear issue list
+Usage:   linear issue mine
 
 Description:
 
   List your issues
 
+Options:
+
+  -h, --help                       - Show this help.                                                                                                                       
+  --workspace      <slug>          - Target workspace (uses credentials)                                                                                                   
+  -s, --state      <state>         - Filter by issue state (can be repeated for multiple states)                    (Default: [ "unstarted" ], Values: "triage", "backlog",
+                                                                                                                    "unstarted", "started", "completed", "canceled")       
+  --all-states                     - Show issues from all states                                                                                                           
+  --sort           <sort>          - Sort order (can also be set via LINEAR_ISSUE_SORT)                             (Values: "manual", "priority")                         
+  --team           <team>          - Team to list issues for (if not your default team)                                                                                    
+  --project        <project>       - Filter by project name                                                                                                                
+  --project-label  <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                         
+  --cycle          <cycle>         - Filter by cycle name, number, or 'active'                                                                                             
+  --milestone      <milestone>     - Filter by project milestone name (requires --project)                                                                                 
+  -l, --label      <label>         - Filter by label name (can be repeated for multiple labels)                                                                            
+  --limit          <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)           (Default: 50)                                          
+  --created-after  <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  --updated-after  <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  -w, --web                        - Open in web browser                                                                                                                   
+  -a, --app                        - Open in Linear.app                                                                                                                    
+  --no-pager                       - Disable automatic paging for long output
+```
+
+### query
+
+> Query issues with structured filters
+
+```
+Usage:   linear issue query
+
+Description:
+
+  Query issues with structured filters
+
 Options:
 
   -h, --help                           - Show this help.                                                                                                                       
   --workspace          <slug>          - Target workspace (uses credentials)                                                                                                   
-  -s, --state          <state>         - Filter by issue state (can be repeated for multiple states)                    (Default: [ "unstarted" ], Values: "triage", "backlog",
-                                                                                                                        "unstarted", "started", "completed", "canceled")       
-  --all-states                         - Show issues from all states                                                                                                           
+  --search             <term>          - Full-text search term                                                                                                                 
+  --search-comments                    - Also search inside issue comments (requires --search)                                                                                 
+  --team               <team>          - Filter by team key (can be repeated for multiple teams)                                                                               
+  --all-teams                          - Query across all teams                                                                                                                
+  -s, --state          <state>         - Filter by issue state (can be repeated for multiple states)                      (Values: "triage", "backlog", "unstarted", "started",
+                                                                                                                          "completed", "canceled")                             
+  --all-states                         - Show issues from all states (this is the default)                                                                                     
   --assignee           <assignee>      - Filter by assignee (username)                                                                                                         
-  -A, --all-assignees                  - Show issues for all assignees                                                                                                         
+  -A, --all-assignees                  - Show issues for all assignees (this is the default)                                                                                   
   -U, --unassigned                     - Show only unassigned issues                                                                                                           
-  --sort               <sort>          - Sort order (can also be set via LINEAR_ISSUE_SORT)                             (Values: "manual", "priority")                         
-  --team               <team>          - Team to list issues for (if not your default team)                                                                                    
+  --sort               <sort>          - Sort order: manual or priority (default: priority, not available with --search)  (Values: "manual", "priority")                       
   --project            <project>       - Filter by project name                                                                                                                
   --project-label      <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                         
   --cycle              <cycle>         - Filter by cycle name, number, or 'active'                                                                                             
   --milestone          <milestone>     - Filter by project milestone name (requires --project)                                                                                 
   -l, --label          <label>         - Filter by label name (can be repeated for multiple labels)                                                                            
-  --limit              <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)           (Default: 50)                                          
+  --limit              <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)             (Default: 50)                                        
   --created-after      <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                        
   --updated-after      <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                        
-  -w, --web                            - Open in web browser                                                                                                                   
-  -a, --app                            - Open in Linear.app                                                                                                                    
+  --include-archived                   - Include archived issues                                                                                                               
+  -j, --json                           - Output results as JSON                                                                                                                
   --no-pager                           - Disable automatic paging for long output
 ```
 
-### search
-
-> Search issues by text
-
-```
-Usage:   linear issue search <term>
-
-Description:
-
-  Search issues by text
-
-Options:
-
-  -h, --help                          - Show this help.                                                                                                                     
-  --workspace         <slug>          - Target workspace (uses credentials)                                                                                                 
-  --team              <team>          - Team to search in                                                                                                                   
-  --all-teams                         - Search across all teams                                                                                                             
-  -s, --state         <state>         - Filter by issue state (can be repeated for multiple states)                    (Values: "triage", "backlog", "unstarted", "started",
-                                                                                                                       "completed", "canceled")                             
-  --assignee          <assignee>      - Filter by assignee (username)                                                                                                       
-  -U, --unassigned                    - Show only unassigned issues                                                                                                         
-  --project           <project>       - Filter by project name                                                                                                              
-  --project-label     <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                       
-  -l, --label         <label>         - Filter by label name (can be repeated for multiple labels)                                                                          
-  --include-comments                  - Search associated comments too                                                                                                      
-  --include-archived                  - Include archived issues                                                                                                             
-  --created-after     <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                      
-  --updated-after     <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                      
-  --order-by          <orderBy>       - Use the API's supported search ordering                                        (Values: "createdAt", "updatedAt")                   
-  --limit             <limit>         - Maximum number of results to fetch (default: 20, use 0 for unlimited)          (Default: 20)                                        
-  --no-pager                          - Disable automatic paging for long output                                                                                            
-  -j, --json                          - Output search results as JSON
-```
-
 ### title
 
 > Print the issue title
diff --git a/src/commands/issue/issue-list.ts b/src/commands/issue/issue-mine.ts
similarity index 91%
rename from src/commands/issue/issue-list.ts
rename to src/commands/issue/issue-mine.ts
index 8dba7b01..57c65566 100644
--- a/src/commands/issue/issue-list.ts
+++ b/src/commands/issue/issue-mine.ts
@@ -38,8 +38,8 @@ const StateType = new EnumType([
   "canceled",
 ])
 
-export const listCommand = new Command()
-  .name("list")
+export const mineCommand = new Command()
+  .name("mine")
   .description("List your issues")
   .type("sort", SortType)
   .type("state", StateType)
@@ -55,18 +55,6 @@ export const listCommand = new Command()
     "--all-states",
     "Show issues from all states",
   )
-  .option(
-    "--assignee <assignee:string>",
-    "Filter by assignee (username)",
-  )
-  .option(
-    "-A, --all-assignees",
-    "Show issues for all assignees",
-  )
-  .option(
-    "-U, --unassigned",
-    "Show only unassigned issues",
-  )
   .option(
     "--sort <sort:sort>",
     "Sort order (can also be set via LINEAR_ISSUE_SORT)",
@@ -114,6 +102,21 @@ export const listCommand = new Command()
     "--updated-after <date:string>",
     "Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)",
   )
+  .option(
+    "--assignee <assignee:string>",
+    "Removed: use `issue query --assignee` instead",
+    { hidden: true },
+  )
+  .option(
+    "-A, --all-assignees",
+    "Removed: use `issue query --all-assignees` instead",
+    { hidden: true },
+  )
+  .option(
+    "-U, --unassigned",
+    "Removed: use `issue query --unassigned` instead",
+    { hidden: true },
+  )
   .option("-w, --web", "Open in web browser")
   .option("-a, --app", "Open in Linear.app")
   .option("--no-pager", "Disable automatic paging for long output")
@@ -122,12 +125,12 @@ export const listCommand = new Command()
       {
         sort: sortFlag,
         state,
+        allStates,
         assignee,
         allAssignees,
         unassigned,
         web,
         app,
-        allStates,
         team,
         project,
         projectLabel,
@@ -147,14 +150,20 @@ export const listCommand = new Command()
       }
 
       try {
-        const assigneeFilterCount =
-          [assignee, allAssignees, unassigned].filter(Boolean).length
-        if (assigneeFilterCount > 1) {
+        if (assignee != null || allAssignees || unassigned) {
+          const flag = assignee != null
+            ? "--assignee"
+            : allAssignees
+            ? "--all-assignees"
+            : "--unassigned"
           throw new ValidationError(
-            "Cannot specify multiple assignee filters (--assignee, --all-assignees, --unassigned)",
+            `${flag} has been removed from 'issue mine'`,
+            {
+              suggestion:
+                `Use 'linear issue query ${flag}' for assignee filtering.`,
+            },
           )
         }
-
         const stateArray: string[] = Array.isArray(state)
           ? state.flat()
           : [state]
@@ -257,9 +266,9 @@ export const listCommand = new Command()
         const result = await fetchIssuesForState(
           teamKey,
           allStates ? undefined : stateArray,
-          assignee,
-          unassigned,
-          allAssignees,
+          undefined, // assignee — always self
+          false, // unassigned
+          false, // allAssignees
           limit === 0 ? undefined : limit,
           projectId,
           sort,
@@ -303,9 +312,7 @@ export const listCommand = new Command()
             ...issues.map((issue) => unicodeWidth(issue.state.name)),
           ),
         )
-        const ASSIGNEE_WIDTH = 2 // fixed width for assignee initials
         const SPACE_WIDTH = 4
-        const showAssigneeColumn = allAssignees || unassigned
         const updatedHeader = "UPDATED"
         const UPDATED_WIDTH = Math.max(
           unicodeWidth(updatedHeader),
@@ -322,14 +329,9 @@ export const listCommand = new Command()
           state: string
           timeAgo: string
           estimate: number | null | undefined
-          assignee?: string
         }
 
         const tableData: Array<TableRow> = issues.map((issue) => {
-          const assignee = showAssigneeColumn
-            ? (issue.assignee?.initials?.slice(0, 2) || "-")
-            : undefined
-
           let labels: string
           if (issue.labels.nodes.length === 0) {
             labels = " ".repeat(LABEL_WIDTH)
@@ -400,13 +402,11 @@ export const listCommand = new Command()
             state: statePadded,
             timeAgo,
             estimate: issue.estimate,
-            assignee,
           }
         })
 
         const fixed = PRIORITY_WIDTH + ID_WIDTH + UPDATED_WIDTH + SPACE_WIDTH +
-          LABEL_WIDTH + ESTIMATE_WIDTH + STATE_WIDTH + SPACE_WIDTH +
-          (showAssigneeColumn ? ASSIGNEE_WIDTH + SPACE_WIDTH : 0) // sum of fixed columns including spacing for estimate
+          LABEL_WIDTH + ESTIMATE_WIDTH + STATE_WIDTH + SPACE_WIDTH
         const PADDING = 1
         const maxTitleWidth = Math.max(
           ...tableData.map((row) => unicodeWidth(row.title)),
@@ -419,7 +419,6 @@ export const listCommand = new Command()
           padDisplay("TITLE", titleWidth),
           padDisplay("LABELS", LABEL_WIDTH),
           padDisplay("E", ESTIMATE_WIDTH),
-          ...(showAssigneeColumn ? [padDisplay("A", ASSIGNEE_WIDTH)] : []),
           padDisplay("STATE", STATE_WIDTH),
           padDisplay(updatedHeader, UPDATED_WIDTH),
         ]
@@ -439,24 +438,17 @@ export const listCommand = new Command()
             state,
             timeAgo,
             estimate,
-            assignee,
           } = row
           const truncTitle = padDisplay(
             truncateText(title, titleWidth),
             titleWidth,
           )
 
-          const assigneeOutput = showAssigneeColumn
-            ? `${padDisplay(assignee || "-", ASSIGNEE_WIDTH)} `
-            : ""
-
           const issueLine = `${padDisplay(priorityStr, PRIORITY_WIDTH)} ${
             padDisplay(identifier, ID_WIDTH)
           } ${truncTitle} ${labels} ${
             padDisplay(estimate?.toString() || "-", ESTIMATE_WIDTH)
-          } ${assigneeOutput}${state} ${
-            muted(padDisplay(timeAgo, UPDATED_WIDTH))
-          }`
+          } ${state} ${muted(padDisplay(timeAgo, UPDATED_WIDTH))}`
           outputLines.push(issueLine)
         }
 
diff --git a/src/commands/issue/issue-query.ts b/src/commands/issue/issue-query.ts
new file mode 100644
index 00000000..6c85f880
--- /dev/null
+++ b/src/commands/issue/issue-query.ts
@@ -0,0 +1,581 @@
+import { Command, EnumType } from "@cliffy/command"
+import { unicodeWidth } from "@std/cli"
+import { rgb24 } from "@std/fmt/colors"
+import { getOption } from "../../config.ts"
+import {
+  getPriorityDisplay,
+  getTimeAgo,
+  padDisplay,
+  truncateText,
+} from "../../utils/display.ts"
+import {
+  fetchIssuesForQuery,
+  getCycleIdByNameOrNumber,
+  getMilestoneIdByName,
+  getProjectIdByName,
+  getProjectOptionsByName,
+  getTeamIdByKey,
+  getTeamKey,
+  searchIssuesByTerm,
+  selectOption,
+} from "../../utils/linear.ts"
+import { pipeToUserPager, shouldUsePager } from "../../utils/pager.ts"
+import { shouldShowSpinner } from "../../utils/hyperlink.ts"
+import { header, muted } from "../../utils/styling.ts"
+import {
+  handleError,
+  NotFoundError,
+  ValidationError,
+} from "../../utils/errors.ts"
+
+const SortType = new EnumType(["manual", "priority"])
+const StateType = new EnumType([
+  "triage",
+  "backlog",
+  "unstarted",
+  "started",
+  "completed",
+  "canceled",
+])
+
+export const queryCommand = new Command()
+  .name("query")
+  .description("Query issues with structured filters")
+  .type("sort", SortType)
+  .type("state", StateType)
+  .option(
+    "--search <term:string>",
+    "Full-text search term",
+  )
+  .option(
+    "--search-comments",
+    "Also search inside issue comments (requires --search)",
+  )
+  .option(
+    "--team <team:string>",
+    "Filter by team key (can be repeated for multiple teams)",
+    { collect: true },
+  )
+  .option("--all-teams", "Query across all teams")
+  .option(
+    "-s, --state <state:state>",
+    "Filter by issue state (can be repeated for multiple states)",
+    { collect: true },
+  )
+  .option("--all-states", "Show issues from all states (this is the default)")
+  .option("--assignee <assignee:string>", "Filter by assignee (username)")
+  .option(
+    "-A, --all-assignees",
+    "Show issues for all assignees (this is the default)",
+  )
+  .option("-U, --unassigned", "Show only unassigned issues")
+  .option(
+    "--sort <sort:sort>",
+    "Sort order: manual or priority (default: priority, not available with --search)",
+    { required: false },
+  )
+  .option(
+    "--project <project:string>",
+    "Filter by project name",
+  )
+  .option(
+    "--project-label <projectLabel:string>",
+    "Filter by project label name (shows issues from all projects with this label)",
+  )
+  .option(
+    "--cycle <cycle:string>",
+    "Filter by cycle name, number, or 'active'",
+  )
+  .option(
+    "--milestone <milestone:string>",
+    "Filter by project milestone name (requires --project)",
+  )
+  .option(
+    "-l, --label <label:string>",
+    "Filter by label name (can be repeated for multiple labels)",
+    { collect: true },
+  )
+  .option(
+    "--limit <limit:number>",
+    "Maximum number of issues to fetch (default: 50, use 0 for unlimited)",
+    { default: 50 },
+  )
+  .option(
+    "--created-after <date:string>",
+    "Filter issues created after this date (ISO 8601 or YYYY-MM-DD)",
+  )
+  .option(
+    "--updated-after <date:string>",
+    "Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)",
+  )
+  .option("--include-archived", "Include archived issues")
+  .option("-j, --json", "Output results as JSON")
+  .option("--no-pager", "Disable automatic paging for long output")
+  .action(async (options) => {
+    const {
+      search,
+      searchComments,
+      team: teamFlags,
+      allTeams,
+      state,
+      allStates,
+      assignee,
+      allAssignees,
+      unassigned,
+      sort: sortFlag,
+      project,
+      projectLabel,
+      cycle,
+      milestone,
+      label,
+      limit,
+      createdAfter,
+      updatedAfter,
+      includeArchived,
+      json,
+      pager,
+    } = options
+
+    let spinner:
+      | InstanceType<typeof import("@std/cli/unstable-spinner").Spinner>
+      | null = null
+
+    try {
+      // --- Validation ---
+
+      const teamKeys = teamFlags
+        ? (Array.isArray(teamFlags) ? teamFlags.flat() : [teamFlags]).map((
+          t: string,
+        ) => t.toUpperCase())
+        : undefined
+
+      if (teamKeys && teamKeys.length > 0 && allTeams) {
+        throw new ValidationError(
+          "Cannot use both --team and --all-teams flags",
+        )
+      }
+
+      const assigneeFilterCount =
+        [assignee, allAssignees, unassigned].filter(Boolean).length
+      if (assigneeFilterCount > 1) {
+        throw new ValidationError(
+          "Cannot specify multiple assignee filters (--assignee, --all-assignees, --unassigned)",
+        )
+      }
+
+      const stateArray = state
+        ? (Array.isArray(state) ? state.flat() : [state])
+        : undefined
+
+      if (allStates && stateArray && stateArray.length > 0) {
+        throw new ValidationError("Cannot use --all-states with --state flag")
+      }
+
+      if (project != null && projectLabel != null) {
+        throw new ValidationError(
+          "Cannot use --project and --project-label together",
+          {
+            suggestion:
+              "Use --project to filter by a single project, or --project-label to filter by all projects with a given label.",
+          },
+        )
+      }
+
+      if (milestone != null && project == null) {
+        throw new ValidationError(
+          "--milestone requires --project to be set",
+          {
+            suggestion:
+              "Use --project to specify which project the milestone belongs to.",
+          },
+        )
+      }
+
+      if (milestone != null && projectLabel != null) {
+        throw new ValidationError(
+          "--milestone cannot be used with --project-label",
+          {
+            suggestion:
+              "Use --project to specify a single project when filtering by milestone.",
+          },
+        )
+      }
+
+      if (searchComments && !search) {
+        throw new ValidationError(
+          "--search-comments requires --search to be set",
+          {
+            suggestion:
+              'Use --search to provide a search term, e.g. --search "oauth timeout" --search-comments.',
+          },
+        )
+      }
+
+      if (sortFlag && search) {
+        throw new ValidationError(
+          "--sort cannot be used with --search",
+          {
+            suggestion:
+              "Search results use relevance ordering. Remove --sort when using --search.",
+          },
+        )
+      }
+
+      if (limit < 0) {
+        throw new ValidationError("--limit must be 0 or greater")
+      }
+
+      // --- Team scope resolution ---
+
+      let resolvedTeamKeys: string[] | undefined
+      let isMultiTeam = false
+
+      if (allTeams) {
+        resolvedTeamKeys = undefined
+        isMultiTeam = true
+      } else if (teamKeys && teamKeys.length > 0) {
+        resolvedTeamKeys = teamKeys
+        isMultiTeam = teamKeys.length > 1
+      } else {
+        const defaultTeam = getTeamKey()
+        if (!defaultTeam) {
+          throw new ValidationError(
+            "No default team configured and no team scope provided",
+            {
+              suggestion:
+                "Use --team <key> to specify a team, or --all-teams to query the whole workspace.",
+            },
+          )
+        }
+        console.error(
+          `Note: using default team ${defaultTeam}. Pass --team <key> or --all-teams to be explicit.`,
+        )
+        resolvedTeamKeys = [defaultTeam]
+      }
+
+      // --- Resolve entity IDs ---
+
+      let projectId: string | undefined
+      if (project != null) {
+        projectId = await getProjectIdByName(project)
+        if (projectId == null) {
+          const projectOptions = await getProjectOptionsByName(project)
+          if (Object.keys(projectOptions).length === 0) {
+            throw new NotFoundError("Project", project)
+          }
+          if (!Deno.stdin.isTerminal()) {
+            throw new ValidationError(
+              `Project "${project}" not found. Similar projects: ${
+                Object.values(projectOptions).join(", ")
+              }`,
+            )
+          }
+          projectId = await selectOption("Project", project, projectOptions)
+        }
+      }
+
+      let cycleId: string | undefined
+      if (cycle != null) {
+        // Cycle lookup requires a single team
+        if (isMultiTeam || !resolvedTeamKeys || resolvedTeamKeys.length !== 1) {
+          throw new ValidationError(
+            "--cycle requires a single team scope",
+            {
+              suggestion:
+                "Use --team <key> to specify exactly one team when filtering by cycle.",
+            },
+          )
+        }
+        const teamId = await getTeamIdByKey(resolvedTeamKeys[0])
+        if (!teamId) {
+          throw new NotFoundError("Team", resolvedTeamKeys[0])
+        }
+        cycleId = await getCycleIdByNameOrNumber(cycle, teamId)
+      }
+
+      let milestoneId: string | undefined
+      if (milestone != null && projectId != null) {
+        milestoneId = await getMilestoneIdByName(milestone, projectId)
+      }
+
+      const labelNames = label && label.length > 0
+        ? (Array.isArray(label) ? label.flat() : [label])
+        : undefined
+
+      // --- Fetch ---
+
+      const { Spinner } = await import("@std/cli/unstable-spinner")
+      const showSpinner = shouldShowSpinner() && !json
+      spinner = showSpinner ? new Spinner() : null
+      spinner?.start()
+
+      // Resolve sort for non-search mode
+      const sort = search ? undefined : (sortFlag ||
+        (getOption("issue_sort") as "manual" | "priority" | undefined) ||
+        "priority")
+
+      if (search) {
+        // --- Search mode: use searchIssues() backend ---
+        const searchTerm = search.trim()
+        if (searchTerm.length === 0) {
+          throw new ValidationError("--search term cannot be empty")
+        }
+
+        const result = await searchIssuesByTerm(searchTerm, {
+          teamKeys: resolvedTeamKeys,
+          state: stateArray,
+          assignee,
+          unassigned,
+          limit: limit === 0 ? 0 : limit,
+          projectId,
+          projectLabel,
+          labelNames,
+          createdAfter,
+          updatedAfter,
+          includeComments: searchComments,
+          includeArchived,
+        })
+
+        spinner?.stop()
+
+        if (json) {
+          console.log(JSON.stringify(result, null, 2))
+          return
+        }
+
+        if (result.nodes.length === 0) {
+          console.log("No issues found.")
+          return
+        }
+
+        const showAssignee = assignee == null && !unassigned
+        const outputLines = formatIssueTable(
+          result.nodes,
+          isMultiTeam,
+          showAssignee,
+        )
+        outputPaged(outputLines, pager !== false)
+      } else {
+        // --- Filter mode: use issues() backend ---
+        const result = await fetchIssuesForQuery({
+          teamKeys: resolvedTeamKeys,
+          allTeams: allTeams === true,
+          state: stateArray,
+          assignee,
+          unassigned,
+          sort,
+          limit: limit === 0 ? 0 : limit,
+          projectId,
+          projectLabel,
+          cycleId,
+          milestoneId,
+          labelNames,
+          createdAfter,
+          updatedAfter,
+          includeArchived,
+        })
+
+        spinner?.stop()
+
+        if (json) {
+          console.log(JSON.stringify(result, null, 2))
+          return
+        }
+
+        if (result.nodes.length === 0) {
+          console.log("No issues found.")
+          return
+        }
+
+        const showAssignee = assignee == null && !unassigned
+        const outputLines = formatIssueTable(
+          result.nodes,
+          isMultiTeam,
+          showAssignee,
+        )
+        outputPaged(outputLines, pager !== false)
+      }
+    } catch (error) {
+      spinner?.stop()
+      handleError(error, "Failed to query issues")
+    }
+  })
+
+async function outputPaged(
+  outputLines: string[],
+  usePager: boolean,
+): Promise<void> {
+  if (shouldUsePager(outputLines, usePager)) {
+    await pipeToUserPager(outputLines.join("\n"))
+  } else {
+    outputLines.forEach((line) => console.log(line))
+  }
+}
+
+// Display types shared by both backends
+interface DisplayableIssue {
+  identifier: string
+  title: string
+  priority: number
+  estimate?: number | null
+  updatedAt: string
+  state: { name: string; color: string }
+  assignee?: { initials: string } | null
+  team?: { key: string }
+  labels: { nodes: Array<{ name: string; color: string }> }
+}
+
+function formatIssueTable(
+  issues: DisplayableIssue[],
+  showTeamColumn: boolean,
+  showAssigneeColumn: boolean,
+): string[] {
+  const { columns } = Deno.stdout.isTerminal()
+    ? Deno.consoleSize()
+    : { columns: 120 }
+
+  const priorityWidth = 3
+  const idWidth = Math.max(2, ...issues.map((i) => i.identifier.length))
+  const teamWidth = showTeamColumn
+    ? Math.max(
+      4,
+      ...issues.map((i) => unicodeWidth(i.team?.key ?? "")),
+    )
+    : 0
+  const labelWidth = Math.min(
+    25,
+    Math.max(
+      6,
+      ...issues.map((i) =>
+        unicodeWidth(i.labels.nodes.map((l) => l.name).join(", "))
+      ),
+    ),
+  )
+  const estimateWidth = 1
+  const assigneeWidth = showAssigneeColumn ? 2 : 0
+  const stateWidth = Math.min(
+    20,
+    Math.max(5, ...issues.map((i) => unicodeWidth(i.state.name))),
+  )
+  const updatedHeader = "UPDATED"
+  const updatedWidth = Math.max(
+    unicodeWidth(updatedHeader),
+    ...issues.map((i) => unicodeWidth(getTimeAgo(new Date(i.updatedAt)))),
+  )
+
+  const fixedCells = [
+    priorityWidth,
+    idWidth,
+    ...(showTeamColumn ? [teamWidth] : []),
+    labelWidth,
+    estimateWidth,
+    ...(showAssigneeColumn ? [assigneeWidth] : []),
+    stateWidth,
+    updatedWidth,
+  ]
+  const interCellSpacing = fixedCells.length + 1
+  const fixedWidth = fixedCells.reduce((sum, w) => sum + w, 0) +
+    interCellSpacing
+  const maxTitleWidth = Math.max(...issues.map((i) => unicodeWidth(i.title)))
+  const titleWidth = Math.max(10, Math.min(maxTitleWidth, columns - fixedWidth))
+
+  const headerCells = [
+    padDisplay("◌", priorityWidth),
+    padDisplay("ID", idWidth),
+    ...(showTeamColumn ? [padDisplay("TEAM", teamWidth)] : []),
+    padDisplay("TITLE", titleWidth),
+    padDisplay("LABELS", labelWidth),
+    padDisplay("E", estimateWidth),
+    ...(showAssigneeColumn ? [padDisplay("A", assigneeWidth)] : []),
+    padDisplay("STATE", stateWidth),
+    padDisplay(updatedHeader, updatedWidth),
+  ]
+
+  const outputLines = [header(headerCells.join(" "))]
+
+  for (const issue of issues) {
+    const title = padDisplay(
+      truncateText(issue.title, titleWidth),
+      titleWidth,
+    )
+    const stateName = truncateText(issue.state.name, stateWidth)
+    const coloredState = rgb24(
+      stateName,
+      parseInt(issue.state.color.replace("#", ""), 16),
+    )
+    const state = coloredState +
+      " ".repeat(Math.max(0, stateWidth - unicodeWidth(stateName)))
+    const timeAgo = muted(
+      padDisplay(getTimeAgo(new Date(issue.updatedAt)), updatedWidth),
+    )
+    const cells = [
+      padDisplay(getPriorityDisplay(issue.priority), priorityWidth),
+      padDisplay(issue.identifier, idWidth),
+      ...(showTeamColumn ? [padDisplay(issue.team?.key ?? "", teamWidth)] : []),
+      title,
+      formatLabels(issue.labels.nodes, labelWidth),
+      padDisplay(issue.estimate?.toString() || "-", estimateWidth),
+      ...(showAssigneeColumn
+        ? [
+          padDisplay(
+            issue.assignee?.initials?.slice(0, 2) || "-",
+            assigneeWidth,
+          ),
+        ]
+        : []),
+      state,
+      timeAgo,
+    ]
+    outputLines.push(cells.join(" "))
+  }
+
+  return outputLines
+}
+
+function formatLabels(
+  labels: Array<{ name: string; color: string }>,
+  labelWidth: number,
+): string {
+  if (labels.length === 0) {
+    return " ".repeat(labelWidth)
+  }
+
+  const coloredLabels: string[] = []
+  let currentWidth = 0
+
+  for (let i = 0; i < labels.length; i++) {
+    const currentLabel = labels[i]
+    const coloredLabel = rgb24(
+      currentLabel.name,
+      parseInt(currentLabel.color.replace("#", ""), 16),
+    )
+    const separator = i > 0 ? ", " : ""
+    const testText = separator + currentLabel.name
+
+    if (currentWidth + unicodeWidth(testText) > labelWidth) {
+      const remainingWidth = labelWidth - currentWidth
+      if (remainingWidth >= 4) {
+        const truncatedName = truncateText(
+          currentLabel.name,
+          remainingWidth - separator.length,
+        )
+        coloredLabels.push(
+          separator +
+            rgb24(
+              truncatedName,
+              parseInt(currentLabel.color.replace("#", ""), 16),
+            ),
+        )
+      }
+      break
+    }
+
+    coloredLabels.push(separator + coloredLabel)
+    currentWidth += unicodeWidth(testText)
+  }
+
+  const result = coloredLabels.join("")
+  const ansiRegex = new RegExp("\u001B\\[[0-9;]*m", "g")
+  const visibleWidth = unicodeWidth(result.replace(ansiRegex, ""))
+  return result + " ".repeat(Math.max(0, labelWidth - visibleWidth))
+}
diff --git a/src/commands/issue/issue-search.ts b/src/commands/issue/issue-search.ts
deleted file mode 100644
index a04a35ec..00000000
--- a/src/commands/issue/issue-search.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-import { Command, EnumType } from "@cliffy/command"
-import { unicodeWidth } from "@std/cli"
-import { Spinner } from "@std/cli/unstable-spinner"
-import { rgb24 } from "@std/fmt/colors"
-import {
-  getPriorityDisplay,
-  getTimeAgo,
-  padDisplay,
-  truncateText,
-} from "../../utils/display.ts"
-import {
-  getProjectIdByName,
-  getProjectOptionsByName,
-  getTeamKey,
-  searchIssuesByTerm,
-  selectOption,
-} from "../../utils/linear.ts"
-import type { FetchedIssueSearchResult } from "../../utils/linear.ts"
-import { pipeToUserPager, shouldUsePager } from "../../utils/pager.ts"
-import { shouldShowSpinner } from "../../utils/hyperlink.ts"
-import { header, muted } from "../../utils/styling.ts"
-import {
-  handleError,
-  NotFoundError,
-  ValidationError,
-} from "../../utils/errors.ts"
-
-const StateType = new EnumType([
-  "triage",
-  "backlog",
-  "unstarted",
-  "started",
-  "completed",
-  "canceled",
-])
-
-const OrderByType = new EnumType(["createdAt", "updatedAt"])
-
-export const searchCommand = new Command()
-  .name("search")
-  .description("Search issues by text")
-  .arguments("<term:string>")
-  .type("state", StateType)
-  .type("orderBy", OrderByType)
-  .option("--team <team:string>", "Team to search in")
-  .option("--all-teams", "Search across all teams")
-  .option(
-    "-s, --state <state:state>",
-    "Filter by issue state (can be repeated for multiple states)",
-    {
-      collect: true,
-    },
-  )
-  .option("--assignee <assignee:string>", "Filter by assignee (username)")
-  .option("-U, --unassigned", "Show only unassigned issues")
-  .option("--project <project:string>", "Filter by project name")
-  .option(
-    "--project-label <projectLabel:string>",
-    "Filter by project label name (shows issues from all projects with this label)",
-  )
-  .option(
-    "-l, --label <label:string>",
-    "Filter by label name (can be repeated for multiple labels)",
-    { collect: true },
-  )
-  .option("--include-comments", "Search associated comments too")
-  .option("--include-archived", "Include archived issues")
-  .option(
-    "--created-after <date:string>",
-    "Filter issues created after this date (ISO 8601 or YYYY-MM-DD)",
-  )
-  .option(
-    "--updated-after <date:string>",
-    "Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)",
-  )
-  .option(
-    "--order-by <orderBy:orderBy>",
-    "Use the API's supported search ordering",
-  )
-  .option(
-    "--limit <limit:number>",
-    "Maximum number of results to fetch (default: 20, use 0 for unlimited)",
-    { default: 20 },
-  )
-  .option("--no-pager", "Disable automatic paging for long output")
-  .option("-j, --json", "Output search results as JSON")
-  .action(async (options, term) => {
-    let spinner: Spinner | null = null
-
-    const {
-      team,
-      allTeams,
-      state,
-      assignee,
-      unassigned,
-      project,
-      projectLabel,
-      label,
-      includeComments,
-      includeArchived,
-      createdAfter,
-      updatedAfter,
-      orderBy,
-      limit,
-      pager,
-      json,
-    } = options
-
-    try {
-      const searchTerm = term.trim()
-      if (searchTerm.length === 0) {
-        throw new ValidationError("Search term cannot be empty", {
-          suggestion:
-            'Provide a term like `linear issue search "oauth timeout"`.',
-        })
-      }
-
-      if (team != null && allTeams) {
-        throw new ValidationError(
-          "Cannot use both --team and --all-teams flags",
-        )
-      }
-
-      if (limit < 0) {
-        throw new ValidationError("--limit must be 0 or greater")
-      }
-
-      if (assignee != null && unassigned) {
-        throw new ValidationError(
-          "Cannot specify both --assignee and --unassigned",
-        )
-      }
-
-      if (project != null && projectLabel != null) {
-        throw new ValidationError(
-          "Cannot use --project and --project-label together",
-          {
-            suggestion:
-              "Use --project to filter by a single project, or --project-label to filter by all projects with a given label.",
-          },
-        )
-      }
-
-      const teamKey = allTeams
-        ? undefined
-        : (team?.toUpperCase() || getTeamKey())
-      if (!allTeams && teamKey == null) {
-        throw new ValidationError(
-          "Could not determine team key from configuration or team flag",
-          {
-            suggestion:
-              "Use --team to specify a team key, or --all-teams to search across the whole workspace.",
-          },
-        )
-      }
-
-      let projectId: string | undefined
-      if (project != null) {
-        projectId = await getProjectIdByName(project)
-        if (projectId == null) {
-          const projectOptions = await getProjectOptionsByName(project)
-          if (Object.keys(projectOptions).length === 0) {
-            throw new NotFoundError("Project", project)
-          }
-          if (!Deno.stdin.isTerminal()) {
-            throw new ValidationError(
-              `Project "${project}" not found. Similar projects: ${
-                Object.values(projectOptions).join(", ")
-              }`,
-            )
-          }
-          projectId = await selectOption("Project", project, projectOptions)
-          if (projectId == null) {
-            throw new NotFoundError("Project", project)
-          }
-        }
-      }
-
-      const stateArray = Array.isArray(state)
-        ? state.flat()
-        : (state != null ? [state] : undefined)
-      const labelNames = Array.isArray(label) && label.length > 0
-        ? label.flat()
-        : undefined
-
-      spinner = shouldShowSpinner() && !json ? new Spinner() : null
-      spinner?.start()
-
-      const result = await searchIssuesByTerm(searchTerm, {
-        teamKey,
-        state: stateArray,
-        assignee,
-        unassigned,
-        limit,
-        projectId,
-        projectLabel,
-        labelNames,
-        createdAfter,
-        updatedAfter,
-        includeComments,
-        includeArchived,
-        orderBy,
-      })
-
-      spinner?.stop()
-
-      if (json) {
-        console.log(JSON.stringify(result, null, 2))
-        return
-      }
-
-      if (result.nodes.length === 0) {
-        console.log("No issues found.")
-        return
-      }
-
-      const outputLines = formatIssuesForDisplay(
-        result.nodes,
-        allTeams === true,
-        assignee == null && !unassigned,
-      )
-      const usePager = pager !== false
-
-      if (shouldUsePager(outputLines, usePager)) {
-        await pipeToUserPager(outputLines.join("\n"))
-      } else {
-        outputLines.forEach((line) => console.log(line))
-      }
-    } catch (error) {
-      spinner?.stop()
-      handleError(error, "Failed to search issues")
-    }
-  })
-
-function formatIssuesForDisplay(
-  issues: FetchedIssueSearchResult[],
-  showTeamColumn: boolean,
-  showAssigneeColumn: boolean,
-): string[] {
-  const { columns } = Deno.stdout.isTerminal()
-    ? Deno.consoleSize()
-    : { columns: 120 }
-
-  const priorityWidth = 3
-  const idWidth = Math.max(2, ...issues.map((issue) => issue.identifier.length))
-  const teamWidth = showTeamColumn
-    ? Math.max(4, ...issues.map((issue) => unicodeWidth(issue.team.key)))
-    : 0
-  const labelWidth = Math.min(
-    25,
-    Math.max(
-      6,
-      ...issues.map((issue) =>
-        unicodeWidth(
-          issue.labels.nodes.map((currentLabel) => currentLabel.name).join(
-            ", ",
-          ),
-        )
-      ),
-    ),
-  )
-  const assigneeWidth = showAssigneeColumn ? 2 : 0
-  const stateWidth = Math.min(
-    20,
-    Math.max(5, ...issues.map((issue) => unicodeWidth(issue.state.name))),
-  )
-  const updatedHeader = "UPDATED"
-  const updatedWidth = Math.max(
-    unicodeWidth(updatedHeader),
-    ...issues.map((issue) =>
-      unicodeWidth(getTimeAgo(new Date(issue.updatedAt)))
-    ),
-  )
-
-  const fixedCells = [
-    priorityWidth,
-    idWidth,
-    ...(showTeamColumn ? [teamWidth] : []),
-    labelWidth,
-    ...(showAssigneeColumn ? [assigneeWidth] : []),
-    stateWidth,
-    updatedWidth,
-  ]
-  const interCellSpacing = fixedCells.length + 1
-  const fixedWidth = fixedCells.reduce((sum, width) => sum + width, 0) +
-    interCellSpacing
-  const maxTitleWidth = Math.max(
-    ...issues.map((issue) => unicodeWidth(issue.title)),
-  )
-  const titleWidth = Math.max(10, Math.min(maxTitleWidth, columns - fixedWidth))
-
-  const headerCells = [
-    padDisplay("◌", priorityWidth),
-    padDisplay("ID", idWidth),
-    ...(showTeamColumn ? [padDisplay("TEAM", teamWidth)] : []),
-    padDisplay("TITLE", titleWidth),
-    padDisplay("LABELS", labelWidth),
-    ...(showAssigneeColumn ? [padDisplay("A", assigneeWidth)] : []),
-    padDisplay("STATE", stateWidth),
-    padDisplay(updatedHeader, updatedWidth),
-  ]
-
-  const outputLines = [header(headerCells.join(" "))]
-
-  for (const issue of issues) {
-    const title = padDisplay(truncateText(issue.title, titleWidth), titleWidth)
-    const stateName = truncateText(issue.state.name, stateWidth)
-    const coloredState = rgb24(
-      stateName,
-      parseInt(issue.state.color.replace("#", ""), 16),
-    )
-    const state = coloredState +
-      " ".repeat(Math.max(0, stateWidth - unicodeWidth(stateName)))
-    const timeAgo = muted(
-      padDisplay(getTimeAgo(new Date(issue.updatedAt)), updatedWidth),
-    )
-    const cells = [
-      padDisplay(getPriorityDisplay(issue.priority), priorityWidth),
-      padDisplay(issue.identifier, idWidth),
-      ...(showTeamColumn ? [padDisplay(issue.team.key, teamWidth)] : []),
-      title,
-      formatLabels(issue, labelWidth),
-      ...(showAssigneeColumn
-        ? [
-          padDisplay(
-            issue.assignee?.initials?.slice(0, 2) || "-",
-            assigneeWidth,
-          ),
-        ]
-        : []),
-      state,
-      timeAgo,
-    ]
-    outputLines.push(cells.join(" "))
-  }
-
-  return outputLines
-}
-
-function formatLabels(
-  issue: FetchedIssueSearchResult,
-  labelWidth: number,
-): string {
-  if (issue.labels.nodes.length === 0) {
-    return " ".repeat(labelWidth)
-  }
-
-  const coloredLabels: string[] = []
-  let currentWidth = 0
-
-  for (let i = 0; i < issue.labels.nodes.length; i++) {
-    const currentLabel = issue.labels.nodes[i]
-    const coloredLabel = rgb24(
-      currentLabel.name,
-      parseInt(currentLabel.color.replace("#", ""), 16),
-    )
-    const separator = i > 0 ? ", " : ""
-    const testText = separator + currentLabel.name
-
-    if (currentWidth + unicodeWidth(testText) > labelWidth) {
-      const remainingWidth = labelWidth - currentWidth
-      if (remainingWidth >= 4) {
-        const truncatedName = truncateText(
-          currentLabel.name,
-          remainingWidth - separator.length,
-        )
-        coloredLabels.push(
-          separator +
-            rgb24(
-              truncatedName,
-              parseInt(currentLabel.color.replace("#", ""), 16),
-            ),
-        )
-      }
-      break
-    }
-
-    coloredLabels.push(separator + coloredLabel)
-    currentWidth += unicodeWidth(testText)
-  }
-
-  const labels = coloredLabels.join("")
-  const ansiRegex = new RegExp("\u001B\\[[0-9;]*m", "g")
-  const visibleWidth = unicodeWidth(labels.replace(ansiRegex, ""))
-  return labels + " ".repeat(Math.max(0, labelWidth - visibleWidth))
-}
diff --git a/src/commands/issue/issue.ts b/src/commands/issue/issue.ts
index 602c3626..5a0d3427 100644
--- a/src/commands/issue/issue.ts
+++ b/src/commands/issue/issue.ts
@@ -7,10 +7,10 @@ import { describeCommand } from "./issue-describe.ts"
 import { commitsCommand } from "./issue-commits.ts"
 import { idCommand } from "./issue-id.ts"
 import { linkCommand } from "./issue-link.ts"
-import { listCommand } from "./issue-list.ts"
+import { mineCommand } from "./issue-mine.ts"
 import { pullRequestCommand } from "./issue-pull-request.ts"
+import { queryCommand } from "./issue-query.ts"
 import { relationCommand } from "./issue-relation.ts"
-import { searchCommand } from "./issue-search.ts"
 import { agentSessionCommand } from "./issue-agent-session.ts"
 import { startCommand } from "./issue-start.ts"
 import { titleCommand } from "./issue-title.ts"
@@ -24,8 +24,11 @@ export const issueCommand = new Command()
     this.showHelp()
   })
   .command("id", idCommand)
-  .command("list", listCommand)
-  .command("search", searchCommand)
+  .command("mine", mineCommand)
+  .alias("list")
+  .alias("l")
+  .command("query", queryCommand)
+  .alias("q")
   .command("title", titleCommand)
   .command("start", startCommand)
   .command("view", viewCommand)
diff --git a/src/utils/linear.ts b/src/utils/linear.ts
index 501617ec..4b373cd0 100644
--- a/src/utils/linear.ts
+++ b/src/utils/linear.ts
@@ -4,6 +4,7 @@ import type {
   GetAllTeamsQueryVariables as _GetAllTeamsQueryVariables,
   GetIssueDetailsQuery,
   GetIssueDetailsWithCommentsQuery,
+  GetIssuesForQueryQuery,
   GetIssuesForStateQuery,
   GetTeamMembersQuery,
   IssueFilter,
@@ -669,6 +670,241 @@ export async function fetchIssuesForState(
   }
 }
 
+const queryIssuesQuery = gql(/* GraphQL */ `
+  query GetIssuesForQuery(
+    $sort: [IssueSortInput!]
+    $filter: IssueFilter
+    $first: Int
+    $after: String
+    $includeArchived: Boolean
+  ) {
+    issues(
+      filter: $filter
+      sort: $sort
+      first: $first
+      after: $after
+      includeArchived: $includeArchived
+    ) {
+      nodes {
+        id
+        identifier
+        title
+        url
+        priority
+        priorityLabel
+        estimate
+        createdAt
+        updatedAt
+        state {
+          id
+          name
+          color
+          type
+        }
+        assignee {
+          id
+          name
+          displayName
+          initials
+        }
+        team {
+          id
+          key
+          name
+        }
+        project {
+          id
+          name
+        }
+        projectMilestone {
+          id
+          name
+        }
+        cycle {
+          id
+          number
+          name
+        }
+        labels {
+          nodes {
+            id
+            name
+            color
+          }
+        }
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+`)
+
+type QueryIssuesPayload = GetIssuesForQueryQuery["issues"]
+
+export type FetchedQueryIssueResult = QueryIssuesPayload["nodes"][number]
+
+export type FetchedQueryIssuePayload = {
+  nodes: QueryIssuesPayload["nodes"]
+  pageInfo: QueryIssuesPayload["pageInfo"]
+}
+
+export interface FetchIssuesForQueryOptions {
+  teamKeys?: string[]
+  allTeams?: boolean
+  state?: string[]
+  assignee?: string
+  unassigned?: boolean
+  sort?: "manual" | "priority"
+  limit?: number
+  projectId?: string
+  projectLabel?: string
+  cycleId?: string
+  milestoneId?: string
+  labelNames?: string[]
+  createdAfter?: string
+  updatedAfter?: string
+  includeArchived?: boolean
+}
+
+export async function fetchIssuesForQuery(
+  options: FetchIssuesForQueryOptions,
+): Promise<FetchedQueryIssuePayload> {
+  const filter: IssueFilter = {}
+
+  if (options.allTeams) {
+    // No team filter — workspace-wide
+  } else if (options.teamKeys && options.teamKeys.length > 0) {
+    if (options.teamKeys.length === 1) {
+      filter.team = { key: { eq: options.teamKeys[0] } }
+    } else {
+      filter.team = {
+        or: options.teamKeys.map((key) => ({ key: { eq: key } })),
+      }
+    }
+  }
+
+  if (options.state && options.state.length > 0) {
+    filter.state = { type: { in: options.state } }
+  }
+
+  if (options.unassigned) {
+    filter.assignee = { null: true }
+  } else if (options.assignee) {
+    const userId = await lookupUserId(options.assignee)
+    if (!userId) {
+      throw new NotFoundError("User", options.assignee)
+    }
+    filter.assignee = { id: { eq: userId } }
+  }
+  // No implicit assignee — default is all assignees
+
+  if (options.projectId) {
+    filter.project = { id: { eq: options.projectId } }
+  } else if (options.projectLabel) {
+    filter.project = {
+      labels: { name: { eqIgnoreCase: options.projectLabel } },
+    }
+  }
+
+  if (options.cycleId) {
+    filter.cycle = { id: { eq: options.cycleId } }
+  }
+
+  if (options.milestoneId) {
+    filter.projectMilestone = { id: { eq: options.milestoneId } }
+  }
+
+  if (options.labelNames && options.labelNames.length > 0) {
+    if (options.labelNames.length === 1) {
+      filter.labels = {
+        some: { name: { eqIgnoreCase: options.labelNames[0] } },
+      }
+    } else {
+      filter.labels = {
+        and: options.labelNames.map((name) => ({
+          some: { name: { eqIgnoreCase: name } },
+        })),
+      }
+    }
+  }
+
+  if (options.createdAfter) {
+    filter.createdAt = {
+      gte: parseDateFilter(options.createdAfter, "--created-after"),
+    }
+  }
+
+  if (options.updatedAfter) {
+    filter.updatedAt = {
+      gte: parseDateFilter(options.updatedAfter, "--updated-after"),
+    }
+  }
+
+  const sort = options.sort ?? "priority"
+  let sortPayload: Array<IssueSortInput>
+  switch (sort) {
+    case "manual":
+      sortPayload = [
+        { workflowState: { order: "Descending" } },
+        { manual: { nulls: "last" as const, order: "Ascending" as const } },
+      ]
+      break
+    case "priority":
+      sortPayload = [
+        { workflowState: { order: "Descending" } },
+        { priority: { nulls: "last" as const, order: "Descending" as const } },
+        { manual: { nulls: "last" as const, order: "Ascending" as const } },
+      ]
+      break
+    default:
+      throw new ValidationError(`Unknown sort type: ${sort}`, {
+        suggestion: "Use 'manual' or 'priority'",
+      })
+  }
+
+  const client = getGraphQLClient()
+  const fetchAll = options.limit === 0
+  const limit = options.limit ?? 50
+  const pageSize = fetchAll ? 100 : Math.min(limit, 100)
+
+  const allNodes: QueryIssuesPayload["nodes"] = []
+  let hasNextPage = true
+  let after: string | null | undefined = undefined
+  let lastPageInfo: QueryIssuesPayload["pageInfo"] = {
+    hasNextPage: false,
+    endCursor: null,
+  }
+
+  while (hasNextPage) {
+    const result: GetIssuesForQueryQuery = await client.request(
+      queryIssuesQuery,
+      {
+        sort: sortPayload,
+        filter: Object.keys(filter).length > 0 ? filter : undefined,
+        first: pageSize,
+        after,
+        includeArchived: options.includeArchived,
+      },
+    )
+
+    allNodes.push(...result.issues.nodes)
+    lastPageInfo = result.issues.pageInfo
+    hasNextPage = result.issues.pageInfo.hasNextPage
+    after = result.issues.pageInfo.endCursor
+
+    if (!fetchAll && allNodes.length >= limit) {
+      break
+    }
+  }
+
+  return {
+    nodes: fetchAll ? allNodes : allNodes.slice(0, limit),
+    pageInfo: lastPageInfo,
+  }
+}
+
 const searchIssuesQuery = gql(/* GraphQL */ `
   query SearchIssues(
     $term: String!
@@ -758,6 +994,7 @@ export type FetchedIssueSearchPayload = {
 
 export interface SearchIssuesByTermOptions {
   teamKey?: string
+  teamKeys?: string[]
   state?: string[]
   assignee?: string
   unassigned?: boolean
@@ -778,7 +1015,15 @@ export async function searchIssuesByTerm(
 ): Promise<FetchedIssueSearchPayload> {
   const filter: IssueFilter = {}
 
-  if (options.teamKey != null) {
+  if (options.teamKeys != null && options.teamKeys.length > 0) {
+    if (options.teamKeys.length === 1) {
+      filter.team = { key: { eq: options.teamKeys[0] } }
+    } else {
+      filter.team = {
+        or: options.teamKeys.map((key) => ({ key: { eq: key } })),
+      }
+    }
+  } else if (options.teamKey != null) {
     filter.team = { key: { eq: options.teamKey } }
   }
 
diff --git a/test/commands/issue/__snapshots__/issue-list.test.ts.snap b/test/commands/issue/__snapshots__/issue-list.test.ts.snap
index f8a3aa89..610a4096 100644
--- a/test/commands/issue/__snapshots__/issue-list.test.ts.snap
+++ b/test/commands/issue/__snapshots__/issue-list.test.ts.snap
@@ -3,7 +3,7 @@ export const snapshot = {};
 snapshot[`Issue List Command - Help Text 1`] = `
 stdout:
 \`
-Usage: list
+Usage: mine
 
 Description:
 
@@ -11,37 +11,25 @@ Description:
 
 Options:
 
-  -h, --help                           - Show this help.                                                                                                                       
-  -s, --state          <state>         - Filter by issue state (can be repeated for multiple states)                    (Default: [ \\x1b[32m"unstarted"\\x1b[39m ], Values: \\x1b[32m"triage"\\x1b[39m, \\x1b[32m"backlog"\\x1b[39m,
-                                                                                                                        \\x1b[32m"unstarted"\\x1b[39m, \\x1b[32m"started"\\x1b[39m, \\x1b[32m"completed"\\x1b[39m, \\x1b[32m"canceled"\\x1b[39m)       
-  --all-states                         - Show issues from all states                                                                                                           
-  --assignee           <assignee>      - Filter by assignee (username)                                                                                                         
-  -A, --all-assignees                  - Show issues for all assignees                                                                                                         
-  -U, --unassigned                     - Show only unassigned issues                                                                                                           
-  --sort               <sort>          - Sort order (can also be set via LINEAR_ISSUE_SORT)                             (Values: \\x1b[32m"manual"\\x1b[39m, \\x1b[32m"priority"\\x1b[39m)                         
-  --team               <team>          - Team to list issues for (if not your default team)                                                                                    
-  --project            <project>       - Filter by project name                                                                                                                
-  --project-label      <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                         
-  --cycle              <cycle>         - Filter by cycle name, number, or 'active'                                                                                             
-  --milestone          <milestone>     - Filter by project milestone name (requires --project)                                                                                 
-  -l, --label          <label>         - Filter by label name (can be repeated for multiple labels)                                                                            
-  --limit              <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)           (Default: \\x1b[33m50\\x1b[39m)                                          
-  --created-after      <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                        
-  --updated-after      <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                        
-  -w, --web                            - Open in web browser                                                                                                                   
-  -a, --app                            - Open in Linear.app                                                                                                                    
-  --no-pager                           - Disable automatic paging for long output                                                                                              
+  -h, --help                       - Show this help.                                                                                                                       
+  -s, --state      <state>         - Filter by issue state (can be repeated for multiple states)                    (Default: [ \\x1b[32m"unstarted"\\x1b[39m ], Values: \\x1b[32m"triage"\\x1b[39m, \\x1b[32m"backlog"\\x1b[39m,
+                                                                                                                    \\x1b[32m"unstarted"\\x1b[39m, \\x1b[32m"started"\\x1b[39m, \\x1b[32m"completed"\\x1b[39m, \\x1b[32m"canceled"\\x1b[39m)       
+  --all-states                     - Show issues from all states                                                                                                           
+  --sort           <sort>          - Sort order (can also be set via LINEAR_ISSUE_SORT)                             (Values: \\x1b[32m"manual"\\x1b[39m, \\x1b[32m"priority"\\x1b[39m)                         
+  --team           <team>          - Team to list issues for (if not your default team)                                                                                    
+  --project        <project>       - Filter by project name                                                                                                                
+  --project-label  <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                         
+  --cycle          <cycle>         - Filter by cycle name, number, or 'active'                                                                                             
+  --milestone      <milestone>     - Filter by project milestone name (requires --project)                                                                                 
+  -l, --label      <label>         - Filter by label name (can be repeated for multiple labels)                                                                            
+  --limit          <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)           (Default: \\x1b[33m50\\x1b[39m)                                          
+  --created-after  <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  --updated-after  <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  -w, --web                        - Open in web browser                                                                                                                   
+  -a, --app                        - Open in Linear.app                                                                                                                    
+  --no-pager                       - Disable automatic paging for long output                                                                                              
 
 \`
 stderr:
 ""
 `;
-
-snapshot[`Issue List Command - Filter By Label 1`] = `
-stdout:
-"◌   ID      TITLE         LABELS E STATE       UPDATED    
-⚠⚠⚠ ENG-101 Fix login bug Bug    3 In Progress 17 days ago
-"
-stderr:
-""
-`;
diff --git a/test/commands/issue/__snapshots__/issue-mine.test.ts.snap b/test/commands/issue/__snapshots__/issue-mine.test.ts.snap
new file mode 100644
index 00000000..4512a51c
--- /dev/null
+++ b/test/commands/issue/__snapshots__/issue-mine.test.ts.snap
@@ -0,0 +1,35 @@
+export const snapshot = {};
+
+snapshot[`Issue Mine Command - Help Text 1`] = `
+stdout:
+\`
+Usage: mine
+
+Description:
+
+  List your issues
+
+Options:
+
+  -h, --help                       - Show this help.                                                                                                                       
+  -s, --state      <state>         - Filter by issue state (can be repeated for multiple states)                    (Default: [ \\x1b[32m"unstarted"\\x1b[39m ], Values: \\x1b[32m"triage"\\x1b[39m, \\x1b[32m"backlog"\\x1b[39m,
+                                                                                                                    \\x1b[32m"unstarted"\\x1b[39m, \\x1b[32m"started"\\x1b[39m, \\x1b[32m"completed"\\x1b[39m, \\x1b[32m"canceled"\\x1b[39m)       
+  --all-states                     - Show issues from all states                                                                                                           
+  --sort           <sort>          - Sort order (can also be set via LINEAR_ISSUE_SORT)                             (Values: \\x1b[32m"manual"\\x1b[39m, \\x1b[32m"priority"\\x1b[39m)                         
+  --team           <team>          - Team to list issues for (if not your default team)                                                                                    
+  --project        <project>       - Filter by project name                                                                                                                
+  --project-label  <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                         
+  --cycle          <cycle>         - Filter by cycle name, number, or 'active'                                                                                             
+  --milestone      <milestone>     - Filter by project milestone name (requires --project)                                                                                 
+  -l, --label      <label>         - Filter by label name (can be repeated for multiple labels)                                                                            
+  --limit          <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)           (Default: \\x1b[33m50\\x1b[39m)                                          
+  --created-after  <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  --updated-after  <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  -w, --web                        - Open in web browser                                                                                                                   
+  -a, --app                        - Open in Linear.app                                                                                                                    
+  --no-pager                       - Disable automatic paging for long output                                                                                              
+
+\`
+stderr:
+""
+`;
diff --git a/test/commands/issue/__snapshots__/issue-query.test.ts.snap b/test/commands/issue/__snapshots__/issue-query.test.ts.snap
new file mode 100644
index 00000000..61138378
--- /dev/null
+++ b/test/commands/issue/__snapshots__/issue-query.test.ts.snap
@@ -0,0 +1,162 @@
+export const snapshot = {};
+
+snapshot[`Issue Query Command - Help Text 1`] = `
+stdout:
+\`
+Usage: query
+
+Description:
+
+  Query issues with structured filters
+
+Options:
+
+  -h, --help                           - Show this help.                                                                                                                       
+  --search             <term>          - Full-text search term                                                                                                                 
+  --search-comments                    - Also search inside issue comments (requires --search)                                                                                 
+  --team               <team>          - Filter by team key (can be repeated for multiple teams)                                                                               
+  --all-teams                          - Query across all teams                                                                                                                
+  -s, --state          <state>         - Filter by issue state (can be repeated for multiple states)                      (Values: \\x1b[32m"triage"\\x1b[39m, \\x1b[32m"backlog"\\x1b[39m, \\x1b[32m"unstarted"\\x1b[39m, \\x1b[32m"started"\\x1b[39m,
+                                                                                                                          \\x1b[32m"completed"\\x1b[39m, \\x1b[32m"canceled"\\x1b[39m)                             
+  --all-states                         - Show issues from all states (this is the default)                                                                                     
+  --assignee           <assignee>      - Filter by assignee (username)                                                                                                         
+  -A, --all-assignees                  - Show issues for all assignees (this is the default)                                                                                   
+  -U, --unassigned                     - Show only unassigned issues                                                                                                           
+  --sort               <sort>          - Sort order: manual or priority (default: priority, not available with --search)  (Values: \\x1b[32m"manual"\\x1b[39m, \\x1b[32m"priority"\\x1b[39m)                       
+  --project            <project>       - Filter by project name                                                                                                                
+  --project-label      <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                         
+  --cycle              <cycle>         - Filter by cycle name, number, or 'active'                                                                                             
+  --milestone          <milestone>     - Filter by project milestone name (requires --project)                                                                                 
+  -l, --label          <label>         - Filter by label name (can be repeated for multiple labels)                                                                            
+  --limit              <limit>         - Maximum number of issues to fetch (default: 50, use 0 for unlimited)             (Default: \\x1b[33m50\\x1b[39m)                                        
+  --created-after      <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  --updated-after      <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                        
+  --include-archived                   - Include archived issues                                                                                                               
+  -j, --json                           - Output results as JSON                                                                                                                
+  --no-pager                           - Disable automatic paging for long output                                                                                              
+
+\`
+stderr:
+""
+`;
+
+snapshot[`Issue Query Command - JSON Output 1`] = `
+stdout:
+'{
+  "nodes": [
+    {
+      "id": "issue-1",
+      "identifier": "ENG-101",
+      "title": "Fix login bug",
+      "url": "https://linear.app/test/issue/ENG-101/fix-login-bug",
+      "priority": 2,
+      "priorityLabel": "High",
+      "estimate": 3,
+      "createdAt": "2026-04-01T10:00:00.000Z",
+      "updatedAt": "2026-04-02T08:15:00.000Z",
+      "state": {
+        "id": "state-1",
+        "name": "In Progress",
+        "color": "#f2c94c",
+        "type": "started"
+      },
+      "assignee": {
+        "id": "user-1",
+        "name": "jane.smith",
+        "displayName": "Jane Smith",
+        "initials": "JS"
+      },
+      "team": {
+        "id": "team-1",
+        "key": "ENG",
+        "name": "Engineering"
+      },
+      "project": {
+        "id": "project-1",
+        "name": "Auth Improvements"
+      },
+      "projectMilestone": null,
+      "cycle": null,
+      "labels": {
+        "nodes": [
+          {
+            "id": "label-1",
+            "name": "Bug",
+            "color": "#eb5757"
+          }
+        ]
+      }
+    }
+  ],
+  "pageInfo": {
+    "hasNextPage": false,
+    "endCursor": "cursor-1"
+  }
+}
+'
+stderr:
+""
+`;
+
+snapshot[`Issue Query Command - Search JSON Output 1`] = `
+stdout:
+'{
+  "nodes": [
+    {
+      "id": "issue-1",
+      "identifier": "ENG-101",
+      "title": "Fix login bug",
+      "url": "https://linear.app/test/issue/ENG-101/fix-login-bug",
+      "priority": 2,
+      "priorityLabel": "High",
+      "estimate": 3,
+      "createdAt": "2026-04-01T10:00:00.000Z",
+      "updatedAt": "2026-04-02T08:15:00.000Z",
+      "state": {
+        "id": "state-1",
+        "name": "In Progress",
+        "color": "#f2c94c",
+        "type": "started"
+      },
+      "assignee": {
+        "id": "user-1",
+        "name": "jane.smith",
+        "displayName": "Jane Smith",
+        "initials": "JS"
+      },
+      "team": {
+        "id": "team-1",
+        "key": "ENG",
+        "name": "Engineering"
+      },
+      "project": {
+        "id": "project-1",
+        "name": "Auth Improvements"
+      },
+      "projectMilestone": null,
+      "cycle": null,
+      "labels": {
+        "nodes": [
+          {
+            "id": "label-1",
+            "name": "Bug",
+            "color": "#eb5757"
+          }
+        ]
+      },
+      "metadata": {
+        "context": {},
+        "score": 0.42
+      }
+    }
+  ],
+  "pageInfo": {
+    "hasNextPage": false,
+    "endCursor": "cursor-1"
+  },
+  "totalCount": 1
+}
+'
+stderr:
+""
+`;
diff --git a/test/commands/issue/__snapshots__/issue-search.test.ts.snap b/test/commands/issue/__snapshots__/issue-search.test.ts.snap
deleted file mode 100644
index 6c8b6542..00000000
--- a/test/commands/issue/__snapshots__/issue-search.test.ts.snap
+++ /dev/null
@@ -1,107 +0,0 @@
-export const snapshot = {};
-
-snapshot[`Issue Search Command - Help Text 1`] = `
-stdout:
-\`
-Usage: search <term>
-
-Description:
-
-  Search issues by text
-
-Options:
-
-  -h, --help                          - Show this help.                                                                                                                     
-  --team              <team>          - Team to search in                                                                                                                   
-  --all-teams                         - Search across all teams                                                                                                             
-  -s, --state         <state>         - Filter by issue state (can be repeated for multiple states)                    (Values: \\x1b[32m"triage"\\x1b[39m, \\x1b[32m"backlog"\\x1b[39m, \\x1b[32m"unstarted"\\x1b[39m, \\x1b[32m"started"\\x1b[39m,
-                                                                                                                       \\x1b[32m"completed"\\x1b[39m, \\x1b[32m"canceled"\\x1b[39m)                             
-  --assignee          <assignee>      - Filter by assignee (username)                                                                                                       
-  -U, --unassigned                    - Show only unassigned issues                                                                                                         
-  --project           <project>       - Filter by project name                                                                                                              
-  --project-label     <projectLabel>  - Filter by project label name (shows issues from all projects with this label)                                                       
-  -l, --label         <label>         - Filter by label name (can be repeated for multiple labels)                                                                          
-  --include-comments                  - Search associated comments too                                                                                                      
-  --include-archived                  - Include archived issues                                                                                                             
-  --created-after     <date>          - Filter issues created after this date (ISO 8601 or YYYY-MM-DD)                                                                      
-  --updated-after     <date>          - Filter issues updated after this date (ISO 8601 or YYYY-MM-DD)                                                                      
-  --order-by          <orderBy>       - Use the API's supported search ordering                                        (Values: \\x1b[32m"createdAt"\\x1b[39m, \\x1b[32m"updatedAt"\\x1b[39m)                   
-  --limit             <limit>         - Maximum number of results to fetch (default: 20, use 0 for unlimited)          (Default: \\x1b[33m20\\x1b[39m)                                        
-  --no-pager                          - Disable automatic paging for long output                                                                                            
-  -j, --json                          - Output search results as JSON                                                                                                       
-
-\`
-stderr:
-""
-`;
-
-snapshot[`Issue Search Command - JSON Output 1`] = `
-stdout:
-'{
-  "nodes": [
-    {
-      "id": "issue-1",
-      "identifier": "CLI-90",
-      "title": "OAuth timeout in CLI auth flow",
-      "url": "https://linear.app/schpet/issue/CLI-90/oauth-timeout-in-cli-auth-flow",
-      "priority": 2,
-      "priorityLabel": "High",
-      "estimate": 3,
-      "createdAt": "2026-04-01T10:00:00.000Z",
-      "updatedAt": "2026-04-02T08:15:00.000Z",
-      "state": {
-        "id": "state-1",
-        "name": "In Progress",
-        "color": "#f2c94c",
-        "type": "started"
-      },
-      "assignee": {
-        "id": "user-1",
-        "name": "jane.smith",
-        "displayName": "Jane Smith",
-        "initials": "JS"
-      },
-      "team": {
-        "id": "team-1",
-        "key": "CLI",
-        "name": "Linear CLI"
-      },
-      "project": {
-        "id": "project-1",
-        "name": "Auth Improvements"
-      },
-      "projectMilestone": null,
-      "cycle": null,
-      "labels": {
-        "nodes": [
-          {
-            "id": "label-1",
-            "name": "Bug",
-            "color": "#eb5757"
-          }
-        ]
-      },
-      "metadata": {
-        "context": {},
-        "score": 0.42
-      }
-    }
-  ],
-  "pageInfo": {
-    "hasNextPage": false,
-    "endCursor": "cursor-1"
-  },
-  "totalCount": 1
-}
-'
-stderr:
-""
-`;
-
-snapshot[`Issue Search Command - No Results 1`] = `
-stdout:
-"No issues found.
-"
-stderr:
-""
-`;
diff --git a/test/commands/issue/issue-list.test.ts b/test/commands/issue/issue-list.test.ts
index 9895fa04..02df8216 100644
--- a/test/commands/issue/issue-list.test.ts
+++ b/test/commands/issue/issue-list.test.ts
@@ -2,7 +2,7 @@ import { snapshotTest as cliffySnapshotTest } from "@cliffy/testing"
 import { assertEquals, assertThrows } from "@std/assert"
 import { getColorEnabled, setColorEnabled } from "@std/fmt/colors"
 import { stub } from "@std/testing/mock"
-import { listCommand } from "../../../src/commands/issue/issue-list.ts"
+import { mineCommand as listCommand } from "../../../src/commands/issue/issue-mine.ts"
 import { parseDateFilter } from "../../../src/utils/linear.ts"
 import { ValidationError } from "../../../src/utils/errors.ts"
 import {
diff --git a/test/commands/issue/issue-mine.test.ts b/test/commands/issue/issue-mine.test.ts
new file mode 100644
index 00000000..cc7f3693
--- /dev/null
+++ b/test/commands/issue/issue-mine.test.ts
@@ -0,0 +1,112 @@
+import { snapshotTest as cliffySnapshotTest } from "@cliffy/testing"
+import { assertEquals } from "@std/assert"
+import { getColorEnabled, setColorEnabled } from "@std/fmt/colors"
+import { stub } from "@std/testing/mock"
+import { mineCommand } from "../../../src/commands/issue/issue-mine.ts"
+import {
+  commonDenoArgs,
+  setupMockLinearServer,
+} from "../../utils/test-helpers.ts"
+
+// Test help output
+await cliffySnapshotTest({
+  name: "Issue Mine Command - Help Text",
+  meta: import.meta,
+  colors: false,
+  args: ["--help"],
+  denoArgs: commonDenoArgs,
+  async fn() {
+    await mineCommand.parse()
+  },
+})
+
+Deno.test("Issue Mine Command - Filter By Label", async () => {
+  const fixedNow = new Date("2026-03-30T10:00:00.000Z")
+  const RealDate = Date
+  const originalColorEnabled = getColorEnabled()
+  class MockDate extends RealDate {
+    constructor(value?: string | number | Date) {
+      super(value == null ? fixedNow.toISOString() : value)
+    }
+
+    static override now(): number {
+      return fixedNow.getTime()
+    }
+  }
+  globalThis.Date = MockDate as DateConstructor
+  setColorEnabled(false)
+
+  const { cleanup } = await setupMockLinearServer([
+    {
+      queryName: "GetTeamIdByKey",
+      variables: { team: "ENG" },
+      response: {
+        data: {
+          teams: {
+            nodes: [{ id: "team-eng-id" }],
+          },
+        },
+      },
+    },
+    {
+      queryName: "GetIssuesForState",
+      response: {
+        data: {
+          issues: {
+            nodes: [
+              {
+                id: "issue-1",
+                identifier: "ENG-101",
+                title: "Fix login bug",
+                priority: 1,
+                estimate: 3,
+                assignee: { initials: "MC" },
+                state: {
+                  id: "state-1",
+                  name: "In Progress",
+                  color: "#f2c94c",
+                },
+                labels: {
+                  nodes: [{
+                    id: "label-1",
+                    name: "Bug",
+                    color: "#eb5757",
+                  }],
+                },
+                updatedAt: "2026-03-13T10:00:00.000Z",
+              },
+            ],
+            pageInfo: { hasNextPage: false, endCursor: null },
+          },
+        },
+      },
+    },
+  ], { LINEAR_TEAM_ID: "ENG", LINEAR_ISSUE_SORT: "priority", NO_COLOR: "true" })
+
+  const logs: string[] = []
+  const logStub = stub(console, "log", (...args: unknown[]) => {
+    logs.push(args.map(String).join(" "))
+  })
+
+  try {
+    await mineCommand.parse([
+      "--label",
+      "Bug",
+      "--team",
+      "ENG",
+      "--sort",
+      "priority",
+    ])
+
+    assertEquals(
+      logs.join("\n") + "\n",
+      "◌   ID      TITLE         LABELS E STATE       UPDATED    \n" +
+        "⚠⚠⚠ ENG-101 Fix login bug Bug    3 In Progress 17 days ago\n",
+    )
+  } finally {
+    logStub.restore()
+    globalThis.Date = RealDate
+    setColorEnabled(originalColorEnabled)
+    await cleanup()
+  }
+})
diff --git a/test/commands/issue/issue-query.test.ts b/test/commands/issue/issue-query.test.ts
new file mode 100644
index 00000000..5dc57bda
--- /dev/null
+++ b/test/commands/issue/issue-query.test.ts
@@ -0,0 +1,360 @@
+import { snapshotTest } from "@cliffy/testing"
+import { assertEquals } from "@std/assert"
+import { getColorEnabled, setColorEnabled } from "@std/fmt/colors"
+import { stub } from "@std/testing/mock"
+import { queryCommand } from "../../../src/commands/issue/issue-query.ts"
+import {
+  commonDenoArgs,
+  setupMockLinearServer,
+} from "../../utils/test-helpers.ts"
+
+// Test help output
+await snapshotTest({
+  name: "Issue Query Command - Help Text",
+  meta: import.meta,
+  colors: false,
+  args: ["--help"],
+  denoArgs: commonDenoArgs,
+  async fn() {
+    await queryCommand.parse()
+  },
+})
+
+// Mock issue data for reuse
+const mockIssueNode = {
+  id: "issue-1",
+  identifier: "ENG-101",
+  title: "Fix login bug",
+  url: "https://linear.app/test/issue/ENG-101/fix-login-bug",
+  priority: 2,
+  priorityLabel: "High",
+  estimate: 3,
+  createdAt: "2026-04-01T10:00:00.000Z",
+  updatedAt: "2026-04-02T08:15:00.000Z",
+  state: {
+    id: "state-1",
+    name: "In Progress",
+    color: "#f2c94c",
+    type: "started",
+  },
+  assignee: {
+    id: "user-1",
+    name: "jane.smith",
+    displayName: "Jane Smith",
+    initials: "JS",
+  },
+  team: {
+    id: "team-1",
+    key: "ENG",
+    name: "Engineering",
+  },
+  project: {
+    id: "project-1",
+    name: "Auth Improvements",
+  },
+  projectMilestone: null,
+  cycle: null,
+  labels: {
+    nodes: [
+      { id: "label-1", name: "Bug", color: "#eb5757" },
+    ],
+  },
+}
+
+// Test JSON output with filter mode (issues() backend)
+await snapshotTest({
+  name: "Issue Query Command - JSON Output",
+  meta: import.meta,
+  colors: false,
+  args: [
+    "--team",
+    "ENG",
+    "--state",
+    "started",
+    "--json",
+  ],
+  denoArgs: commonDenoArgs,
+  async fn() {
+    const { cleanup } = await setupMockLinearServer([
+      {
+        queryName: "GetIssuesForQuery",
+        variables: {
+          filter: {
+            team: { key: { eq: "ENG" } },
+            state: { type: { in: ["started"] } },
+          },
+          sort: [
+            { workflowState: { order: "Descending" } },
+            { priority: { nulls: "last", order: "Descending" } },
+            { manual: { nulls: "last", order: "Ascending" } },
+          ],
+          first: 50,
+        },
+        response: {
+          data: {
+            issues: {
+              nodes: [mockIssueNode],
+              pageInfo: { hasNextPage: false, endCursor: "cursor-1" },
+            },
+          },
+        },
+      },
+    ], { NO_COLOR: "true" })
+
+    try {
+      await queryCommand.parse()
+    } finally {
+      await cleanup()
+    }
+  },
+})
+
+// Test --search mode (searchIssues() backend) with JSON
+await snapshotTest({
+  name: "Issue Query Command - Search JSON Output",
+  meta: import.meta,
+  colors: false,
+  args: [
+    "--search",
+    "oauth timeout",
+    "--team",
+    "ENG",
+    "--search-comments",
+    "--json",
+  ],
+  denoArgs: commonDenoArgs,
+  async fn() {
+    const { cleanup } = await setupMockLinearServer([
+      {
+        queryName: "SearchIssues",
+        variables: {
+          term: "oauth timeout",
+          filter: {
+            team: { key: { eq: "ENG" } },
+          },
+          includeComments: true,
+        },
+        response: {
+          data: {
+            searchIssues: {
+              nodes: [{
+                ...mockIssueNode,
+                metadata: { context: {}, score: 0.42 },
+              }],
+              pageInfo: { hasNextPage: false, endCursor: "cursor-1" },
+              totalCount: 1,
+            },
+          },
+        },
+      },
+    ], { NO_COLOR: "true" })
+
+    try {
+      await queryCommand.parse()
+    } finally {
+      await cleanup()
+    }
+  },
+})
+
+// Test --all-teams table output shows TEAM column
+Deno.test("Issue Query Command - All Teams shows TEAM column", async () => {
+  const fixedNow = new Date("2026-04-03T10:00:00.000Z")
+  const RealDate = Date
+  const originalColorEnabled = getColorEnabled()
+  class MockDate extends RealDate {
+    constructor(value?: string | number | Date) {
+      super(value == null ? fixedNow.toISOString() : value)
+    }
+    static override now(): number {
+      return fixedNow.getTime()
+    }
+  }
+  globalThis.Date = MockDate as DateConstructor
+  setColorEnabled(false)
+
+  const { cleanup } = await setupMockLinearServer([
+    {
+      queryName: "GetIssuesForQuery",
+      variables: {
+        sort: [
+          { workflowState: { order: "Descending" } },
+          { priority: { nulls: "last", order: "Descending" } },
+          { manual: { nulls: "last", order: "Ascending" } },
+        ],
+        first: 50,
+      },
+      response: {
+        data: {
+          issues: {
+            nodes: [
+              {
+                ...mockIssueNode,
+                team: { id: "team-1", key: "ENG", name: "Engineering" },
+              },
+              {
+                ...mockIssueNode,
+                id: "issue-2",
+                identifier: "FE-42",
+                title: "Fix CSS bug",
+                team: { id: "team-2", key: "FE", name: "Frontend" },
+              },
+            ],
+            pageInfo: { hasNextPage: false, endCursor: null },
+          },
+        },
+      },
+    },
+  ], { NO_COLOR: "true" })
+
+  const logs: string[] = []
+  const logStub = stub(console, "log", (...args: unknown[]) => {
+    logs.push(args.map(String).join(" "))
+  })
+
+  try {
+    await queryCommand.parse(["--all-teams"])
+
+    const output = logs.join("\n")
+    // Header should contain TEAM column
+    assertEquals(output.includes("TEAM"), true)
+    // Should contain both team keys
+    assertEquals(output.includes("ENG"), true)
+    assertEquals(output.includes("FE"), true)
+  } finally {
+    logStub.restore()
+    globalThis.Date = RealDate
+    setColorEnabled(originalColorEnabled)
+    await cleanup()
+  }
+})
+
+// Test validation: --team + --all-teams conflict
+Deno.test("Issue Query Command - rejects --team with --all-teams", async () => {
+  const errorLogs: string[] = []
+  const errorStub = stub(console, "error", (...args: unknown[]) => {
+    errorLogs.push(args.map(String).join(" "))
+  })
+  const exitStub = stub(Deno, "exit", (_code?: number) => {
+    throw new Error("EXIT")
+  })
+
+  try {
+    await queryCommand.parse(["--team", "ENG", "--all-teams"])
+  } catch {
+    // expected
+  } finally {
+    errorStub.restore()
+    exitStub.restore()
+  }
+
+  assertEquals(
+    errorLogs.some((l) => l.includes("Cannot use both --team and --all-teams")),
+    true,
+  )
+})
+
+// Test validation: --sort with --search conflict
+Deno.test("Issue Query Command - rejects --sort with --search", async () => {
+  const { cleanup } = await setupMockLinearServer([], {
+    LINEAR_TEAM_ID: "ENG",
+    NO_COLOR: "true",
+  })
+
+  const errorLogs: string[] = []
+  const errorStub = stub(console, "error", (...args: unknown[]) => {
+    errorLogs.push(args.map(String).join(" "))
+  })
+  const exitStub = stub(Deno, "exit", (_code?: number) => {
+    throw new Error("EXIT")
+  })
+
+  try {
+    await queryCommand.parse([
+      "--search",
+      "foo",
+      "--sort",
+      "priority",
+      "--team",
+      "ENG",
+    ])
+  } catch {
+    // expected
+  } finally {
+    errorStub.restore()
+    exitStub.restore()
+    await cleanup()
+  }
+
+  assertEquals(
+    errorLogs.some((l) => l.includes("--sort cannot be used with --search")),
+    true,
+  )
+})
+
+// Test validation: --search-comments without --search
+Deno.test("Issue Query Command - rejects --search-comments without --search", async () => {
+  const { cleanup } = await setupMockLinearServer([], {
+    LINEAR_TEAM_ID: "ENG",
+    NO_COLOR: "true",
+  })
+
+  const errorLogs: string[] = []
+  const errorStub = stub(console, "error", (...args: unknown[]) => {
+    errorLogs.push(args.map(String).join(" "))
+  })
+  const exitStub = stub(Deno, "exit", (_code?: number) => {
+    throw new Error("EXIT")
+  })
+
+  try {
+    await queryCommand.parse(["--search-comments", "--team", "ENG"])
+  } catch {
+    // expected
+  } finally {
+    errorStub.restore()
+    exitStub.restore()
+    await cleanup()
+  }
+
+  assertEquals(
+    errorLogs.some((l) => l.includes("--search-comments requires --search")),
+    true,
+  )
+})
+
+// Test validation: --milestone without --project
+Deno.test("Issue Query Command - rejects --milestone without --project", async () => {
+  const { cleanup } = await setupMockLinearServer([], {
+    LINEAR_TEAM_ID: "ENG",
+    NO_COLOR: "true",
+  })
+
+  const errorLogs: string[] = []
+  const errorStub = stub(console, "error", (...args: unknown[]) => {
+    errorLogs.push(args.map(String).join(" "))
+  })
+  const exitStub = stub(Deno, "exit", (_code?: number) => {
+    throw new Error("EXIT")
+  })
+
+  try {
+    await queryCommand.parse(["--milestone", "v1", "--team", "ENG"])
+  } catch {
+    // expected
+  } finally {
+    errorStub.restore()
+    exitStub.restore()
+    await cleanup()
+  }
+
+  assertEquals(
+    errorLogs.some((l) => l.includes("--milestone requires --project")),
+    true,
+  )
+})
+
+// Note: "no default team" error path is not tested here because
+// getOption("team_id") reads from config files which can't be easily
+// overridden in tests. The validation logic is covered by the code path
+// and the other validation tests confirm handleError integration works.
diff --git a/test/commands/issue/issue-search.test.ts b/test/commands/issue/issue-search.test.ts
deleted file mode 100644
index 2af049e6..00000000
--- a/test/commands/issue/issue-search.test.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-import { snapshotTest } from "@cliffy/testing"
-import { assertEquals } from "@std/assert"
-import { stub } from "@std/testing/mock"
-import { searchCommand } from "../../../src/commands/issue/issue-search.ts"
-import {
-  commonDenoArgs,
-  setupMockLinearServer,
-} from "../../utils/test-helpers.ts"
-
-await snapshotTest({
-  name: "Issue Search Command - Help Text",
-  meta: import.meta,
-  colors: false,
-  args: ["--help"],
-  denoArgs: commonDenoArgs,
-  async fn() {
-    await searchCommand.parse()
-  },
-})
-
-await snapshotTest({
-  name: "Issue Search Command - JSON Output",
-  meta: import.meta,
-  colors: false,
-  args: [
-    "oauth timeout",
-    "--team",
-    "CLI",
-    "--include-comments",
-    "--order-by",
-    "updatedAt",
-    "--json",
-  ],
-  denoArgs: commonDenoArgs,
-  async fn() {
-    const { cleanup } = await setupMockLinearServer([
-      {
-        queryName: "SearchIssues",
-        variables: {
-          term: "oauth timeout",
-          includeComments: true,
-          orderBy: "updatedAt",
-          first: 20,
-          filter: {
-            team: { key: { eq: "CLI" } },
-          },
-        },
-        response: {
-          data: {
-            searchIssues: {
-              nodes: [
-                {
-                  id: "issue-1",
-                  identifier: "CLI-90",
-                  title: "OAuth timeout in CLI auth flow",
-                  url:
-                    "https://linear.app/schpet/issue/CLI-90/oauth-timeout-in-cli-auth-flow",
-                  priority: 2,
-                  priorityLabel: "High",
-                  estimate: 3,
-                  createdAt: "2026-04-01T10:00:00.000Z",
-                  updatedAt: "2026-04-02T08:15:00.000Z",
-                  state: {
-                    id: "state-1",
-                    name: "In Progress",
-                    color: "#f2c94c",
-                    type: "started",
-                  },
-                  assignee: {
-                    id: "user-1",
-                    name: "jane.smith",
-                    displayName: "Jane Smith",
-                    initials: "JS",
-                  },
-                  team: {
-                    id: "team-1",
-                    key: "CLI",
-                    name: "Linear CLI",
-                  },
-                  project: {
-                    id: "project-1",
-                    name: "Auth Improvements",
-                  },
-                  projectMilestone: null,
-                  cycle: null,
-                  labels: {
-                    nodes: [
-                      {
-                        id: "label-1",
-                        name: "Bug",
-                        color: "#eb5757",
-                      },
-                    ],
-                  },
-                  metadata: {
-                    context: {},
-                    score: 0.42,
-                  },
-                },
-              ],
-              pageInfo: {
-                hasNextPage: false,
-                endCursor: "cursor-1",
-              },
-              totalCount: 1,
-            },
-          },
-        },
-      },
-    ], { NO_COLOR: "true" })
-
-    try {
-      await searchCommand.parse()
-    } finally {
-      await cleanup()
-    }
-  },
-})
-
-await snapshotTest({
-  name: "Issue Search Command - No Results",
-  meta: import.meta,
-  colors: false,
-  args: ["no matches here", "--team", "CLI"],
-  denoArgs: commonDenoArgs,
-  async fn() {
-    const { cleanup } = await setupMockLinearServer([
-      {
-        queryName: "SearchIssues",
-        variables: {
-          term: "no matches here",
-          first: 20,
-          filter: {
-            team: { key: { eq: "CLI" } },
-          },
-        },
-        response: {
-          data: {
-            searchIssues: {
-              nodes: [],
-              pageInfo: {
-                hasNextPage: false,
-                endCursor: null,
-              },
-              totalCount: 0,
-            },
-          },
-        },
-      },
-    ], { NO_COLOR: "true" })
-
-    try {
-      await searchCommand.parse()
-    } finally {
-      await cleanup()
-    }
-  },
-})
-
-Deno.test("Issue Search Command - limit 0 fetches all pages", async () => {
-  const { cleanup } = await setupMockLinearServer([
-    {
-      queryName: "SearchIssues",
-      variables: {
-        term: "issue",
-        first: 100,
-        after: undefined,
-        filter: {
-          team: { key: { eq: "CLI" } },
-        },
-      },
-      response: {
-        data: {
-          searchIssues: {
-            nodes: [
-              {
-                id: "issue-1",
-                identifier: "CLI-1",
-                title: "First issue",
-                url: "https://linear.app/schpet/issue/CLI-1/first-issue",
-                priority: 2,
-                priorityLabel: "High",
-                estimate: 3,
-                createdAt: "2026-04-01T10:00:00.000Z",
-                updatedAt: "2026-04-01T10:00:00.000Z",
-                state: {
-                  id: "state-1",
-                  name: "Backlog",
-                  color: "#999999",
-                  type: "backlog",
-                },
-                assignee: null,
-                team: {
-                  id: "team-1",
-                  key: "CLI",
-                  name: "Linear CLI",
-                },
-                project: null,
-                projectMilestone: null,
-                cycle: null,
-                labels: { nodes: [] },
-                metadata: {},
-              },
-            ],
-            pageInfo: {
-              hasNextPage: true,
-              endCursor: "cursor-1",
-            },
-            totalCount: 2,
-          },
-        },
-      },
-    },
-    {
-      queryName: "SearchIssues",
-      variables: {
-        term: "issue",
-        first: 100,
-        after: "cursor-1",
-        filter: {
-          team: { key: { eq: "CLI" } },
-        },
-      },
-      response: {
-        data: {
-          searchIssues: {
-            nodes: [
-              {
-                id: "issue-2",
-                identifier: "CLI-2",
-                title: "Second issue",
-                url: "https://linear.app/schpet/issue/CLI-2/second-issue",
-                priority: 3,
-                priorityLabel: "Normal",
-                estimate: null,
-                createdAt: "2026-04-02T10:00:00.000Z",
-                updatedAt: "2026-04-02T10:00:00.000Z",
-                state: {
-                  id: "state-2",
-                  name: "Started",
-                  color: "#f2c94c",
-                  type: "started",
-                },
-                assignee: null,
-                team: {
-                  id: "team-1",
-                  key: "CLI",
-                  name: "Linear CLI",
-                },
-                project: null,
-                projectMilestone: null,
-                cycle: null,
-                labels: { nodes: [] },
-                metadata: {},
-              },
-            ],
-            pageInfo: {
-              hasNextPage: false,
-              endCursor: "cursor-2",
-            },
-            totalCount: 2,
-          },
-        },
-      },
-    },
-  ], { NO_COLOR: "true" })
-
-  const logs: string[] = []
-  const logStub = stub(console, "log", (...args: unknown[]) => {
-    logs.push(args.map(String).join(" "))
-  })
-
-  try {
-    await searchCommand.parse([
-      "issue",
-      "--team",
-      "CLI",
-      "--limit",
-      "0",
-      "--json",
-    ])
-
-    assertEquals(JSON.parse(logs.join("\n")), {
-      nodes: [
-        {
-          id: "issue-1",
-          identifier: "CLI-1",
-          title: "First issue",
-          url: "https://linear.app/schpet/issue/CLI-1/first-issue",
-          priority: 2,
-          priorityLabel: "High",
-          estimate: 3,
-          createdAt: "2026-04-01T10:00:00.000Z",
-          updatedAt: "2026-04-01T10:00:00.000Z",
-          state: {
-            id: "state-1",
-            name: "Backlog",
-            color: "#999999",
-            type: "backlog",
-          },
-          assignee: null,
-          team: {
-            id: "team-1",
-            key: "CLI",
-            name: "Linear CLI",
-          },
-          project: null,
-          projectMilestone: null,
-          cycle: null,
-          labels: { nodes: [] },
-          metadata: {},
-        },
-        {
-          id: "issue-2",
-          identifier: "CLI-2",
-          title: "Second issue",
-          url: "https://linear.app/schpet/issue/CLI-2/second-issue",
-          priority: 3,
-          priorityLabel: "Normal",
-          estimate: null,
-          createdAt: "2026-04-02T10:00:00.000Z",
-          updatedAt: "2026-04-02T10:00:00.000Z",
-          state: {
-            id: "state-2",
-            name: "Started",
-            color: "#f2c94c",
-            type: "started",
-          },
-          assignee: null,
-          team: {
-            id: "team-1",
-            key: "CLI",
-            name: "Linear CLI",
-          },
-          project: null,
-          projectMilestone: null,
-          cycle: null,
-          labels: { nodes: [] },
-          metadata: {},
-        },
-      ],
-      pageInfo: {
-        hasNextPage: false,
-        endCursor: "cursor-2",
-      },
-      totalCount: 2,
-    })
-  } finally {
-    logStub.restore()
-    await cleanup()
-  }
-})