Cursor Sdk Cleanup (#360)

* Refactor slash command discovery and extract shared modules

Extract Cursor-specific slash command discovery from Claude/Codex
implementations into dedicated modules. Pull markdown parsing,
project discovery, and prompt expansion into shared services.
Extract Linear issue helpers from laneService and chat context
attachment logic into standalone shared modules with tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* ship: iteration 1 — fix typecheck-desktop, address review comments

- Type SAMPLE_ISSUE as LaneLinearIssue to fix description type mismatch
- Remove dead candidateNames.has(target) branch (target never has / prefix)
- Restrict activateRuntime to cursor provider only (was unintentionally
  including droid)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* ship: iteration 2 — fix test-desktop shard 4

- Update cliLaunch.test.ts assertion: .cursor/skills is now first
  in ancestorSkillDirs ordering (matches agentSkillRoots.ts change)
- Use Partial<LaneLinearIssue> instead of Partial<typeof SAMPLE_ISSUE>
  to allow string description overrides in test helper

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: arul28

apps/ade-cli/package-lock.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.139",
-    "@cursor/sdk": "^1.0.9",
+    "@cursor/sdk": "^1.0.13",
     "@linear/sdk": "^84.0.0",
     "@openai/codex": "0.130.0",
     "@opencode-ai/sdk": "^1.15.5",

apps/ade-cli/package.json

@@ -1919,6 +1919,39 @@ describe("ADE CLI", () => {
     });
   });
 
