@aident-ai/cli 0.3.0 → 0.3.1-staging.ci.34903740288.1

package/dist/cli.mjs

@@ -7387,25 +7387,9 @@ async function installAgentSkillBundle(descriptorValue, options = {}, injected =
   const descriptor = AgentSkillBundleInstallDescriptorSchema.parse(descriptorValue);
   const home = options.home ?? homedir2();
   const env = options.env ?? process.env;
-  const stateRoot = join3(home, ".aident", "skills", "internal", descriptor.name);
-  const releasesRoot = join3(stateRoot, "releases");
-  const releaseDirectory = join3(releasesRoot, descriptor.artifactSha256);
-  await mkdir3(stateRoot, { recursive: true, mode: 448 });
-  const lock = await tryAcquireDirectoryLock(join3(stateRoot, "install.lock"));
-  if (!lock)
-    throw new Error(`Another ${descriptor.name} installation is already running`);
-  try {
-    if (!await pathExists(releaseDirectory)) {
-      const archive = await downloadArchive(descriptor, injected.fetch ?? fetch);
-      await materializeRelease(archive, descriptor, releasesRoot, releaseDirectory);
-    } else {
-      const existingRelease = await lstat2(releaseDirectory);
-      if (!existingRelease.isDirectory()) {
-        throw new Error(`Existing agent Skill release is not a directory: ${releaseDirectory}`);
-      }
-      await assertInstalledSkillIdentity(releaseDirectory, descriptor.name);
-    }
-    const targets = await reconcileTargets(descriptor.name, releaseDirectory, releasesRoot, home, env);
+  return withInstallLock(descriptor.name, home, async () => {
+    const { releaseDirectory } = await prepareRelease(descriptor, home, injected.fetch ?? fetch);
+    const targets = await reconcileTargets(descriptor.name, releaseDirectory, dirname3(releaseDirectory), home, env);
     return {
       name: descriptor.name,
       version: descriptor.version,
@@ -7414,6 +7398,37 @@ async function installAgentSkillBundle(descriptorValue, options = {}, injected =
       success: targets.every((target) => target.status !== "conflict" /* Conflict */ && target.status !== "failed" /* Failed */),
       targets
     };
+  });
+}
+async function prepareAgentSkillBundleRelease(descriptorValue, options = {}, injected = {}) {
+  const descriptor = AgentSkillBundleInstallDescriptorSchema.parse(descriptorValue);
+  const home = options.home ?? homedir2();
+  return withInstallLock(descriptor.name, home, () => prepareRelease(descriptor, home, injected.fetch ?? fetch));
+}
+async function prepareRelease(descriptor, home, fetchImpl) {
+  const stateRoot = join3(home, ".aident", "skills", "internal", descriptor.name);
+  const releasesRoot = join3(stateRoot, "releases");
+  const releaseDirectory = join3(releasesRoot, descriptor.artifactSha256);
+  if (!await pathExists(releaseDirectory)) {
+    const archive = await downloadArchive(descriptor, fetchImpl);
+    await materializeRelease(archive, descriptor, releasesRoot, releaseDirectory);
+  } else {
+    const existingRelease = await lstat2(releaseDirectory);
+    if (!existingRelease.isDirectory()) {
+      throw new Error(`Existing agent Skill release is not a directory: ${releaseDirectory}`);
+    }
+    await assertInstalledSkillIdentity(releaseDirectory, descriptor.name);
+  }
+  return { descriptor, releaseDirectory };
+}
+async function withInstallLock(name, home, run) {
+  const stateRoot = join3(home, ".aident", "skills", "internal", name);
+  await mkdir3(stateRoot, { recursive: true, mode: 448 });
+  const lock = await tryAcquireDirectoryLock(join3(stateRoot, "install.lock"));
+  if (!lock)
+    throw new Error(`Another ${name} installation is already running`);
+  try {
+    return await run();
   } finally {
     await lock.release();
   }
@@ -8167,7 +8182,7 @@ function getConfigFile() {
 function getConfigFileForHome(home) {
   return join4(getAidentDir(home), "config.json");
 }
-var DEFAULT_BASE_URL = "https://loadout.aident.ai"?.trim() || "https://loadout.aident.ai";
+var DEFAULT_BASE_URL = "https://staging.loadout.aident.ai"?.trim() || "https://loadout.aident.ai";
 var CONFIG_KEYS = ["baseUrl", "packages"];
 async function readConfig(configFile = getConfigFile()) {
   try {
@@ -8460,7 +8475,7 @@ function serializeLoadoutSkillPackage(skillPackage) {
 }
 
 // src/version.ts
-var VERSION = "0.3.0";
+var VERSION = "0.3.1-staging.ci.34903740288.1";
 var DESKTOP_VERSION = process.env.AIDENT_DESKTOP_VERSION?.trim() || undefined;
 var DESKTOP_CHANNEL = parseDesktopChannel(process.env.AIDENT_DESKTOP_CHANNEL);
 function parseDesktopChannel(value) {
@@ -9353,7 +9368,7 @@ var LoadoutFavoriteSkillsUpdateSchema = objectType({
   syncRequired: booleanType()
 }).strict();
 function getLoadoutFavoriteSkillsStateToken(skills) {
-  const state = skills.map(({ name, artifactVersionId }) => ({ name, artifactVersionId })).sort((left, right) => left.name.localeCompare(right.name));
+  const state = skills.map(({ name, artifactVersionId, deliveryRevision }) => ({ name, artifactVersionId, deliveryRevision })).sort((left, right) => left.name.localeCompare(right.name));
   return createHash3("sha256").update(JSON.stringify(state)).digest("hex");
 }
 
@@ -10090,7 +10105,7 @@ function isExpired(creds) {
 
 // src/loadoutFavoriteSkills.ts
 import { createHash as createHash5 } from "node:crypto";
-import { lstat as lstat5, mkdir as mkdir8, readFile as readFile8, readlink, rename as rename4, rm as rm3, symlink as symlink3, writeFile as writeFile6 } from "node:fs/promises";
+import { cp, lstat as lstat5, mkdir as mkdir8, readFile as readFile8, readlink, rename as rename4, rm as rm3, symlink as symlink3, writeFile as writeFile6 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
 import path from "node:path";
 
@@ -10169,6 +10184,8 @@ function assertPackage(pkg) {
   }
   if (packageBytes > LOADOUT_SKILL_MAX_PACKAGE_BYTES)
     throw new Error(`Package is too large: ${pkg.name}`);
+  if (pkg.bundle)
+    AgentSkillBundleInstallDescriptorSchema.parse(pkg.bundle);
 }
 function quoteYaml(value) {
   return JSON.stringify(value);
@@ -10211,7 +10228,7 @@ async function readManifest(home, env) {
       throw new Error("Unsupported manifest");
     const harnessRoots = new Set(getHarnessHosts(home, env).map(({ root }) => path.join(root, "skills")));
     for (const skill of value.skills) {
-      if (!LOADOUT_SKILL_NAME_PATTERN.test(skill.name) || !isCanonicalUuid(skill.artifactVersionId) || skill.displayName !== undefined && typeof skill.displayName !== "string" || skill.summary !== undefined && typeof skill.summary !== "string" || !/^loadout-[a-z0-9-]+-[0-9a-f]{8}$/.test(skill.commandName) || skill.installPath !== path.join(getCanonicalRoot(home, env), skill.commandName) || skill.linkPaths.some((linkPath) => !harnessRoots.has(path.dirname(linkPath)) || path.basename(linkPath) !== skill.commandName)) {
+      if (!LOADOUT_SKILL_NAME_PATTERN.test(skill.name) || !isCanonicalUuid(skill.artifactVersionId) || skill.displayName !== undefined && typeof skill.displayName !== "string" || skill.summary !== undefined && typeof skill.summary !== "string" || skill.deliveryRevision !== undefined && !/^[a-f0-9]{64}$/.test(skill.deliveryRevision) || !/^loadout-[a-z0-9-]+-[0-9a-f]{8}$/.test(skill.commandName) || skill.installPath !== path.join(getCanonicalRoot(home, env), skill.commandName) || skill.linkPaths.some((linkPath) => !harnessRoots.has(path.dirname(linkPath)) || path.basename(linkPath) !== skill.commandName)) {
         throw new Error("Invalid favorite Skills ownership manifest");
       }
     }
@@ -10245,7 +10262,11 @@ async function removeOwnedSkill(skill) {
   if (await pathExists3(skill.installPath))
     await rm3(skill.installPath, { recursive: true });
 }
-async function reconcileLoadoutFavoriteSkills(payload, home = getHome(), env = process.env) {
+async function writeBundlePackage(directory, pkg, releaseDirectory) {
+  await cp(releaseDirectory, directory, { recursive: true });
+  await writeFile6(path.join(directory, LOADOUT_SKILL_ENTRYPOINT), entrypointContent(pkg, await readFile8(path.join(releaseDirectory, LOADOUT_SKILL_ENTRYPOINT), "utf8")));
+}
+async function reconcileLoadoutFavoriteSkills(payload, home = getHome(), env = process.env, injected = {}) {
   const manifest = await readManifest(home, env);
   const previousByName = new Map(manifest.skills.map((skill) => [skill.name, skill]));
   const desiredNames = new Set(payload.packages.map((pkg) => pkg.name));
@@ -10260,6 +10281,12 @@ async function reconcileLoadoutFavoriteSkills(payload, home = getHome(), env = p
   if (payload.unavailable.some((name) => desiredNames.has(name))) {
     throw new Error("A favorite Skill cannot be both available and unavailable");
   }
+  const preparedBundles = new Map;
+  for (const pkg of payload.packages) {
+    if (!pkg.bundle)
+      continue;
+    preparedBundles.set(pkg.name, await (injected.prepareBundleRelease ?? prepareAgentSkillBundleRelease)(pkg.bundle, { home, env }));
+  }
   const nextSkills = [];
   const result = {
     installed: [],
@@ -10301,21 +10328,26 @@ async function reconcileLoadoutFavoriteSkills(payload, home = getHome(), env = p
       continue;
     }
     const allLinksExist = (await Promise.all(linkPaths.map(pathExists3))).every(Boolean);
-    if (previous?.artifactVersionId === pkg.artifactVersionId && previous.displayName === pkg.displayName && previous.summary === pkg.summary && previous.installPath === installPath && previous.linkPaths.length === linkPaths.length && previous.linkPaths.every((linkPath) => linkPaths.includes(linkPath)) && await pathExists3(installPath) && allLinksExist) {
+    if (previous?.artifactVersionId === pkg.artifactVersionId && previous.displayName === pkg.displayName && previous.summary === pkg.summary && previous.deliveryRevision === pkg.bundle?.artifactSha256 && previous.installPath === installPath && previous.linkPaths.length === linkPaths.length && previous.linkPaths.every((linkPath) => linkPaths.includes(linkPath)) && await pathExists3(installPath) && allLinksExist) {
       result.unchanged.push(pkg.name);
       nextSkills.push(previous);
       continue;
     }
+    const preparedBundle = preparedBundles.get(pkg.name);
     const temporaryPath = `${installPath}.${process.pid}.tmp`;
     const backupPath = `${installPath}.${process.pid}.backup`;
     await mkdir8(getCanonicalRoot(home, env), { recursive: true });
     await rm3(temporaryPath, { recursive: true, force: true });
     await rm3(backupPath, { recursive: true, force: true });
-    await mkdir8(temporaryPath, { recursive: true });
-    for (const file of pkg.files) {
-      const destination = path.join(temporaryPath, ...file.path.split("/"));
-      await mkdir8(path.dirname(destination), { recursive: true });
-      await writeFile6(destination, file.path === LOADOUT_SKILL_ENTRYPOINT ? entrypointContent(pkg, file.content) : file.content);
+    if (preparedBundle) {
+      await writeBundlePackage(temporaryPath, pkg, preparedBundle.releaseDirectory);
+    } else {
+      await mkdir8(temporaryPath, { recursive: true });
+      for (const file of pkg.files) {
+        const destination = path.join(temporaryPath, ...file.path.split("/"));
+        await mkdir8(path.dirname(destination), { recursive: true });
+        await writeFile6(destination, file.path === LOADOUT_SKILL_ENTRYPOINT ? entrypointContent(pkg, file.content) : file.content);
+      }
     }
     const createdLinkPaths = [];
     let backedUp = false;
@@ -10350,7 +10382,8 @@ async function reconcileLoadoutFavoriteSkills(payload, home = getHome(), env = p
       summary: pkg.summary,
       commandName: nextCommandName,
       installPath,
-      linkPaths
+      linkPaths,
+      ...pkg.bundle ? { deliveryRevision: pkg.bundle.artifactSha256 } : {}
     });
     (previous ? result.updated : result.installed).push(pkg.name);
   }
@@ -18683,7 +18716,7 @@ async function stageOnboardingSkill(home, artifact) {
 
 // src/onboarding/transaction.ts
 import { randomUUID as randomUUID8 } from "node:crypto";
-import { cp, lstat as lstat11, mkdir as mkdir12, readdir as readdir6, readFile as readFile17, rename as rename8, rm as rm7, symlink as symlink5 } from "node:fs/promises";
+import { cp as cp2, lstat as lstat11, mkdir as mkdir12, readdir as readdir6, readFile as readFile17, rename as rename8, rm as rm7, symlink as symlink5 } from "node:fs/promises";
 import { dirname as dirname11, join as join16, relative as relative5 } from "node:path";
 async function applyOnboardingPlan(plan, options) {
   if (options.confirmationDigest !== plan.confirmationDigest)
@@ -18851,7 +18884,7 @@ async function applyChange(change, desiredContent, options) {
   if (change.action === "copy" /* Copy */) {
     const temporary = `${change.target}.${randomUUID8()}.tmp`;
     await mkdir12(dirname11(temporary), { recursive: true, mode: 448 });
-    await cp(options.skillSourceDirectory, temporary, { recursive: true, errorOnExist: true });
+    await cp2(options.skillSourceDirectory, temporary, { recursive: true, errorOnExist: true });
     await rename8(temporary, change.target);
     return;
   }
@@ -19002,7 +19035,7 @@ class OnboardingService {
   }
 }
 
-// ../web/shared/loadout/LoadoutOnboardingTelemetry.ts
+// ../web/shared/loadout/LoadoutOnboardingTelemetryContract.ts
 var LoadoutOnboardingPath;
 ((LoadoutOnboardingPath) => {
   LoadoutOnboardingPath["Unselected"] = "unselected";
@@ -19019,6 +19052,8 @@ var LoadoutOnboardingTelemetryStage;
   LoadoutOnboardingTelemetryStage["LoginCompleted"] = "login_completed";
   LoadoutOnboardingTelemetryStage["MethodSelected"] = "method_selected";
   LoadoutOnboardingTelemetryStage["NativeDownloadStarted"] = "native_download_started";
+  LoadoutOnboardingTelemetryStage["PackageInstallStarted"] = "package_install_started";
+  LoadoutOnboardingTelemetryStage["PackageInstallCompleted"] = "package_install_completed";
   LoadoutOnboardingTelemetryStage["DesktopStarted"] = "desktop_started";
   LoadoutOnboardingTelemetryStage["InstallationCompleted"] = "installation_completed";
   LoadoutOnboardingTelemetryStage["OnboardingStarted"] = "onboarding_started";
@@ -19055,6 +19090,8 @@ var LoadoutOnboardingLaunchSource;
   LoadoutOnboardingLaunchSource["Desktop"] = "desktop";
   LoadoutOnboardingLaunchSource["Web"] = "web";
 })(LoadoutOnboardingLaunchSource ||= {});
+
+// ../web/shared/loadout/LoadoutOnboardingTelemetry.ts
 var LoadoutOnboardingClientFamily;
 ((LoadoutOnboardingClientFamily) => {
   LoadoutOnboardingClientFamily["Aident"] = "aident";