@swmansion/argent 0.33.0 → 0.33.1-next.1

package/dist/cli-cmds.mjs

@@ -35872,7 +35872,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.33.0";
+    return "0.33.1-next.1";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16981,7 +16981,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.33.0";
+    return "0.33.1-next.1";
   }
   return "0.0.0";
 }
@@ -20663,12 +20663,13 @@ function npxChildEnv(env = process.env) {
   }
   return childEnv;
 }
-function isSkillsCliAvailable() {
+function isSkillsCliAvailable(cwd) {
   try {
     execSync("npx --force --no-install skills --version", {
       env: npxChildEnv(),
       stdio: ["ignore", "ignore", "ignore"],
-      timeout: PROBE_TIMEOUT_MS
+      timeout: PROBE_TIMEOUT_MS,
+      ...cwd ? { cwd } : {}
     });
     return true;
   } catch {
@@ -23345,10 +23346,10 @@ function bundledCopyFor(version) {
   }
   return SKILLS_DIR;
 }
-function printManualInstructions(source, bundledCopy, scope, customRoot, npxMissing = false) {
-  const root = scope === "global" ? "~" : scope === "custom" ? customRoot : ".";
+function printManualInstructions(source, bundledCopy, scope, root, npxMissing = false) {
+  const dir = (sub) => scope === "global" ? `~/${sub}` : shellQuotePath(`${root}/${sub}`);
   const add = `skills add ${source}${scope === "global" ? " -g" : ""} --skill '*' -y`;
-  const cd = scope === "custom" ? `cd ${customRoot} && ` : "";
+  const cd = scope === "global" ? "" : `cd ${shellQuotePath(root)} && `;
   note(
     [
       `Skills are bundled at:`,
@@ -23357,10 +23358,10 @@ function printManualInstructions(source, bundledCopy, scope, customRoot, npxMiss
       `To install manually, copy them to your editor's skills directory:`,
       ``,
       `  ${import_picocolors10.default.dim("# Claude Code")}`,
-      `  mkdir -p ${root}/.claude/skills && cp -r ${bundledCopy}/* ${root}/.claude/skills/`,
+      `  mkdir -p ${dir(".claude/skills")} && cp -r ${bundledCopy}/* ${dir(".claude/skills/")}`,
       ``,
       `  ${import_picocolors10.default.dim("# Cursor")}`,
-      `  mkdir -p ${root}/.cursor/skills && cp -r ${bundledCopy}/* ${root}/.cursor/skills/`,
+      `  mkdir -p ${dir(".cursor/skills")} && cp -r ${bundledCopy}/* ${dir(".cursor/skills/")}`,
       ``,
       ...npxMissing ? [`  ${import_picocolors10.default.dim("# Or, with pnpm:")}`, `  ${cd}pnpm dlx ${add}`] : [`  ${import_picocolors10.default.dim("# Or use npx skills directly:")}`, `  ${cd}npx ${add}`]
     ].join("\n"),
@@ -23392,12 +23393,13 @@ function formatSkillsSummaryLine(skills) {
   return `${import_picocolors10.default.green("Skills")} ${written} installed`;
 }
 async function runSkillsStep(args) {
-  const { nonInteractive, fromTar, version, scope, customRoot } = args;
+  const { nonInteractive, fromTar, version, scope, effectiveRoot } = args;
+  const skillsCwd = scope === "global" ? void 0 : effectiveRoot;
   log.step(import_picocolors10.default.bold("Step 2: Skills Installation"));
   log.warn(import_picocolors10.default.yellow("Skills installation is required for Argent to function properly."));
   let skillsMethod;
   const online = await isOnline();
-  const offlineWithCache = !online && isSkillsCliAvailable();
+  const offlineWithCache = !online && isSkillsCliAvailable(skillsCwd);
   const skillsCliReady = online || offlineWithCache;
   if (!skillsCliReady) {
     log.warn(
@@ -23436,8 +23438,7 @@ async function runSkillsStep(args) {
   const useGitHubSource = online && !fromTar && version !== "unknown";
   const skillsSource = useGitHubSource ? buildArgentSkillsSource(version) : SKILLS_DIR;
   const bundledCopy = useGitHubSource ? bundledCopyFor(version) : SKILLS_DIR;
-  const skillsCwd = scope === "custom" ? customRoot : void 0;
-  const skillsRoot = scope === "global" ? os3.homedir() : skillsCwd ?? process.cwd();
+  const skillsRoot = scope === "global" ? os3.homedir() : effectiveRoot;
   const skillsScope = scope === "global" ? "global" : "project";
   const expected = listBundledSkills(bundledCopy);
   const snapshot = () => snapshotArgentSkills(skillsRoot, skillsScope, expected);
@@ -23447,7 +23448,7 @@ async function runSkillsStep(args) {
   let installedFrom = skillsSource;
   let fallbackReason = null;
   if (skillsMethod === "manual") {
-    printManualInstructions(skillsSource, bundledCopy, scope, customRoot);
+    printManualInstructions(skillsSource, bundledCopy, scope, effectiveRoot);
     skillOutcome = "skipped";
   } else {
     const interactive = skillsMethod === "interactive";
@@ -23471,7 +23472,7 @@ async function runSkillsStep(args) {
     const fail = (err, attempted, npxMissing = false) => {
       if (!interactive) spinner2.stop(import_picocolors10.default.red("Skills installation failed."));
       log.error(`Failed to install skills from ${attempted}: ${meaningfulLine(err)}`);
-      printManualInstructions(bundledCopy, bundledCopy, scope, customRoot, npxMissing);
+      printManualInstructions(bundledCopy, bundledCopy, scope, effectiveRoot, npxMissing);
       return "failure";
     };
     try {
@@ -23746,7 +23747,7 @@ async function init2(args) {
       fromTar: parsed.fromTar,
       version,
       scope,
-      customRoot
+      effectiveRoot
     });
     log.step(import_picocolors11.default.bold("Step 3: Rules"));
     const copyResults = copyRulesAndAgents(

package/dist/tool-server.cjs

@@ -84132,16 +84132,22 @@ async function listAndroidSerials(options = {}) {
   const { stdout } = await runAdb(["devices"], { timeoutMs: options.devicesTimeoutMs });
   return parseAdbDevices(stdout);
 }
+function readEnrichment(serial, shellCommand) {
+  return adbShell(serial, shellCommand, { timeoutMs: ENRICH_TIMEOUT_MS }).catch(() => "");
+}
 async function readAvdName(serial) {
+  return (await readAvd(serial)).name;
+}
+async function readAvd(serial) {
+  const read = (prop) => adbShell(serial, `getprop ${prop}`, { timeoutMs: ENRICH_TIMEOUT_MS }).then(
+    (value) => value.trim(),
+    () => null
+  );
   const [modern, legacy] = await Promise.all([
-    adbShell(serial, "getprop ro.boot.qemu.avd_name", { timeoutMs: ENRICH_TIMEOUT_MS }).catch(
-      () => ""
-    ),
-    adbShell(serial, "getprop ro.kernel.qemu.avd_name", { timeoutMs: ENRICH_TIMEOUT_MS }).catch(
-      () => ""
-    )
+    read("ro.boot.qemu.avd_name"),
+    read("ro.kernel.qemu.avd_name")
   ]);
-  return modern.trim() || legacy.trim() || null;
+  return { name: modern || legacy || null, answered: modern !== null || legacy !== null };
 }
 async function readEmulatorConsoleAvdName(serial, options = {}) {
   try {
@@ -84159,16 +84165,14 @@ async function readEmulatorConsoleAvdName(serial, options = {}) {
   }
 }
 async function readRuntimeKind(serial) {
-  const features = await adbShell(serial, "pm list features", {
-    timeoutMs: ENRICH_TIMEOUT_MS
-  }).catch(() => "");
+  const [features, characteristics] = await Promise.all([
+    readEnrichment(serial, "pm list features"),
+    readEnrichment(serial, "getprop ro.build.characteristics")
+  ]);
   if (/feature:android\.(software\.leanback|hardware\.type\.television)\b/.test(features)) {
     return "tv";
   }
   if (features.trim()) return "mobile";
-  const characteristics = await adbShell(serial, "getprop ro.build.characteristics", {
-    timeoutMs: ENRICH_TIMEOUT_MS
-  }).catch(() => "");
   const isTv = characteristics.split(",").map((c) => c.trim().toLowerCase()).includes("tv");
   if (isTv) return "tv";
   return void 0;
@@ -84184,6 +84188,17 @@ async function resolveRuntimeKindCached(serial, avdName) {
   androidRuntimeKindCache.set(serial, { avdName, kind });
   return kind;
 }
+async function resolveRuntimeKindAlongside(serial, avdPromise) {
+  const cached3 = androidRuntimeKindCache.get(serial);
+  const probe4 = cached3 ? void 0 : readRuntimeKind(serial);
+  const avd = await avdPromise;
+  if (cached3 && !avd.answered && consolePortFromAdbSerial(serial) !== null) return void 0;
+  if (cached3 && cached3.avdName === avd.name) return cached3.kind;
+  const kind = await (probe4 ?? readRuntimeKind(serial));
+  if (kind === void 0) return void 0;
+  androidRuntimeKindCache.set(serial, { avdName: avd.name, kind });
+  return kind;
+}
 async function getAndroidRuntimeKind(serial, options = {}) {
   const serials = await listAndroidSerials(options);
   const ready2 = serials.find((d) => d.serial === serial && d.state === "device");
@@ -84214,23 +84229,20 @@ async function listAndroidDevices(opts = {}) {
           sdkLevel: null
         };
       }
-      const [model, sdk, avd] = await Promise.all([
-        adbShell(d.serial, "getprop ro.product.model", { timeoutMs: ENRICH_TIMEOUT_MS }).catch(
-          () => ""
-        ),
-        adbShell(d.serial, "getprop ro.build.version.sdk", { timeoutMs: ENRICH_TIMEOUT_MS }).catch(
-          () => ""
-        ),
-        readAvdName(d.serial)
+      const avdPromise = readAvd(d.serial);
+      const [model, sdk, avd, runtimeKind] = await Promise.all([
+        readEnrichment(d.serial, "getprop ro.product.model"),
+        readEnrichment(d.serial, "getprop ro.build.version.sdk"),
+        avdPromise,
+        opts.runtimeKind ? resolveRuntimeKindAlongside(d.serial, avdPromise) : void 0
       ]);
-      const runtimeKind = opts.runtimeKind ? await resolveRuntimeKindCached(d.serial, avd) : void 0;
       const sdkLevel = parseInt(sdk.trim(), 10);
       return {
         serial: d.serial,
         state: d.state,
         isEmulator: d.serial.startsWith("emulator-"),
         model: model.trim() || null,
-        avdName: avd,
+        avdName: avd.name,
         sdkLevel: Number.isFinite(sdkLevel) ? sdkLevel : null,
         runtimeKind
       };
@@ -101261,7 +101273,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.33.0";
+    return "0.33.1-next.1";
   }
   return "0.0.0";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.33.0",
+  "version": "0.33.1-next.1",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator, Android Emulator, Chromium app and Mac app control",
   "license": "Apache-2.0",