+  it("maps existing lane Linear issue linking to the lane action", () => {
+    const plan = buildCliPlan([
+      "lanes",
+      "link-linear-issue",
+      "lane-1",
+      "--linear-issue-json",
+      '{"id":"issue-1","identifier":"ADE-123","title":"Linked lane"}',
+      "--source",
+      "manual",
+      "--no-include-in-pr",
+    ]);
+
+    expect(plan.kind).toBe("execute");
+    if (plan.kind !== "execute") return;
+    expect(plan.steps[0]?.params).toEqual({
+      name: "run_ade_action",
+      arguments: {
+        domain: "lane",
+        action: "linkLinearIssues",
+        args: {
+          laneId: "lane-1",
+          issues: [{
+            id: "issue-1",
+            identifier: "ADE-123",
+            title: "Linked lane",
+          }],
+          source: "manual",
+          includeInPr: false,
+        },
+      },
+    });
+  });
+
   it("maps Linear quick view to the typed RPC tool", () => {
     const plan = buildCliPlan(["linear", "quick-view", "--text"]);
 

apps/ade-cli/src/cli.test.ts

@@ -921,6 +921,8 @@ const HELP_BY_COMMAND: Record<string, string> = {
     $ ade lanes show <lane> --text                  Inspect one lane status
     $ ade lanes create --name <name>                Create a lane from the current project context
     $ ade lanes create --linear-issue-json '{...}'  Create a lane linked to a Linear issue
+    $ ade lanes link-linear-issue <lane> --linear-issue-json '{...}'
+                                                    Link an existing lane to a Linear issue
     $ ade lanes create --branch-name <branch>       Override the auto-generated branch name
     $ ade lanes child --lane <parent> --name <name> Create a child lane under a parent
     $ ade lanes import --branch <branch>            Register an existing branch/worktree
@@ -2379,6 +2381,42 @@ function buildLanePlan(args: string[]): CliPlan {
       steps: [actionArgsListStep("result", "lane", "getChildren", [laneId])],
     };
   }
+  if (sub === "link-linear-issue" || sub === "link-linear" || sub === "linear-link") {
+    const laneId = requireValue(
+      readLaneId(args) ?? firstPositional(args),
+      "laneId",
+    );
+    const linearIssueJson = requireValue(
+      readValue(args, ["--linear-issue-json", "--issue-json"]),
+      "--linear-issue-json",
+    );
+    const parsed = parseJson(linearIssueJson, "--linear-issue-json");
+    const issues = Array.isArray(parsed) ? parsed : [parsed];
+    if (issues.length === 0 || issues.some((issue) => !isRecord(issue))) {
+      throw new CliUsageError("--linear-issue-json must decode to an object or array of objects.");
+    }
+    const input: JsonObject = {
+      laneId,
+      issues: issues as JsonObject[],
+    };
+    maybePut(input, "role", readValue(args, ["--role"]));
+    maybePut(input, "source", readValue(args, ["--source"]));
+    if (readFlag(args, ["--no-include-in-pr"])) input.includeInPr = false;
+    if (readFlag(args, ["--include-in-pr"])) input.includeInPr = true;
+    if (readFlag(args, ["--close-on-merge"])) input.closeOnMerge = true;
+    return {
+      kind: "execute",
+      label: "lane link Linear issue",
+      steps: [
+        actionStep(
+          "result",
+          "lane",
+          "linkLinearIssues",
+          collectGenericObjectArgs(args, input),
+        ),
+      ],
+    };
+  }
   if (sub === "stack") {
     const laneId = requireValue(
       readLaneId(args) ?? firstPositional(args),

apps/ade-cli/src/cli.ts

@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { AgentChatEventEnvelope } from "../../../../desktop/src/shared/types/chat";
-import { cancelSteerMessage, createChatSession, DEFAULT_CODEX_REASONING_EFFORT, dispatchSteerMessage, discoverProjectSlashCommands, editSteerMessage, latestGoal, latestTokenStats, listLaneDiffStats, listPrsByLane, listTerminalSessions, sendChatMessage, signalTerminal, startClaudeTerminalSession, steerChatMessage } from "../adeApi";
+import { cancelSteerMessage, createChatSession, DEFAULT_CODEX_REASONING_EFFORT, dispatchSteerMessage, discoverProjectSlashCommands, editSteerMessage, getAvailableModels, latestGoal, latestTokenStats, listLaneDiffStats, listPrsByLane, listTerminalSessions, sendChatMessage, signalTerminal, startClaudeTerminalSession, steerChatMessage } from "../adeApi";
 import type { AdeCodeConnection } from "../types";
 
 const tmpPaths: string[] = [];
@@ -232,6 +232,51 @@ describe("discoverProjectSlashCommands", () => {
       expect.objectContaining({ name: "/ship" }),
     ]));
   });
+
+  it("includes Cursor command files and subagents", () => {
+    const projectRoot = makeTmpRoot("ade-code-cursor-command-");
+    const commandsDir = path.join(projectRoot, ".cursor", "commands");
+    const agentsDir = path.join(projectRoot, ".cursor", "agents");
+    fs.mkdirSync(commandsDir, { recursive: true });
+    fs.mkdirSync(agentsDir, { recursive: true });
+    fs.writeFileSync(path.join(commandsDir, "review-code.md"), "Review code.\n");
+    fs.writeFileSync(path.join(agentsDir, "verifier.md"), [
+      "---",
+      "description: Verify the change",
+      "---",
+      "",
+      "Verify.",
+      "",
+    ].join("\n"));
+
+    const commands = discoverProjectSlashCommands(projectRoot);
+    expect(commands).toEqual(expect.arrayContaining([
+      expect.objectContaining({ name: "/review-code", description: "Review code." }),
+      expect.objectContaining({ name: "/verifier", description: "Verify the change" }),
+    ]));
+  });
+});
+
+describe("getAvailableModels", () => {
+  it("activates dynamic Cursor model discovery for TUI model lists", async () => {
+    const calls: Array<{ domain: string; action: string; args?: Record<string, unknown> }> = [];
+    const connection = {
+      action: vi.fn(async (domain: string, action: string, args?: Record<string, unknown>) => {
+        calls.push({ domain, action, args });
+        return [];
+      }),
+    } as any;
+
+    await getAvailableModels(connection, "cursor");
+
+    expect(calls).toEqual([
+      {
+        domain: "chat",
+        action: "getAvailableModels",
+        args: { provider: "cursor", activateRuntime: true },
+      },
+    ]);
+  });
 });
 
 describe("createChatSession", () => {

apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts

@@ -44,8 +44,7 @@ import type {
   PtySendToSessionResult,
   TerminalSessionSummary,
 } from "../../../desktop/src/shared/types";
-import { discoverClaudeSlashCommands } from "../../../desktop/src/main/services/chat/claudeSlashCommandDiscovery";
-import { discoverCodexSlashCommands } from "../../../desktop/src/main/services/chat/codexSlashCommandDiscovery";
+import { discoverAllProjectSlashCommands } from "../../../desktop/src/main/services/chat/projectSlashCommandDiscovery";
 import type { AdeCodeConnection, ChatHistorySnapshot, CreatedChat, NavigateRequest, NavigateResult } from "./types";
 
 export const DEFAULT_CODEX_REASONING_EFFORT = "low";
@@ -286,26 +285,8 @@ export async function setClaudeOutputStyle(
   return await connection.action<AgentChatSession>("chat", "setClaudeOutputStyle", { sessionId, outputStyle });
 }
 
-function slashCommandKey(value: string): string {
-  return value.trim().toLowerCase();
-}
-
 export function discoverProjectSlashCommands(workspaceRoot: string): AgentChatSlashCommand[] {
-  const byName = new Map<string, AgentChatSlashCommand>();
-  const add = (command: { name: string; description: string; argumentHint?: string }) => {
-    const key = slashCommandKey(command.name);
-    if (key === "/login") return;
-    if (byName.has(key)) return;
-    byName.set(key, {
-      name: command.name,
-      description: command.description,
-      argumentHint: command.argumentHint,
-      source: "sdk",
-    });
-  };
-  for (const command of discoverClaudeSlashCommands(workspaceRoot)) add(command);
-  for (const command of discoverCodexSlashCommands(workspaceRoot)) add(command);
-  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name, undefined, { sensitivity: "base" }));
+  return discoverAllProjectSlashCommands(workspaceRoot);
 }
 
 export async function getAvailableModels(
@@ -314,7 +295,7 @@ export async function getAvailableModels(
 ): Promise<AgentChatModelInfo[]> {
   return await connection.action<AgentChatModelInfo[]>("chat", "getAvailableModels", {
     provider,
-    activateRuntime: false,
+    activateRuntime: provider === "cursor",
   });
 }
 

apps/ade-cli/src/tuiClient/adeApi.ts

@@ -218,6 +218,7 @@ export const ADE_ACTION_ALLOWLIST: Partial<Record<AdeActionDomain, readonly stri
     "listRebaseSuggestions",
     "listTemplates",
     "listUnregisteredWorktrees",
+    "linkLinearIssues",
     "oauthDecodeState",
     "oauthEncodeState",
     "oauthGenerateRedirectUris",