droidsuite 1.0.0-beta.8 → 1.0.0-beta.9

package/COMMANDS.md

@@ -6,7 +6,7 @@ Run `droidsuite` with nothing after it for an interactive menu. Every command al
 
 | Command | What it does |
 |---|---|
-| [`setup`](#setup) | First-run setup: get adb ready for Wi-Fi debugging, add it to PATH, show next steps |
+| [`setup`](#setup) | First-run setup: add the DroidSuite icon, get adb ready for Wi-Fi debugging, offer the AI agent skill, show next steps |
 | [`serve`](#serve) | Share APKs with your paired phones, push every new build to them, and swap files |
 | [`open`](#open) | Open the DroidSuite page, starting the server if it isn't running (what the desktop icon does) |
 | [`push`](#push) | Send any files to your paired phones (needs droidsuite serve running) |
@@ -22,21 +22,23 @@ Run `droidsuite` with nothing after it for an interactive menu. Every command al
 | [`debug path`](#debug-path) | Add adb to your PATH so typing "adb" works in new terminals |
 | [`adb`](#adb) | Run adb, even when it isn't on PATH |
 | [`shortcut`](#shortcut) | Add a "DroidSuite" icon that starts the server and opens its page |
-| [`skill`](#skill) | Teach AI coding agents (Claude Code and others) to use droidsuite, in every project |
+| [`skill`](#skill) | Teach AI coding agents (Claude Code, Codex, Gemini CLI, Cursor and others) to use droidsuite, in every project |
 | [`help`](#help) | Show all commands, or the details of one |
 
 ## setup
 
-First-run setup: get adb ready for Wi-Fi debugging, add it to PATH, show next steps.
+First-run setup: add the DroidSuite icon, get adb ready for Wi-Fi debugging, offer the AI agent skill, show next steps.
 
 ```
-droidsuite setup [--yes] [--skip-adb]
+droidsuite setup [--yes] [--skip-adb] [--no-shortcut]
 ```
 
 | Option | Meaning |
 |---|---|
 | `-y, --yes` | Answer yes to every question (accepts the Platform-Tools license). |
 | `--skip-adb` | Don't check or install adb (only needed for Debug over Wi-Fi). |
+| `--no-shortcut` | Don't add the DroidSuite icon. |
+| `--shortcut` | Add the icon even with no terminal to answer in. The install scripts use this. |
 
 Examples:
 
@@ -44,7 +46,7 @@ Examples:
 droidsuite setup
 ```
 
-The install scripts run this for you. Asks before installing anything or changing PATH; with no terminal to answer in, it skips.
+The install scripts run this for you. Have Node.js and nothing installed yet? npx droidsuite setup installs DroidSuite too. Asks before installing adb, changing PATH or adding the skill; with no terminal to answer in, it skips.
 
 ## serve
 
@@ -337,7 +339,7 @@ No terminal window: the icon opens the page in your browser, and the page does e
 
 ## skill
 
-Teach AI coding agents (Claude Code and others) to use droidsuite, in every project.
+Teach AI coding agents (Claude Code, Codex, Gemini CLI, Cursor and others) to use droidsuite, in every project.
 
 ```
 droidsuite skill [--project | --dir <folder>] [--print]
@@ -345,19 +347,20 @@ droidsuite skill [--project | --dir <folder>] [--print]
 
 | Option | Meaning |
 |---|---|
-| `--project` | Install only into the current project (.claude/skills) instead of for every project on this computer. |
-| `--global` | Every project on this computer (~/.claude/skills). This is the default. |
-| `--dir <folder>` | Install into another skills folder, for agents that read skills from elsewhere. |
+| `--project` | Install only into the current project instead of for every project on this computer. |
+| `--global` | Every project on this computer. This is the default. |
+| `--dir <folder>` | Install into another skills folder, for an agent that reads skills from somewhere else. |
 | `--print` | Only print where the bundled skill is. |
 
 Examples:
 
 ```bash
-droidsuite skill            # every project on this computer: ~/.claude/skills/droidsuite
-droidsuite skill --project  # only this project: .claude/skills/droidsuite (commit it to share)
+droidsuite skill            # every project on this computer, for every agent
+droidsuite skill --project  # only this project (commit it to share)
+droidsuite skill --dir ~/.my-agent/skills
 ```
 
-The skill shows an agent how to install builds on your phone, read logcat and screenshots over Wi-Fi, and move files, and which steps need you (pairing, Allow, PIN). Run it again after updating droidsuite.
+The installer offers this when it finds an AI agent on your computer. Always installs into .agents/skills and .claude/skills, and into the folders of Gemini CLI, Antigravity, Cursor, GitHub Copilot, Windsurf, Qwen Code and Amp when they are on this computer. The skill shows an agent how to install builds on your phone, read logcat and screenshots over Wi-Fi, and move files, and which steps need you (pairing, Allow, PIN). Run it again after updating droidsuite or adding an agent.
 
 ## help
 

package/README.md

@@ -10,7 +10,7 @@ powershell -NoExit -ExecutionPolicy Bypass -Command "irm https://cdn.jsdelivr.ne
 # macOS / Linux
 curl -fsSL https://cdn.jsdelivr.net/npm/droidsuite/install.sh | sh
 # or, with Node.js 20+ already installed
-npm install -g droidsuite && droidsuite setup
+npx droidsuite setup
 ```
 
 ```bash
@@ -28,7 +28,7 @@ droidsuite debug install    # install adb (Google platform-tools) if you don't h
 droidsuite debug path       # add adb to your PATH so typing adb works in new terminals
 droidsuite adb devices      # run adb even when it isn't on PATH
                             # http://localhost:8765 (while serve runs): see and use the phone's screen live
-droidsuite skill            # teach AI coding agents (Claude Code…) to use all of the above, in every project
+droidsuite skill            # teach your AI coding agent (Claude Code, Codex, Gemini CLI…) to use all of the above
 ```
 
 Type `droidsuite` on its own for a menu. All commands and options: [COMMANDS.md](https://cdn.jsdelivr.net/npm/droidsuite/COMMANDS.md) or `droidsuite help <command>`.

package/bin/droidsuite.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { parseArgs } from 'node:util';
-import { spawn } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import { existsSync, mkdirSync, openSync, readFileSync } from 'node:fs';
 import { stat } from 'node:fs/promises';
 import { dirname, join, resolve, relative } from 'node:path';
@@ -15,7 +15,7 @@ import { advertise, discoverPhones } from '../src/mdns.mjs';
 import { findAdb } from '../src/adb.mjs';
 import { autoConnectAdb, DebugService } from '../src/debugservice.mjs';
 import { LICENSE_URL, toolsHome } from '../src/platformtools.mjs';
-import { runSetup } from '../src/setup.mjs';
+import { isTemporaryRun, runSetup } from '../src/setup.mjs';
 import { CODE_HELP, connectAddress, newSetupSession, parseAddress, runSetup as runDebugSetup, SETUP_HELP, SETUP_STEPS, setupInput } from '../src/debug.mjs';
 import { hello, helloPaired, normalizeTarget, sendFile } from '../src/send.mjs';
 import { findServe, pushFile } from '../src/push.mjs';
@@ -25,7 +25,7 @@ import { commandHelp, findCommand, markdown, overview } from '../src/commands.mj
 import { runMenu } from '../src/menu.mjs';
 import { createShortcuts } from '../src/shortcut.mjs';
 import { openUrl } from '../src/browser.mjs';
-import { installSkill, SKILL_SOURCE } from '../src/skill.mjs';
+import { hasAgents, installSkill, SKILL_SOURCE } from '../src/skill.mjs';
 
 const { version: VERSION } = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 const CLI_PATH = fileURLToPath(import.meta.url);
@@ -442,10 +442,40 @@ async function adbPassthrough(argv) {
   process.exitCode = await new Promise((ok) => child.on('close', (code) => ok(code ?? 1)));
 }
 /** `droidsuite setup`: first-run wizard (the install scripts run it). */
+/**
+ * `npx droidsuite setup` runs from a temporary copy, and an icon made from it would break when npx cleans up.
+ * So it installs DroidSuite for good, then hands over to that copy. Returns false if the install failed.
+ */
+function installThenSetup(argv) {
+  console.log('Installing DroidSuite on this computer...');
+  const onWindows = process.platform === 'win32';
+  const npm = (...args) => spawnSync('npm', args, { shell: onWindows, encoding: 'utf8', stdio: ['inherit', 'pipe', 'inherit'] });
+  const installed = npm('install', '--global', process.env.DROIDSUITE_PACKAGE ?? `droidsuite@${VERSION}`, '--no-fund', '--no-audit', '--loglevel=error');
+  const root = installed.status === 0 ? npm('root', '--global').stdout?.trim() : null;
+  if (!root) {
+    console.error(`${c.red('✗')} Couldn't install DroidSuite for this computer (often a permissions issue). See: https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally`);
+    return false;
+  }
+  const run = spawnSync(process.execPath, [join(root, 'droidsuite', 'bin', 'droidsuite.mjs'), 'setup', ...argv], { stdio: 'inherit' });
+  process.exitCode = run.status ?? 1;
+  return true;
+}
+
 async function setup(argv) {
-  const { values } = parseArgs({ args: argv, options: { yes: { type: 'boolean', short: 'y' }, 'skip-adb': { type: 'boolean' } } });
+  if (isTemporaryRun(CLI_PATH)) {
+    if (!installThenSetup(argv)) process.exitCode = 1;
+    return;
+  }
+  const { values } = parseArgs({ args: argv, options: { yes: { type: 'boolean', short: 'y' }, 'skip-adb': { type: 'boolean' }, shortcut: { type: 'boolean' }, 'no-shortcut': { type: 'boolean' } } });
+  // With no terminal (CI, a script) nobody asked for an icon, unless --yes or --shortcut says so.
+  const wantsIcon = !values['no-shortcut'] && (values.shortcut || values.yes || process.stdin.isTTY);
   const result = await runSetup({
     service: debugService,
+    skill: { present: hasAgents, install: installSkill },
+    shortcut: wantsIcon ? {
+      create: () => createShortcuts({ nodePath: process.execPath, cliPath: CLI_PATH, desktop: true }),
+      where: { win32: 'on your desktop and in the Start menu', darwin: 'on your desktop' }[process.platform] ?? 'in your applications menu',
+    } : undefined,
     say: (line) => console.log(line.startsWith('✓') ? c.green('✓') + line.slice(1) : line.startsWith('✗') ? c.red('✗') + line.slice(1) : line),
     confirm: async (q, def) => {
       // Nobody to ask (piped input, CI): never accept a license or change PATH on someone's behalf.
@@ -508,14 +538,15 @@ async function skill(argv) {
   // --global is the default now; still accepted so older instructions keep working.
   const { values } = parseArgs({ args: argv, options: { project: { type: 'boolean' }, global: { type: 'boolean' }, dir: { type: 'string' }, print: { type: 'boolean' } } });
   if (values.print) return console.log(SKILL_SOURCE);
-  const { path, updated, alsoProject } = installSkill({ project: values.project, dir: values.dir });
-  console.log(`${c.green('✓')} ${updated ? 'Updated' : 'Added'} the droidsuite skill: ${path}`);
-  if (alsoProject) console.log(`${c.green('✓')} Also updated this project's older copy: ${alsoProject}`);
+  const { targets, updated, alsoProject } = installSkill({ project: values.project, dir: values.dir });
+  console.log(`${c.green('✓')} ${updated ? 'Updated' : 'Added'} the droidsuite skill:`);
+  for (const t of targets) console.log(`  ${t.path}${t.agents ? c.dim(`  (${t.agents})`) : ''}`);
+  for (const p of alsoProject) console.log(`${c.green('✓')} Also updated this project's older copy: ${p}`);
   console.log(c.dim(values.project
-    ? '  Commit it, and every AI agent working on this project knows how to use your phone (Claude Code reads .claude/skills).'
+    ? '  Commit these, and every AI agent working on this project knows how to use your phone.'
     : values.dir
       ? '  Agents that read this folder can now install builds on the phone, read logcat, and move files.'
-      : '  Claude Code now knows how to use your phone in every project on this computer. Only this project? droidsuite skill --project'));
+      : '  AI agents now know how to use your phone in every project on this computer. Added a new agent later? Run this again.\n  Agent not listed? droidsuite skill --dir <its skills folder>'));
 }
 
 function help(argv) {

package/install.ps1

@@ -44,10 +44,8 @@
         $prefix = (& npm prefix --global).Trim()
         if (($env:Path -split ';') -notcontains $prefix) { $env:Path = "$env:Path;$prefix" }
 
-        & droidsuite setup
-
-        # One click from now on: the DroidSuite icon starts the server and opens its page.
-        & droidsuite shortcut --desktop
+        # Also adds the icon: one click from now on, it starts the server and opens its page.
+        & droidsuite setup --shortcut
 
         # Open it now: the page comes up in the browser, the rest happens there.
         & droidsuite open

package/install.sh

@@ -55,9 +55,8 @@ fi
 
 PATH="$PATH:$(npm prefix --global)/bin"
 if has_tty; then
-  droidsuite setup < /dev/tty
-  # One click from now on: macOS gets "DroidSuite" on the desktop, Linux in the applications menu.
-  droidsuite shortcut || true
+  # Also adds the icon. One click from now on: macOS gets "DroidSuite" on the desktop, Linux in the applications menu.
+  droidsuite setup --shortcut < /dev/tty
   # Open it now: the page comes up in the browser, the rest happens there.
   if droidsuite open; then
     echo ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "droidsuite",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "description": "Your Android phone on your computer, no cable: see and control its screen, type on it, move files and clipboard both ways, install builds and debug over Wi-Fi.",
   "keywords": [
     "android",

package/skills/droidsuite/SKILL.md

@@ -156,7 +156,8 @@ node <this-skill>/scripts/droidsuite-status.mjs --wait-build 120 --match debug
   in Receive mode, where the APK is kept). Sending the build again isn't needed.
 - An app installed by adb (Path A) is still updated by Path B; only that first silent update may ask once.
 - With Wireless debugging also connected (Path A), `serve` installs each build through adb itself: no first-install
-  tap, and it works where Android's developer verification blocks apps from unregistered developers (adb is exempt).
+  tap (except on Xiaomi, Redmi and POCO, which ask on every adb install), and it works where Android's developer
+  verification blocks apps from unregistered developers (adb is exempt).
   The status output shows `"adb": "<serial>"` on the phone then. If installs stall on the phone in Brazil, Indonesia,
   Singapore or Thailand (or anywhere from 2027), set up Path A and keep `serve` running.
 - If adb refuses the install, `serve` falls back to the phone by itself and the person gets the install prompt:
@@ -197,7 +198,7 @@ node <this-skill>/scripts/droidsuite-status.mjs --wait-build 120 --match debug
 | `no phone with Wireless debugging found` | Wireless debugging is off, or another network | Ask to switch it on (Path A); then `droidsuite debug doctor` |
 | `Pairing didn't work: nothing answered at …` | Wrong IP address & Port typed for pairing | Ask for the line under the Wi-Fi pairing code |
 | `Paired, but the phone can't be found` | Network blocks discovery (mDNS) | Ask for the IP address & Port at the top of Wireless debugging; `droidsuite debug connect` |
-| `INSTALL_FAILED_USER_RESTRICTED` | The phone refused an adb install: locked, a prompt timed out, or Xiaomi's **Install via USB** is off | Ask them to unlock and approve; on Xiaomi, Redmi and POCO, to turn on **Developer options → Install via USB** |
+| `INSTALL_FAILED_USER_RESTRICTED` | The phone refused an adb install: locked, a prompt timed out (Xiaomi gives about 10 seconds), or Xiaomi's **Install via USB** is off | Don't retry straight away. Say "Unlock the phone and be ready to tap **Install**", wait for their reply, then retry. On Xiaomi, Redmi and POCO, **Developer options → Install via USB** must be on, and each adb install still shows that prompt. If they'd rather not turn it on, or nobody is at the phone, use Path B: the phone app installs it, and the person confirms there |
 | Phone: `Wrong code` when pairing by typing | Old or mistyped code | Read `serve.typing.code` again from the status output |
 | Phone: `Needs Android X` on a build | Build's minSdk is above the phone's Android | Tell the person; it can't install there |
 | Phone shows **Can't reach** / builds never appear | Different Wi-Fi, VPN, or firewall blocking port 8765 | Check `lanAddresses` in the status output is the Wi-Fi IP; ask about guest Wi-Fi/VPN |

package/src/capabilities.mjs

@@ -40,7 +40,7 @@ export function capabilities(sdk) {
       ? { id: 'files', label: 'Files', status: 'ok', note: 'Saved to Downloads/DroidSuite.', fix: null }
       : { id: 'files', label: 'Files', status: 'limited', note: "Saved in DroidSuite's own folder.", fix: 'Open them from the DroidSuite app.' },
     sdk >= NOTIFY_PERMISSION_SDK
-      ? { id: 'notify', label: 'Notifications', status: 'ok', note: 'Needs permission.', fix: 'Allow notifications, or install prompts can\'t reach you.' }
+      ? { id: 'notify', label: 'Notifications', status: 'ok', note: 'Need your OK.', fix: 'Allow notifications when Android asks, or install prompts can\'t reach you.' }
       : { id: 'notify', label: 'Notifications', status: 'ok', note: 'On.', fix: null },
   ];
 }

package/src/commands.mjs

@@ -5,14 +5,16 @@ import { DEFAULT_PORT } from './config.mjs';
 export const COMMANDS = [
   {
     name: 'setup',
-    summary: 'First-run setup: get adb ready for Wi-Fi debugging, add it to PATH, show next steps',
-    usage: 'droidsuite setup [--yes] [--skip-adb]',
+    summary: 'First-run setup: add the DroidSuite icon, get adb ready for Wi-Fi debugging, offer the AI agent skill, show next steps',
+    usage: 'droidsuite setup [--yes] [--skip-adb] [--no-shortcut]',
     options: [
       ['-y, --yes', 'Answer yes to every question (accepts the Platform-Tools license).'],
       ['--skip-adb', "Don't check or install adb (only needed for Debug over Wi-Fi)."],
+      ['--no-shortcut', "Don't add the DroidSuite icon."],
+      ['--shortcut', 'Add the icon even with no terminal to answer in. The install scripts use this.'],
     ],
     examples: ['droidsuite setup'],
-    notes: 'The install scripts run this for you. Asks before installing anything or changing PATH; with no terminal to answer in, it skips.',
+    notes: 'The install scripts run this for you. Have Node.js and nothing installed yet? npx droidsuite setup installs DroidSuite too. Asks before installing adb, changing PATH or adding the skill; with no terminal to answer in, it skips.',
   },
   {
     name: 'serve',
@@ -159,16 +161,16 @@ export const COMMANDS = [
   },
   {
     name: 'skill',
-    summary: 'Teach AI coding agents (Claude Code and others) to use droidsuite, in every project',
+    summary: 'Teach AI coding agents (Claude Code, Codex, Gemini CLI, Cursor and others) to use droidsuite, in every project',
     usage: 'droidsuite skill [--project | --dir <folder>] [--print]',
     options: [
-      ['--project', 'Install only into the current project (.claude/skills) instead of for every project on this computer.'],
-      ['--global', 'Every project on this computer (~/.claude/skills). This is the default.'],
-      ['--dir <folder>', 'Install into another skills folder, for agents that read skills from elsewhere.'],
+      ['--project', 'Install only into the current project instead of for every project on this computer.'],
+      ['--global', 'Every project on this computer. This is the default.'],
+      ['--dir <folder>', 'Install into another skills folder, for an agent that reads skills from somewhere else.'],
       ['--print', 'Only print where the bundled skill is.'],
     ],
-    examples: ['droidsuite skill            # every project on this computer: ~/.claude/skills/droidsuite', 'droidsuite skill --project  # only this project: .claude/skills/droidsuite (commit it to share)'],
-    notes: 'The skill shows an agent how to install builds on your phone, read logcat and screenshots over Wi-Fi, and move files, and which steps need you (pairing, Allow, PIN). Run it again after updating droidsuite.',
+    examples: ['droidsuite skill            # every project on this computer, for every agent', 'droidsuite skill --project  # only this project (commit it to share)', 'droidsuite skill --dir ~/.my-agent/skills'],
+    notes: 'The installer offers this when it finds an AI agent on your computer. Always installs into .agents/skills and .claude/skills, and into the folders of Gemini CLI, Antigravity, Cursor, GitHub Copilot, Windsurf, Qwen Code and Amp when they are on this computer. The skill shows an agent how to install builds on your phone, read logcat and screenshots over Wi-Fi, and move files, and which steps need you (pairing, Allow, PIN). Run it again after updating droidsuite or adding an agent.',
   },
   {
     name: 'help',

package/src/debug.mjs

@@ -414,7 +414,7 @@ export async function diagnose(deps, { phones = [], ownMdns = true, platform = p
   ];
   const verdict = (text, next = null) => ({ checks, verdict: text, next });
 
-  if (wifi.some((d) => d.state === 'device')) return verdict('Connected. Builds install with no tap.');
+  if (wifi.some((d) => d.state === 'device')) return verdict('Connected. Builds install through adb. Xiaomi, Redmi and POCO phones show a prompt to tap each time.');
   const old = live.find((p) => p.sdk && p.sdk < WIRELESS_DEBUG_SDK);
   if (old && !seenIps.length && !live.some((p) => p.sdk >= WIRELESS_DEBUG_SDK)) {
     return verdict(`${old.name} has ${androidName(old.sdk)}. Wireless debugging needs Android 11.`, 'Plug in a USB cable once (USB debugging on), then run: droidsuite debug usb');

package/src/server.mjs

@@ -265,6 +265,8 @@ export function createBridgeServer({
 
   const heartbeat = setInterval(() => {
     for (const res of [...phones.keys(), ...pages]) res.write(': ping\n\n');
+    // Notices Wireless debugging connected or dropped from outside (`droidsuite debug`, Android Studio): route and name follow.
+    for (const [res, phone] of phones) resolveAdb(res, phone).catch(() => {});
     pruneCodeFailures();
     if (Date.now() > typingExpiresAt) changeTypingCode('Typing code expired');
   }, 20000).unref();

package/src/setup.mjs

@@ -3,12 +3,17 @@
 import { dirname } from 'node:path';
 import { LICENSE_URL, toolsHome } from './platformtools.mjs';
 
+/** True when this copy of the program is a temporary one: `npx`, `pnpm dlx`. */
+export const isTemporaryRun = (cliPath) => /[\\/](_npx|dlx-[^\\/]*)[\\/]/.test(cliPath);
+
 /**
  * @param {object} deps
  * @param {import('./debugservice.mjs').DebugService} deps.service
  * @param {(question: string, defaultYes: boolean) => Promise<boolean>} deps.confirm
  * @param {(line: string) => void} deps.say
  * @param {(ms: number) => Promise<void>} [deps.sleep]
+ * @param {{ present: () => boolean, install: () => { targets: object[], updated: boolean } }} [deps.skill]
+ * @param {{ create: () => Promise<unknown>, where: string }} [deps.shortcut] Left out when no icon is wanted.
  * @param {{ yes?: boolean, skipAdb?: boolean }} [opts]
  * Resolves to a summary: { adb: 'ready'|'installed'|'skipped'|'failed', path: 'ok'|'added'|'skipped'|'failed' }.
  */
@@ -16,7 +21,7 @@ export async function runSetup(deps, opts = {}) {
   const { service, say } = deps;
   const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const ask = (q, def) => (opts.yes ? Promise.resolve(true) : deps.confirm(q, def));
-  const result = { adb: 'skipped', path: 'skipped' };
+  const result = { adb: 'skipped', path: 'skipped', skill: 'skipped', shortcut: 'skipped' };
 
   say('DroidSuite setup');
   say('');
@@ -76,13 +81,43 @@ export async function runSetup(deps, opts = {}) {
     }
   }
 
+  // Only for people who have an AI coding agent: nobody else needs these folders.
+  if (deps.skill?.present()) {
+    say('');
+    if (await ask('Found an AI coding agent on this computer. Let it use your phone? (adds the droidsuite skill to its folder)', true)) {
+      try {
+        const { targets, updated } = deps.skill.install();
+        say(`✓ ${updated ? 'Updated' : 'Added'} the droidsuite skill for your AI agents (${targets.length} folders).`);
+        result.skill = 'installed';
+      } catch (err) {
+        say(`✗ Couldn't add the skill: ${err.message}. Try again later with: droidsuite skill`);
+        result.skill = 'failed';
+      }
+    } else {
+      say('  Skipped. Add it later with: droidsuite skill');
+    }
+  }
+
+  // One click from now on. It only adds an icon, so unlike adb it doesn't ask.
+  if (deps.shortcut) {
+    say('');
+    try {
+      await deps.shortcut.create();
+      say(`✓ Added the DroidSuite icon: ${deps.shortcut.where}.`);
+      result.shortcut = 'added';
+    } catch (err) {
+      say(`✗ Couldn't add the icon: ${err.message}. Try again later with: droidsuite shortcut --desktop`);
+      result.shortcut = 'failed';
+    }
+  }
+
   say('');
   say('Next:');
-  say('  1. Open "DroidSuite" (the icon the installer added, or: droidsuite open). In an Android project: droidsuite serve');
+  say(`  1. Open "DroidSuite" (${result.shortcut === 'added' ? 'the icon' : 'run: droidsuite open'}). In an Android project: droidsuite serve`);
   say('  2. No app on the phone yet? Open the address serve prints (http://<this computer>:8765/app)');
   say('     on the phone, or scan "Get the phone app" at http://localhost:8765.');
   say('  3. In the app tap Pair and scan the pairing QR code. Turn on Live.');
   say('  Debug over Wi-Fi: open http://localhost:8765 while serve runs, or run "droidsuite debug setup".');
-  say('  Use an AI coding agent such as Claude Code? Run "droidsuite skill" once, so it can install and check your app on the phone.');
+  if (result.skill !== 'installed') say('  Use an AI coding agent such as Claude Code, Codex or Gemini CLI? Run "droidsuite skill" once, so it can install and check your app on the phone.');
   return result;
 }

package/src/skill.mjs

@@ -8,15 +8,48 @@ export const SKILL_NAME = 'droidsuite';
 const OLD_SKILL_NAME = 'apk-bridge';
 export const SKILL_SOURCE = fileURLToPath(new URL(`../skills/${SKILL_NAME}`, import.meta.url));
 
+/**
+ * Every agent's skills folder, relative to the home folder (every project) or the project (--project).
+ * The first two always get a copy: most agents read one of them. Checked with the real programs:
+ *   .agents/skills   Codex (home and project), Antigravity and OpenCode (project)
+ *   .claude/skills   Claude Code, OpenCode
+ *   .gemini/skills   Antigravity (home)
+ * The rest come from each agent's documentation. They get a copy only when `when` already exists, so nobody ends up
+ * with folders for programs they don't have.
+ */
+const AGENT_FOLDERS = [
+  { skills: ['.agents', 'skills'], agents: 'Codex, and agents that share this folder' },
+  { skills: ['.claude', 'skills'], agents: 'Claude Code, OpenCode' },
+  { when: ['.gemini'], skills: ['.gemini', 'skills'], agents: 'Gemini CLI, Antigravity' },
+  { when: ['.cursor'], skills: ['.cursor', 'skills'], agents: 'Cursor' },
+  { when: ['.copilot'], skills: ['.copilot', 'skills'], agents: 'GitHub Copilot' },
+  { when: ['.codeium', 'windsurf'], skills: ['.codeium', 'windsurf', 'skills'], agents: 'Windsurf' },
+  { when: ['.qwen'], skills: ['.qwen', 'skills'], agents: 'Qwen Code' },
+  { when: ['.config', 'agents'], skills: ['.config', 'agents', 'skills'], agents: 'Amp' },
+];
+
+/** The folders to install into under [base], each with the agents that read it. */
+function foldersUnder(base) {
+  return AGENT_FOLDERS
+    .filter((f) => !f.when || existsSync(join(base, ...f.when)))
+    .map((f) => ({ path: join(base, ...f.skills, SKILL_NAME), agents: f.agents }));
+}
+
+/** True when any AI coding agent has left its folder in [home], so setup only asks people who use one. */
+export function hasAgents({ home = homedir() } = {}) {
+  const others = [['.codex'], ['.config', 'opencode']]; // these read the shared folders, and have no folder of their own above
+  return [...AGENT_FOLDERS.map((f) => f.when ?? [f.skills[0]]), ...others].some((p) => existsSync(join(home, ...p)));
+}
+
 /**
  * Where the skill goes:
- *  - default: `~/.claude/skills/droidsuite`, so agents know DroidSuite in every project on this computer
- *  - project: `<cwd>/.claude/skills/droidsuite` (commit it so everyone working on the project has it)
+ *  - default: every agent's folder in the home folder, so agents know DroidSuite in every project on this computer
+ *  - project: the same folders in <cwd> (commit them so everyone working on the project has it)
  *  - dir:     `<dir>/droidsuite`, for agents that read skills from somewhere else
  */
-export function skillTarget({ project = false, dir = null, cwd = process.cwd(), home = homedir() } = {}) {
-  if (dir) return join(resolve(cwd, dir), SKILL_NAME);
-  return join(project ? cwd : home, '.claude', 'skills', SKILL_NAME);
+export function skillTargets({ project = false, dir = null, cwd = process.cwd(), home = homedir() } = {}) {
+  if (dir) return [{ path: join(resolve(cwd, dir), SKILL_NAME), agents: null }];
+  return foldersUnder(project ? cwd : home);
 }
 
 function copySkill(source, path) {
@@ -33,21 +66,22 @@ function removeOldName(path) {
 }
 
 /**
- * Copies (or refreshes) the skill. Returns { path, updated, alsoProject }: updated when an older copy was replaced;
- * alsoProject when a global install also refreshed this project's own copy (an older `droidsuite skill` put one
- * there, and it would otherwise shadow the new global one in this project).
+ * Copies (or refreshes) the skill. Returns { targets, updated, alsoProject }: updated when an older copy was replaced;
+ * alsoProject lists this project's own copies that a global install also refreshed (one left by an older
+ * `droidsuite skill` would otherwise shadow the new global one in this project).
  */
 export function installSkill(options = {}, source = SKILL_SOURCE) {
-  const path = skillTarget(options);
-  const updated = existsSync(path);
-  copySkill(source, path);
-  let alsoProject = null;
+  const targets = skillTargets(options);
+  const updated = targets.some((t) => existsSync(t.path));
+  for (const t of targets) copySkill(source, t.path);
+  const alsoProject = [];
   if (!options.project && !options.dir) {
-    const project = skillTarget({ ...options, project: true });
-    if (project !== path && existsSync(project)) {
-      copySkill(source, project);
-      alsoProject = project;
+    const installed = new Set(targets.map((t) => t.path));
+    for (const t of skillTargets({ ...options, project: true })) {
+      if (installed.has(t.path) || !existsSync(t.path)) continue;
+      copySkill(source, t.path);
+      alsoProject.push(t.path);
     }
   }
-  return { path, updated, alsoProject };
+  return { targets, updated, alsoProject };
 }

package/web/index.html

@@ -473,7 +473,7 @@
         <div id="old-phones"></div>
       </div>
     </div>
-    <div class="sub" id="agent-note" style="margin-top:18px">Use an AI coding agent such as Claude Code? Run <code class="mono">droidsuite skill</code> once in a terminal, so it can install and check your app on the phone.</div>
+    <div class="sub" id="agent-note" style="margin-top:18px">Use an AI coding agent such as Claude Code, Codex or Gemini CLI? Run <code class="mono">droidsuite skill</code> once in a terminal, so it can install and check your app on the phone.</div>
   </section>
   <p class="credit">DroidSuite · made by Mahmoud Helmy</p>
 </div>
@@ -496,7 +496,7 @@
   /** What this phone's Android version can't do (or needs), with the fix. */
   const caps = (p) => {
     const rows = (p.capabilities ?? []).filter((c) => c.status !== 'ok' || c.fix);
-    return rows.length ? `<div class="caps">${rows.map((c) => `<div>${c.status === 'ok' ? '✓' : c.status === 'no' ? '✗' : '!'} <b>${esc(c.label)}:</b> ${esc(c.note)}${c.fix ? ` ${esc(c.fix)}` : ''}</div>`).join('')}</div>` : '';
+    return rows.length ? `<div class="caps">${rows.map((c) => `<div>${c.status === 'no' ? '✗' : '!'} <b>${esc(c.label)}:</b> ${esc(c.note)}${c.fix ? ` ${esc(c.fix)}` : ''}</div>`).join('')}</div>` : '';
   };
   /** "needs Android 12+" when a connected phone is older than the build's minSdk. */
   const tooNewFor = (b, phones) => {