@aident-ai/cli 0.2.1 → 0.2.2-rc.ci.32837080953.1

package/dist/dsh.mjs

@@ -531,7 +531,7 @@ import { join as join2 } from "node:path";
 // src/config.ts
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 
 // src/packages.ts
 var CLI_PACKAGES = ["loadout", "playbook", "intern"];
@@ -601,18 +601,20 @@ function getLoadoutHostForLegacyAidentHost(host) {
 }
 
 // src/config.ts
-function getAidentDir() {
-  const home = process.env.HOME || process.env.USERPROFILE || homedir();
+function getAidentDir(home = process.env.HOME || process.env.USERPROFILE || homedir()) {
   return join(home, ".aident");
 }
 function getConfigFile() {
   return join(getAidentDir(), "config.json");
 }
+function getConfigFileForHome(home) {
+  return join(getAidentDir(home), "config.json");
+}
 var DEFAULT_BASE_URL = "https://loadout.aident.ai";
 var CONFIG_KEYS = ["baseUrl", "packages"];
-async function readConfig() {
+async function readConfig(configFile = getConfigFile()) {
   try {
-    const text = await readFile(getConfigFile(), "utf-8");
+    const text = await readFile(configFile, "utf-8");
     const parsed = JSON.parse(text);
     if (!parsed || typeof parsed !== "object")
       return {};
@@ -623,15 +625,15 @@ async function readConfig() {
     return {};
   }
 }
-async function writeConfig(config) {
-  await mkdir(getAidentDir(), { recursive: true, mode: 448 });
-  await writeFile(getConfigFile(), JSON.stringify(config, null, 2) + `
+async function writeConfig(config, configFile = getConfigFile()) {
+  await mkdir(dirname(configFile), { recursive: true, mode: 448 });
+  await writeFile(configFile, JSON.stringify(config, null, 2) + `
 `, { mode: 420 });
 }
-async function setConfigValue(key, value) {
-  const config = await readConfig();
+async function setConfigValue(key, value, configFile = getConfigFile()) {
+  const config = await readConfig(configFile);
   config[key] = value;
-  await writeConfig(config);
+  await writeConfig(config, configFile);
 }
 async function unsetConfigValue(key) {
   const config = await readConfig();
@@ -655,6 +657,10 @@ async function resolveDefaultPackages() {
   const config = await readConfig();
   return normalizeCliPackages(config.packages ?? DEFAULT_CLI_PACKAGES);
 }
+async function resolveOriginClientName() {
+  const config = await readConfig();
+  return typeof config.originClientName === "string" && config.originClientName.trim() ? config.originClientName.trim() : null;
+}
 function isKnownConfigKey(key) {
   return CONFIG_KEYS.includes(key);
 }
@@ -669,7 +675,8 @@ function normalizeBaseUrl(url) {
 }
 
 // src/version.ts
-var VERSION = "0.2.1";
+var VERSION = "0.2.2-rc.ci.32837080953.1";
+var DESKTOP_VERSION = process.env.AIDENT_DESKTOP_VERSION?.trim() || undefined;
 
 // src/catalogCache.ts
 var CACHE_TTL_MS = 5 * 60 * 1000;
@@ -721,12 +728,12 @@ function isCommandCatalog(value) {
 // src/loadoutSkill.ts
 import { createHash as createHash3 } from "node:crypto";
 import { lstat as lstat3, readdir as readdir2, readFile as readFile5, realpath as realpath2 } from "node:fs/promises";
-import { basename, dirname as dirname3, join as join6 } from "node:path";
+import { basename, dirname as dirname4, join as join6 } from "node:path";
 
 // src/loadoutSkillHosts.ts
 import { existsSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { dirname, isAbsolute, join as join3, relative, resolve } from "node:path";
+import { dirname as dirname2, isAbsolute, join as join3, relative, resolve } from "node:path";
 function getLoadoutSkillTargets(cwd = process.cwd(), home = homedir2(), env = process.env) {
   const targets = [];
   const targetsByPath = new Map;
@@ -811,7 +818,7 @@ function getProjectRoots(cwd) {
     roots.push(current);
     if (existsSync(join3(current, ".git")))
       return roots;
-    const parent = dirname(current);
+    const parent = dirname2(current);
     if (parent === current)
       return [start];
     current = parent;
@@ -900,7 +907,7 @@ import { randomUUID as randomUUID2 } from "node:crypto";
 import { constants } from "node:fs";
 import { access, lstat as lstat2, mkdir as mkdir4, readFile as readFile4, realpath, rename as rename2, symlink, unlink as unlink2, writeFile as writeFile4 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
-import { delimiter, dirname as dirname2, isAbsolute as isAbsolute2, join as join5, posix, win32 as win322 } from "node:path";
+import { delimiter, dirname as dirname3, isAbsolute as isAbsolute2, join as join5, posix, win32 as win322 } from "node:path";
 
 // src/directoryLock.ts
 import { randomUUID } from "node:crypto";
@@ -5660,7 +5667,7 @@ function getPackageManagedCliReplacementStatePath(homeDir) {
 async function writePackageManagedCliReplacementState(homeDir, state) {
   const path = getPackageManagedCliReplacementStatePath(homeDir);
   const temporary = `${path}.${state.transactionId}.tmp`;
-  await mkdir4(dirname2(path), { recursive: true, mode: 448 });
+  await mkdir4(dirname3(path), { recursive: true, mode: 448 });
   await writeFile4(temporary, `${JSON.stringify(state)}
 `, { mode: 384, flag: "wx" });
   await rename2(temporary, path);
@@ -5692,7 +5699,7 @@ async function removePackageManagedCliReplacementState(homeDir) {
   await unlink2(getPackageManagedCliReplacementStatePath(homeDir));
 }
 async function createNativeCliSymlink(target, path) {
-  await mkdir4(dirname2(path), { recursive: true });
+  await mkdir4(dirname3(path), { recursive: true });
   await symlink(target, path, process.platform === "win32" ? "file" : undefined);
 }
 function getManagerCommand(method, platform = process.platform) {
@@ -6198,6 +6205,15 @@ var KNOWN_CLEAN_LOADOUT_SKILL_REQUIRED_FILE_GIT_BLOB_SHA1 = {
       "references/mcp.md": "3e92c88b1ef94e863bd4ce977a36abc3a0df2138",
       "references/troubleshooting.md": "f819915c8829b028630ef1f8f29ae9433a072ca8"
     }
+  ],
+  "0.4.17": [
+    {
+      "SKILL.md": "7c4225f1e8bc400ead1197e1ea8ddaa79197e160",
+      "references/api.md": "240b913e8c85492f2441326033db91747c54863e",
+      "references/loadout.md": "82bc313f84b430aecafe8cca7512db7e78e73690",
+      "references/mcp.md": "4b59cce600b87e1ae2c7cbda8b61f79cd5776fc4",
+      "references/troubleshooting.md": "f819915c8829b028630ef1f8f29ae9433a072ca8"
+    }
   ]
 };
 async function fetchLoadoutSkillMetadata(baseUrl) {
@@ -6236,7 +6252,7 @@ async function getLoadoutSkillInventory(candidates = getInstalledLoadoutSkillCan
   const resolvedManagedReleasesRoot = await realpath2(managedReleasesRoot).catch(() => managedReleasesRoot);
   const inspected = await Promise.all(candidates.map(async (candidate) => ({
     candidate,
-    installation: await inspectLoadoutSkillDirectory(dirname3(candidate.path), resolvedManagedReleasesRoot)
+    installation: await inspectLoadoutSkillDirectory(dirname4(candidate.path), resolvedManagedReleasesRoot)
   })));
   const installations = [];
   const byRealPath = new Map;
@@ -6392,7 +6408,7 @@ function isManagedReleasePath(directory, artifactSha256, managedReleasesRoot) {
     const normalized = path.replaceAll("\\", "/");
     return process.platform === "win32" ? normalized.toLowerCase() : normalized;
   };
-  return normalize(dirname3(directory)) === normalize(managedReleasesRoot) && normalize(basename(directory)) === normalize(artifactSha256);
+  return normalize(dirname4(directory)) === normalize(managedReleasesRoot) && normalize(basename(directory)) === normalize(artifactSha256);
 }
 function stateForMissing(error) {
   return isMissingError(error) ? "missing" /* Missing */ : "malformed" /* Malformed */;
@@ -6456,6 +6472,30 @@ function isLoadoutSkillNotice(value) {
   return typeof body.id === "string" && (body.severity === "info" || body.severity === "warning") && typeof body.message === "string";
 }
 
+// ../web/shared/loadout/LoadoutOriginIdentity.ts
+var AIDENT_LOADOUT_ORIGIN_CLIENT_HEADER = "x-aident-loadout-origin-client";
+var AIDENT_LOADOUT_ORIGIN_CLIENT_QUERY_PARAM = "loadout_origin";
+var LEGACY_LOADOUT_AUDIT_AGENT_NAMES = new Set([
+  "platform",
+  "cli-exec",
+  "mcp",
+  "tool-exec",
+  "capability-exec",
+  "integration-runtime"
+]);
+function normalizeLoadoutOriginClientName(value) {
+  const normalized = value?.trim().replace(/\s+/g, " ");
+  return normalized && normalized.length <= 160 ? normalized : null;
+}
+function withLoadoutOriginClient(url, clientName) {
+  const normalized = normalizeLoadoutOriginClientName(clientName);
+  if (!normalized)
+    return url;
+  const resolved = new URL(url);
+  resolved.searchParams.set(AIDENT_LOADOUT_ORIGIN_CLIENT_QUERY_PARAM, normalized);
+  return resolved.toString();
+}
+
 // src/client.ts
 var CLI_CATALOG_DURATION_HEADER = "x-aident-cli-catalog-duration-ms";
 var CLI_LOCALE = Intl.DateTimeFormat().resolvedOptions().locale;
@@ -6467,9 +6507,10 @@ class CliClient {
   installedSkillVersion;
   loadoutSkillInventory;
   favoriteSkillsStateToken;
+  originClientName;
   commandOperations = new Map;
   catalogDurationMs = null;
-  constructor(creds, credentialSource = "stored", packages, installedSkillVersion = null, loadoutSkillInventory = null, favoriteSkillsStateToken = null) {
+  constructor(creds, credentialSource = "stored", packages, installedSkillVersion = null, loadoutSkillInventory = null, favoriteSkillsStateToken = null, originClientName = null) {
     this.creds = creds;
     this.credentialSource = credentialSource;
     if (packages.length === 0)
@@ -6478,6 +6519,7 @@ class CliClient {
     this.installedSkillVersion = installedSkillVersion;
     this.loadoutSkillInventory = loadoutSkillInventory;
     this.favoriteSkillsStateToken = favoriteSkillsStateToken;
+    this.originClientName = originClientName;
   }
   get baseUrl() {
     return this.creds.base_url.replace(/\/+$/, "");
@@ -6603,6 +6645,7 @@ class CliClient {
       "Accept-Language": CLI_LOCALE,
       "User-Agent": `@aident-ai/cli/${VERSION}`,
       [AIDENT_UPDATE_PROTOCOL_HEADER]: AIDENT_UPDATE_PROTOCOL_VERSION,
+      ...this.originClientName ? { [AIDENT_LOADOUT_ORIGIN_CLIENT_HEADER]: this.originClientName } : {},
       ...extraHeaders
     };
     if (body !== undefined)
@@ -7058,16 +7101,17 @@ async function genReconcileFavoriteSkills(resolved, result, dependencies) {
 // src/authenticatedClient.ts
 async function getAuthenticatedClient(packages, options = {}) {
   const activePackages = packages ?? await resolveDefaultPackages();
-  const [skillInventory, favoriteSkillsStateToken] = await Promise.all([
+  const [skillInventory, favoriteSkillsStateToken, originClientName] = await Promise.all([
     getLoadoutSkillInventory(),
-    getInstalledLoadoutFavoriteSkillsStateToken().catch(() => null)
+    getInstalledLoadoutFavoriteSkillsStateToken().catch(() => null),
+    resolveOriginClientName()
   ]);
   const installedSkillVersion = findInstalledLoadoutSkillVersionFromInventory(skillInventory);
   const envToken = process.env.AIDENT_TOKEN;
   const configuredBaseUrl = options.baseUrl ?? process.env.AIDENT_BASE_URL?.trim();
   if (envToken) {
     const baseUrl2 = configuredBaseUrl || (await readCredentials())?.base_url || await resolveDefaultBaseUrl();
-    return new CliClient({ base_url: normalizeBaseUrl(baseUrl2), client_id: "", access_token: envToken }, "env", activePackages, installedSkillVersion, skillInventory, favoriteSkillsStateToken);
+    return new CliClient({ base_url: normalizeBaseUrl(baseUrl2), client_id: "", access_token: envToken }, "env", activePackages, installedSkillVersion, skillInventory, favoriteSkillsStateToken, originClientName);
   }
   let credentials = await readCredentials();
   if (!credentials)
@@ -7090,7 +7134,7 @@ async function getAuthenticatedClient(packages, options = {}) {
       credentials = refreshed;
     }
   }
-  return new CliClient(credentials, "stored", activePackages, installedSkillVersion, skillInventory, favoriteSkillsStateToken);
+  return new CliClient(credentials, "stored", activePackages, installedSkillVersion, skillInventory, favoriteSkillsStateToken, originClientName);
 }
 
 // src/dshSchema.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aident-ai/cli",
-  "version": "0.2.1",
+  "version": "0.2.2-rc.ci.32837080953.1",
   "description": "Aident CLI — umbrella access to Loadout integrations, Playbook automation, Intern tools, and the Aident platform.",
   "homepage": "https://aident.ai",
   "repository": {
@@ -37,27 +37,17 @@
       "patch": "./cordis.patch.yml"
     }
   },
-  "scripts": {
-    "build": "bun run scripts/build.ts",
-    "dev": "AIDENT_CLI_VERSION=$npm_package_version bun run src/cli.ts",
-    "test": "bun test --timeout=30000 src/__tests__",
-    "test:e2e": "bun test integration",
-    "typecheck": "tsc --noEmit",
-    "format": "pnpm exec prettier . --write",
-    "lint": "pnpm exec eslint ./src ./integration --cache --cache-location ../../.eslintcache",
-    "prepublishOnly": "pnpm run build"
-  },
   "imports": {
     "~cli/*": "./src/*",
     "~e2e/*": "./integration/*",
     "~shared/*": "../web/shared/*"
   },
   "devDependencies": {
-    "@aident/eslint-config": "workspace:*",
-    "@aident/prettier-config": "workspace:*",
-    "@aident/typescript-config": "workspace:*",
     "@types/node": "^22.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "@aident/eslint-config": "1.0.0",
+    "@aident/typescript-config": "0.0.0",
+    "@aident/prettier-config": "1.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -74,5 +64,15 @@
     "mcp",
     "dsh",
     "deepseek-harness"
-  ]
-}
+  ],
+  "gitHead": "7e52f1de14f9eb62e37d7cde891bffabef8a55d0",
+  "scripts": {
+    "build": "bun run scripts/build.ts",
+    "dev": "AIDENT_CLI_VERSION=$npm_package_version bun run src/cli.ts",
+    "test": "bun test --timeout=30000 src/__tests__",
+    "test:e2e": "bun test integration",
+    "typecheck": "tsc --noEmit",
+    "format": "pnpm exec prettier . --write",
+    "lint": "pnpm exec eslint ./src ./integration --cache --cache-location ../../.eslintcache"
+  }
+}