@uipath/apms-tool 1.199.0-preview.91 → 1.199.0-preview.97

package/dist/index.js

@@ -21247,7 +21247,7 @@ var {
 var package_default = {
   name: "@uipath/apms-tool",
   license: "MIT",
-  version: "1.199.0-preview.91",
+  version: "1.199.0-preview.97",
   description: "CLI plugin for the UiPath Access Policy Management Service.",
   private: false,
   repository: {
@@ -30009,11 +30009,36 @@ class NodeContextStorage {
     return this.storage.getStore();
   }
 }
+// ../../common/src/telemetry/trace-context.ts
+var TELEMETRY_TRACEPARENT_ENV = "TRACEPARENT";
+var TRACEPARENT_PATTERN = /^00-([0-9a-f]{32})-([0-9a-f]{16})-[0-9a-f]{2}$/;
+function getProcessEnv() {
+  return globalThis.process?.env;
+}
+function parseInboundTraceparent(value) {
+  if (!value) {
+    return;
+  }
+  const match = TRACEPARENT_PATTERN.exec(value.trim().toLowerCase());
+  if (!match) {
+    return;
+  }
+  const [, traceId, parentSpanId] = match;
+  if (/^0+$/.test(traceId) || /^0+$/.test(parentSpanId)) {
+    return;
+  }
+  return { traceId, parentSpanId };
+}
+function getInboundTraceContext() {
+  return parseInboundTraceparent(getProcessEnv()?.[TELEMETRY_TRACEPARENT_ENV]);
+}
+
 // ../../common/src/telemetry/session-id.ts
 var TELEMETRY_SESSION_ID_ENV = "UIPATH_SESSION_ID";
 var TELEMETRY_SESSION_ID_PROPERTY = "session_id";
 var telemetrySessionIdSlot = singleton("TelemetrySessionId");
-function getProcessEnv() {
+var telemetryOperationIdSlot = singleton("TelemetryOperationId");
+function getProcessEnv2() {
   return globalThis.process?.env;
 }
 function normalizeSessionId(value) {
@@ -30024,12 +30049,159 @@ function normalizeSessionId(value) {
   return trimmed || undefined;
 }
 function getConfiguredTelemetrySessionId() {
-  return normalizeSessionId(getProcessEnv()?.[TELEMETRY_SESSION_ID_ENV]);
+  return normalizeSessionId(getProcessEnv2()?.[TELEMETRY_SESSION_ID_ENV]);
 }
 function resolveTelemetrySessionId(existingSessionId) {
   return getConfiguredTelemetrySessionId() ?? normalizeSessionId(existingSessionId);
 }
+function getTelemetryOperationId() {
+  const existing = telemetryOperationIdSlot.get();
+  if (existing) {
+    return existing;
+  }
+  const inboundTraceId = getInboundTraceContext()?.traceId;
+  const generated = inboundTraceId ?? crypto.randomUUID().replaceAll("-", "");
+  telemetryOperationIdSlot.set(generated);
+  return generated;
+}
+// ../../common/src/telemetry/pii-redactor.ts
+var REDACTED = "[REDACTED]";
+var MAX_VALUE_LENGTH = 200;
+var SENSITIVE_NAME_TOKENS = new Set([
+  "token",
+  "tokens",
+  "secret",
+  "secrets",
+  "password",
+  "passwords",
+  "pwd",
+  "credential",
+  "credentials",
+  "auth",
+  "authentication",
+  "authorization",
+  "authority",
+  "cert",
+  "certificate",
+  "certificates"
+]);
+var SENSITIVE_KEY_PREFIXES = new Set([
+  "api",
+  "access",
+  "client",
+  "private",
+  "public",
+  "signing",
+  "encryption",
+  "session",
+  "master",
+  "shared",
+  "root",
+  "ssh",
+  "rsa",
+  "aes",
+  "hmac",
+  "oauth"
+]);
+var UUID_PATTERN = /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi;
+var EMAIL_PATTERN = /\b[^\s@]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g;
+var JWT_PATTERN = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
+var LONG_TOKEN_PATTERN = /\b[A-Za-z0-9_-]{40,}\b/g;
+var USER_HOME_PATTERN = /([/\\])(Users|home)([/\\])([^/\\]+)/gi;
+var URL_PATTERN = /\bhttps?:\/\/[^\s,;]+/gi;
+var URL_TRAILING_PUNCT = /[.,;:!?)\]}>'"]+$/;
+function shortHash(input) {
+  let hash = 2166136261;
+  for (let i = 0;i < input.length; i++) {
+    hash ^= input.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return (hash >>> 0).toString(16).padStart(8, "0");
+}
+function redactUrl(raw) {
+  try {
+    const url = new URL(raw);
+    return `${url.protocol}//${url.host}`;
+  } catch {
+    return `url#${shortHash(raw)}`;
+  }
+}
+function redactValueDetectors(value) {
+  let out = value;
+  out = out.replace(JWT_PATTERN, () => REDACTED);
+  out = out.replace(URL_PATTERN, (match) => {
+    const trailing = match.match(URL_TRAILING_PUNCT)?.[0] ?? "";
+    const core2 = trailing ? match.slice(0, -trailing.length) : match;
+    return `${redactUrl(core2)}${trailing}`;
+  });
+  out = out.replace(USER_HOME_PATTERN, (_match, sep1, folder, sep2) => `${sep1}${folder}${sep2}<user>`);
+  out = out.replace(EMAIL_PATTERN, (match) => `email#${shortHash(match)}`);
+  out = out.replace(UUID_PATTERN, (match) => `uuid#${shortHash(match)}`);
+  out = out.replace(LONG_TOKEN_PATTERN, () => REDACTED);
+  if (out.length > MAX_VALUE_LENGTH) {
+    out = `${out.slice(0, MAX_VALUE_LENGTH)}…`;
+  }
+  return out;
+}
+function redactValue(value) {
+  return redactValueDetectors(value);
+}
+function redactError(error) {
+  const safe = new Error(redactValueDetectors(error.message ?? ""));
+  safe.name = error.name;
+  safe.stack = typeof error.stack === "string" ? redactValueDetectors(error.stack) : undefined;
+  return safe;
+}
+function nameTokens(name) {
+  return name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[\s._-]+/).map((t) => t.toLowerCase()).filter(Boolean);
+}
+function isSensitiveName(name) {
+  const tokens = nameTokens(name);
+  for (let i = 0;i < tokens.length; i++) {
+    const token = tokens[i];
+    if (SENSITIVE_NAME_TOKENS.has(token)) {
+      return true;
+    }
+    if (token === "key" || token === "keys") {
+      const prev = tokens[i - 1];
+      if (prev && SENSITIVE_KEY_PREFIXES.has(prev)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function redactProperty(name, value) {
+  if (value === undefined || value === null) {
+    return;
+  }
+  if (isSensitiveName(name)) {
+    return REDACTED;
+  }
+  if (typeof value === "boolean" || typeof value === "number") {
+    return value;
+  }
+  if (typeof value !== "string") {
+    return "[OBJECT]";
+  }
+  return redactValueDetectors(value);
+}
+function redactProperties(properties) {
+  const out = {};
+  for (const [name, value] of Object.entries(properties)) {
+    const redacted = redactProperty(name, value);
+    if (redacted !== undefined) {
+      out[name] = redacted;
+    }
+  }
+  return out;
+}
+
 // ../../common/src/telemetry/telemetry-service.ts
+var TELEMETRY_OPERATION_ID_PROPERTY = "uip.trace.operation_id";
+var TELEMETRY_PARENT_ID_PROPERTY = "uip.trace.parent_id";
+var TELEMETRY_SPAN_ID_PROPERTY = "uip.trace.span_id";
+
 class TelemetryService {
   telemetryProvider;
   contextStorage;
@@ -30056,11 +30228,15 @@ class TelemetryService {
   trackException(error, properties) {
     const context = this.getCurrentContext();
     const enrichedProperties = this.enrichPropertiesWithContext(properties, context);
-    this.telemetryProvider.trackException(error, enrichedProperties);
+    this.telemetryProvider.trackException(redactError(error), enrichedProperties);
   }
   async trackRequest(name, fn, properties) {
+    const parentContext = this.getCurrentContext();
+    const operationId = parentContext?.operationId ?? this.operationId ?? getTelemetryOperationId();
+    const parentId = parentContext ? parentContext.id : this.inboundParentIdFor(operationId);
     const context = {
-      operationId: this.operationId ?? this.generateId(),
+      operationId,
+      ...parentId !== undefined ? { parentId } : {},
       id: this.generateId()
     };
     const startTime = performance.now();
@@ -30078,6 +30254,45 @@ class TelemetryService {
       throw error;
     }
   }
+  trackRequestResult(name, durationMs, success, properties, context) {
+    const requestContext = context ?? {
+      operationId: this.operationId ?? getTelemetryOperationId(),
+      id: this.generateId()
+    };
+    const enrichedProperties = this.enrichPropertiesWithContext(properties, requestContext);
+    this.telemetryProvider.trackRequest(name, durationMs, success, enrichedProperties);
+  }
+  createRequestContext() {
+    const operationId = this.operationId ?? getTelemetryOperationId();
+    const parentId = this.inboundParentIdFor(operationId);
+    return {
+      operationId,
+      ...parentId !== undefined ? { parentId } : {},
+      id: this.generateId()
+    };
+  }
+  inboundParentIdFor(operationId) {
+    const inbound = getInboundTraceContext();
+    return inbound && inbound.traceId === operationId ? inbound.parentSpanId : undefined;
+  }
+  runWithContext(context, fn) {
+    return this.contextStorage.run(context, fn);
+  }
+  createDependencyContext() {
+    const parentContext = this.getCurrentContext();
+    if (!parentContext) {
+      return;
+    }
+    return {
+      operationId: parentContext.operationId,
+      parentId: parentContext.id,
+      id: this.generateId()
+    };
+  }
+  trackDependencyResult(name, type2, durationMs, success, properties, context, resultCode) {
+    const enrichedProperties = this.enrichPropertiesWithContext(properties, context);
+    this.telemetryProvider.trackDependency(redactValue(name), type2, durationMs, success, enrichedProperties, resultCode);
+  }
   async trackDependencyOperation(name, type2, fn, properties) {
     const parentContext = this.getCurrentContext();
     if (!parentContext) {
@@ -30114,8 +30329,12 @@ class TelemetryService {
       ...getExecutionContextTelemetryProperties(),
       ...globalProperties,
       ...this.defaultProperties,
-      ...properties,
-      ...context
+      ...redactProperties(properties ?? {}),
+      ...context ? {
+        [TELEMETRY_OPERATION_ID_PROPERTY]: context.operationId,
+        ...context.parentId !== undefined ? { [TELEMETRY_PARENT_ID_PROPERTY]: context.parentId } : {},
+        [TELEMETRY_SPAN_ID_PROPERTY]: context.id
+      } : {}
     };
     if (sessionId === undefined) {
       delete enriched[TELEMETRY_SESSION_ID_PROPERTY];
@@ -30125,7 +30344,16 @@ class TelemetryService {
     return enriched;
   }
   generateId() {
-    return crypto.randomUUID().replaceAll("-", "");
+    const bytes = new Uint8Array(8);
+    let hex = "";
+    do {
+      crypto.getRandomValues(bytes);
+      hex = "";
+      for (const byte of bytes) {
+        hex += byte.toString(16).padStart(2, "0");
+      }
+    } while (/^0+$/.test(hex));
+    return hex;
   }
 }
 // ../../common/src/telemetry/node-appinsights-telemetry-provider.ts
@@ -30828,134 +31056,11 @@ function buildCommandTelemetryAttribution(commandPath, skillSource) {
   };
 }
 
-// ../../common/src/telemetry/pii-redactor.ts
-var REDACTED = "[REDACTED]";
-var MAX_VALUE_LENGTH = 200;
-var SENSITIVE_NAME_TOKENS = new Set([
-  "token",
-  "tokens",
-  "secret",
-  "secrets",
-  "password",
-  "passwords",
-  "pwd",
-  "credential",
-  "credentials",
-  "auth",
-  "authentication",
-  "authorization",
-  "authority",
-  "cert",
-  "certificate",
-  "certificates"
-]);
-var SENSITIVE_KEY_PREFIXES = new Set([
-  "api",
-  "access",
-  "client",
-  "private",
-  "public",
-  "signing",
-  "encryption",
-  "session",
-  "master",
-  "shared",
-  "root",
-  "ssh",
-  "rsa",
-  "aes",
-  "hmac",
-  "oauth"
-]);
-var UUID_PATTERN = /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi;
-var EMAIL_PATTERN = /\b[^\s@]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g;
-var JWT_PATTERN = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
-var LONG_TOKEN_PATTERN = /\b[A-Za-z0-9_-]{40,}\b/g;
-var USER_HOME_PATTERN = /([/\\])(Users|home)([/\\])([^/\\]+)/gi;
-var URL_PATTERN = /\bhttps?:\/\/[^\s,;]+/gi;
-var URL_TRAILING_PUNCT = /[.,;:!?)\]}>'"]+$/;
-function shortHash(input) {
-  let hash = 2166136261;
-  for (let i = 0;i < input.length; i++) {
-    hash ^= input.charCodeAt(i);
-    hash = Math.imul(hash, 16777619);
-  }
-  return (hash >>> 0).toString(16).padStart(8, "0");
-}
-function redactUrl(raw) {
-  try {
-    const url = new URL(raw);
-    return `${url.protocol}//${url.host}`;
-  } catch {
-    return `url#${shortHash(raw)}`;
-  }
-}
-function redactValueDetectors(value) {
-  let out = value;
-  out = out.replace(JWT_PATTERN, () => REDACTED);
-  out = out.replace(URL_PATTERN, (match) => {
-    const trailing = match.match(URL_TRAILING_PUNCT)?.[0] ?? "";
-    const core2 = trailing ? match.slice(0, -trailing.length) : match;
-    return `${redactUrl(core2)}${trailing}`;
-  });
-  out = out.replace(USER_HOME_PATTERN, (_match, sep1, folder, sep2) => `${sep1}${folder}${sep2}<user>`);
-  out = out.replace(EMAIL_PATTERN, (match) => `email#${shortHash(match)}`);
-  out = out.replace(UUID_PATTERN, (match) => `uuid#${shortHash(match)}`);
-  out = out.replace(LONG_TOKEN_PATTERN, () => REDACTED);
-  if (out.length > MAX_VALUE_LENGTH) {
-    out = `${out.slice(0, MAX_VALUE_LENGTH)}…`;
-  }
-  return out;
-}
-function nameTokens(name) {
-  return name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[\s_-]+/).map((t) => t.toLowerCase()).filter(Boolean);
-}
-function isSensitiveName(name) {
-  const tokens = nameTokens(name);
-  for (let i = 0;i < tokens.length; i++) {
-    const token = tokens[i];
-    if (SENSITIVE_NAME_TOKENS.has(token)) {
-      return true;
-    }
-    if (token === "key" || token === "keys") {
-      const prev = tokens[i - 1];
-      if (prev && SENSITIVE_KEY_PREFIXES.has(prev)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-function redactProperty(name, value) {
-  if (value === undefined || value === null) {
-    return;
-  }
-  if (isSensitiveName(name)) {
-    return REDACTED;
-  }
-  if (typeof value === "boolean" || typeof value === "number") {
-    return value;
-  }
-  if (typeof value !== "string") {
-    return "[OBJECT]";
-  }
-  return redactValueDetectors(value);
-}
-function redactProperties(properties) {
-  const out = {};
-  for (const [name, value] of Object.entries(properties)) {
-    const redacted = redactProperty(name, value);
-    if (redacted !== undefined) {
-      out[name] = redacted;
-    }
-  }
-  return out;
-}
-
 // ../../common/src/trackedAction.ts
 var pollSignalSlot = singleton("PollSignal");
 var cliErrorCodeValues = new Set(CLI_ERROR_CODES);
 var retryHintValues = new Set(RETRY_HINTS);
+var TELEMETRY_COMMAND_ARG_PREFIX = "uip.cmd.arg.";
 var processContext = {
   exit: (code) => {
     process.exitCode = code;
@@ -30966,22 +31071,18 @@ var processContext = {
 };
 function extractCommandParams(cmd) {
   const params = {};
+  const add2 = (name, value) => {
+    if (name && value !== undefined) {
+      params[`${TELEMETRY_COMMAND_ARG_PREFIX}${name}`] = value;
+    }
+  };
   const registered = cmd.registeredArguments ?? [];
   const processed = cmd.processedArgs ?? [];
   for (let i = 0;i < registered.length; i++) {
-    const value = processed[i];
-    if (value === undefined) {
-      continue;
-    }
-    const name = registered[i].name();
-    if (name) {
-      params[name] = value;
-    }
+    add2(registered[i].name(), processed[i]);
   }
   for (const [key, value] of Object.entries(cmd.opts())) {
-    if (value !== undefined) {
-      params[key] = value;
-    }
+    add2(key, value);
   }
   return params;
 }
@@ -31024,11 +31125,12 @@ Command.prototype.trackedAction = function(context, fn, properties) {
   return this.action(async (...args) => {
     const telemetryName = deriveCommandPath(command);
     const props = typeof properties === "function" ? properties(...args) : properties;
+    const requestContext = telemetry.createRequestContext();
     const startTime = performance.now();
     let errorMessage2;
     let fallbackExitCode = EXIT_CODES.Success;
     clearRecordedCommandFailureTelemetry();
-    const [error] = await catchError2(fn(...args));
+    const [error] = await catchError2(telemetry.runWithContext(requestContext, () => fn(...args)));
     if (error) {
       errorMessage2 = error instanceof Error ? error.message : String(error);
       logger.debug(`[trackedAction] ${telemetryName} failed: ${errorMessage2}`);
@@ -31064,16 +31166,21 @@ Command.prototype.trackedAction = function(context, fn, properties) {
       recordedFailure,
       pollSignal: context.pollSignal
     });
-    telemetry.trackEvent(telemetryName, redactProperties({
-      ...extractCommandParams(command),
+    const commandParams = extractCommandParams(command);
+    if (props) {
+      for (const key of Object.keys(props)) {
+        delete commandParams[`${TELEMETRY_COMMAND_ARG_PREFIX}${key}`];
+      }
+    }
+    const baseProperties = redactProperties({
+      ...commandParams,
       ...props,
       ...buildCommandTelemetryAttribution(telemetryName, process.env.UIPATH_SKILL),
       command: "true",
-      duration: String(durationMs),
-      success: String(success),
       ...terminalTelemetry,
       ...errorMessage2 ? { errorMessage: errorMessage2 } : {}
-    }));
+    });
+    telemetry.trackRequestResult(telemetryName, durationMs, success, baseProperties, requestContext);
   });
 };
 // ../../common/src/console-guard.ts
@@ -32288,4 +32395,4 @@ program2.name(metadata.commandPrefix).description(metadata.description).version(
 await registerCommands(program2);
 program2.parse(process.argv);
 
-//# debugId=EFC2EA77C44EDEC564756E2164756E21
+//# debugId=17BD382D326723E264756E2164756E21

package/dist/tool.js

@@ -19137,7 +19137,7 @@ var init_server = __esm(() => {
 var package_default = {
   name: "@uipath/apms-tool",
   license: "MIT",
-  version: "1.199.0-preview.91",
+  version: "1.199.0-preview.97",
   description: "CLI plugin for the UiPath Access Policy Management Service.",
   private: false,
   repository: {
@@ -27900,11 +27900,36 @@ class NodeContextStorage {
     return this.storage.getStore();
   }
 }
+// ../../common/src/telemetry/trace-context.ts
+var TELEMETRY_TRACEPARENT_ENV = "TRACEPARENT";
+var TRACEPARENT_PATTERN = /^00-([0-9a-f]{32})-([0-9a-f]{16})-[0-9a-f]{2}$/;
+function getProcessEnv() {
+  return globalThis.process?.env;
+}
+function parseInboundTraceparent(value) {
+  if (!value) {
+    return;
+  }
+  const match = TRACEPARENT_PATTERN.exec(value.trim().toLowerCase());
+  if (!match) {
+    return;
+  }
+  const [, traceId, parentSpanId] = match;
+  if (/^0+$/.test(traceId) || /^0+$/.test(parentSpanId)) {
+    return;
+  }
+  return { traceId, parentSpanId };
+}
+function getInboundTraceContext() {
+  return parseInboundTraceparent(getProcessEnv()?.[TELEMETRY_TRACEPARENT_ENV]);
+}
+
 // ../../common/src/telemetry/session-id.ts
 var TELEMETRY_SESSION_ID_ENV = "UIPATH_SESSION_ID";
 var TELEMETRY_SESSION_ID_PROPERTY = "session_id";
 var telemetrySessionIdSlot = singleton("TelemetrySessionId");
-function getProcessEnv() {
+var telemetryOperationIdSlot = singleton("TelemetryOperationId");
+function getProcessEnv2() {
   return globalThis.process?.env;
 }
 function normalizeSessionId(value) {
@@ -27915,12 +27940,159 @@ function normalizeSessionId(value) {
   return trimmed || undefined;
 }
 function getConfiguredTelemetrySessionId() {
-  return normalizeSessionId(getProcessEnv()?.[TELEMETRY_SESSION_ID_ENV]);
+  return normalizeSessionId(getProcessEnv2()?.[TELEMETRY_SESSION_ID_ENV]);
 }
 function resolveTelemetrySessionId(existingSessionId) {
   return getConfiguredTelemetrySessionId() ?? normalizeSessionId(existingSessionId);
 }
+function getTelemetryOperationId() {
+  const existing = telemetryOperationIdSlot.get();
+  if (existing) {
+    return existing;
+  }
+  const inboundTraceId = getInboundTraceContext()?.traceId;
+  const generated = inboundTraceId ?? crypto.randomUUID().replaceAll("-", "");
+  telemetryOperationIdSlot.set(generated);
+  return generated;
+}
+// ../../common/src/telemetry/pii-redactor.ts
+var REDACTED = "[REDACTED]";
+var MAX_VALUE_LENGTH = 200;
+var SENSITIVE_NAME_TOKENS = new Set([
+  "token",
+  "tokens",
+  "secret",
+  "secrets",
+  "password",
+  "passwords",
+  "pwd",
+  "credential",
+  "credentials",
+  "auth",
+  "authentication",
+  "authorization",
+  "authority",
+  "cert",
+  "certificate",
+  "certificates"
+]);
+var SENSITIVE_KEY_PREFIXES = new Set([
+  "api",
+  "access",
+  "client",
+  "private",
+  "public",
+  "signing",
+  "encryption",
+  "session",
+  "master",
+  "shared",
+  "root",
+  "ssh",
+  "rsa",
+  "aes",
+  "hmac",
+  "oauth"
+]);
+var UUID_PATTERN = /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi;
+var EMAIL_PATTERN = /\b[^\s@]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g;
+var JWT_PATTERN = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
+var LONG_TOKEN_PATTERN = /\b[A-Za-z0-9_-]{40,}\b/g;
+var USER_HOME_PATTERN = /([/\\])(Users|home)([/\\])([^/\\]+)/gi;
+var URL_PATTERN = /\bhttps?:\/\/[^\s,;]+/gi;
+var URL_TRAILING_PUNCT = /[.,;:!?)\]}>'"]+$/;
+function shortHash(input) {
+  let hash = 2166136261;
+  for (let i = 0;i < input.length; i++) {
+    hash ^= input.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return (hash >>> 0).toString(16).padStart(8, "0");
+}
+function redactUrl(raw) {
+  try {
+    const url = new URL(raw);
+    return `${url.protocol}//${url.host}`;
+  } catch {
+    return `url#${shortHash(raw)}`;
+  }
+}
+function redactValueDetectors(value) {
+  let out = value;
+  out = out.replace(JWT_PATTERN, () => REDACTED);
+  out = out.replace(URL_PATTERN, (match) => {
+    const trailing = match.match(URL_TRAILING_PUNCT)?.[0] ?? "";
+    const core2 = trailing ? match.slice(0, -trailing.length) : match;
+    return `${redactUrl(core2)}${trailing}`;
+  });
+  out = out.replace(USER_HOME_PATTERN, (_match, sep1, folder, sep2) => `${sep1}${folder}${sep2}<user>`);
+  out = out.replace(EMAIL_PATTERN, (match) => `email#${shortHash(match)}`);
+  out = out.replace(UUID_PATTERN, (match) => `uuid#${shortHash(match)}`);
+  out = out.replace(LONG_TOKEN_PATTERN, () => REDACTED);
+  if (out.length > MAX_VALUE_LENGTH) {
+    out = `${out.slice(0, MAX_VALUE_LENGTH)}…`;
+  }
+  return out;
+}
+function redactValue(value) {
+  return redactValueDetectors(value);
+}
+function redactError(error) {
+  const safe = new Error(redactValueDetectors(error.message ?? ""));
+  safe.name = error.name;
+  safe.stack = typeof error.stack === "string" ? redactValueDetectors(error.stack) : undefined;
+  return safe;
+}
+function nameTokens(name) {
+  return name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[\s._-]+/).map((t) => t.toLowerCase()).filter(Boolean);
+}
+function isSensitiveName(name) {
+  const tokens = nameTokens(name);
+  for (let i = 0;i < tokens.length; i++) {
+    const token = tokens[i];
+    if (SENSITIVE_NAME_TOKENS.has(token)) {
+      return true;
+    }
+    if (token === "key" || token === "keys") {
+      const prev = tokens[i - 1];
+      if (prev && SENSITIVE_KEY_PREFIXES.has(prev)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function redactProperty(name, value) {
+  if (value === undefined || value === null) {
+    return;
+  }
+  if (isSensitiveName(name)) {
+    return REDACTED;
+  }
+  if (typeof value === "boolean" || typeof value === "number") {
+    return value;
+  }
+  if (typeof value !== "string") {
+    return "[OBJECT]";
+  }
+  return redactValueDetectors(value);
+}
+function redactProperties(properties) {
+  const out = {};
+  for (const [name, value] of Object.entries(properties)) {
+    const redacted = redactProperty(name, value);
+    if (redacted !== undefined) {
+      out[name] = redacted;
+    }
+  }
+  return out;
+}
+
 // ../../common/src/telemetry/telemetry-service.ts
+var TELEMETRY_OPERATION_ID_PROPERTY = "uip.trace.operation_id";
+var TELEMETRY_PARENT_ID_PROPERTY = "uip.trace.parent_id";
+var TELEMETRY_SPAN_ID_PROPERTY = "uip.trace.span_id";
+
 class TelemetryService {
   telemetryProvider;
   contextStorage;
@@ -27947,11 +28119,15 @@ class TelemetryService {
   trackException(error, properties) {
     const context = this.getCurrentContext();
     const enrichedProperties = this.enrichPropertiesWithContext(properties, context);
-    this.telemetryProvider.trackException(error, enrichedProperties);
+    this.telemetryProvider.trackException(redactError(error), enrichedProperties);
   }
   async trackRequest(name, fn, properties) {
+    const parentContext = this.getCurrentContext();
+    const operationId = parentContext?.operationId ?? this.operationId ?? getTelemetryOperationId();
+    const parentId = parentContext ? parentContext.id : this.inboundParentIdFor(operationId);
     const context = {
-      operationId: this.operationId ?? this.generateId(),
+      operationId,
+      ...parentId !== undefined ? { parentId } : {},
       id: this.generateId()
     };
     const startTime = performance.now();
@@ -27969,6 +28145,45 @@ class TelemetryService {
       throw error;
     }
   }
+  trackRequestResult(name, durationMs, success, properties, context) {
+    const requestContext = context ?? {
+      operationId: this.operationId ?? getTelemetryOperationId(),
+      id: this.generateId()
+    };
+    const enrichedProperties = this.enrichPropertiesWithContext(properties, requestContext);
+    this.telemetryProvider.trackRequest(name, durationMs, success, enrichedProperties);
+  }
+  createRequestContext() {
+    const operationId = this.operationId ?? getTelemetryOperationId();
+    const parentId = this.inboundParentIdFor(operationId);
+    return {
+      operationId,
+      ...parentId !== undefined ? { parentId } : {},
+      id: this.generateId()
+    };
+  }
+  inboundParentIdFor(operationId) {
+    const inbound = getInboundTraceContext();
+    return inbound && inbound.traceId === operationId ? inbound.parentSpanId : undefined;
+  }
+  runWithContext(context, fn) {
+    return this.contextStorage.run(context, fn);
+  }
+  createDependencyContext() {
+    const parentContext = this.getCurrentContext();
+    if (!parentContext) {
+      return;
+    }
+    return {
+      operationId: parentContext.operationId,
+      parentId: parentContext.id,
+      id: this.generateId()
+    };
+  }
+  trackDependencyResult(name, type2, durationMs, success, properties, context, resultCode) {
+    const enrichedProperties = this.enrichPropertiesWithContext(properties, context);
+    this.telemetryProvider.trackDependency(redactValue(name), type2, durationMs, success, enrichedProperties, resultCode);
+  }
   async trackDependencyOperation(name, type2, fn, properties) {
     const parentContext = this.getCurrentContext();
     if (!parentContext) {
@@ -28005,8 +28220,12 @@ class TelemetryService {
       ...getExecutionContextTelemetryProperties(),
       ...globalProperties,
       ...this.defaultProperties,
-      ...properties,
-      ...context
+      ...redactProperties(properties ?? {}),
+      ...context ? {
+        [TELEMETRY_OPERATION_ID_PROPERTY]: context.operationId,
+        ...context.parentId !== undefined ? { [TELEMETRY_PARENT_ID_PROPERTY]: context.parentId } : {},
+        [TELEMETRY_SPAN_ID_PROPERTY]: context.id
+      } : {}
     };
     if (sessionId === undefined) {
       delete enriched[TELEMETRY_SESSION_ID_PROPERTY];
@@ -28016,7 +28235,16 @@ class TelemetryService {
     return enriched;
   }
   generateId() {
-    return crypto.randomUUID().replaceAll("-", "");
+    const bytes = new Uint8Array(8);
+    let hex = "";
+    do {
+      crypto.getRandomValues(bytes);
+      hex = "";
+      for (const byte of bytes) {
+        hex += byte.toString(16).padStart(2, "0");
+      }
+    } while (/^0+$/.test(hex));
+    return hex;
   }
 }
 // ../../common/src/telemetry/node-appinsights-telemetry-provider.ts
@@ -28722,134 +28950,11 @@ function buildCommandTelemetryAttribution(commandPath, skillSource) {
   };
 }
 
-// ../../common/src/telemetry/pii-redactor.ts
-var REDACTED = "[REDACTED]";
-var MAX_VALUE_LENGTH = 200;
-var SENSITIVE_NAME_TOKENS = new Set([
-  "token",
-  "tokens",
-  "secret",
-  "secrets",
-  "password",
-  "passwords",
-  "pwd",
-  "credential",
-  "credentials",
-  "auth",
-  "authentication",
-  "authorization",
-  "authority",
-  "cert",
-  "certificate",
-  "certificates"
-]);
-var SENSITIVE_KEY_PREFIXES = new Set([
-  "api",
-  "access",
-  "client",
-  "private",
-  "public",
-  "signing",
-  "encryption",
-  "session",
-  "master",
-  "shared",
-  "root",
-  "ssh",
-  "rsa",
-  "aes",
-  "hmac",
-  "oauth"
-]);
-var UUID_PATTERN = /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi;
-var EMAIL_PATTERN = /\b[^\s@]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g;
-var JWT_PATTERN = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
-var LONG_TOKEN_PATTERN = /\b[A-Za-z0-9_-]{40,}\b/g;
-var USER_HOME_PATTERN = /([/\\])(Users|home)([/\\])([^/\\]+)/gi;
-var URL_PATTERN = /\bhttps?:\/\/[^\s,;]+/gi;
-var URL_TRAILING_PUNCT = /[.,;:!?)\]}>'"]+$/;
-function shortHash(input) {
-  let hash = 2166136261;
-  for (let i = 0;i < input.length; i++) {
-    hash ^= input.charCodeAt(i);
-    hash = Math.imul(hash, 16777619);
-  }
-  return (hash >>> 0).toString(16).padStart(8, "0");
-}
-function redactUrl(raw) {
-  try {
-    const url = new URL(raw);
-    return `${url.protocol}//${url.host}`;
-  } catch {
-    return `url#${shortHash(raw)}`;
-  }
-}
-function redactValueDetectors(value) {
-  let out = value;
-  out = out.replace(JWT_PATTERN, () => REDACTED);
-  out = out.replace(URL_PATTERN, (match) => {
-    const trailing = match.match(URL_TRAILING_PUNCT)?.[0] ?? "";
-    const core2 = trailing ? match.slice(0, -trailing.length) : match;
-    return `${redactUrl(core2)}${trailing}`;
-  });
-  out = out.replace(USER_HOME_PATTERN, (_match, sep1, folder, sep2) => `${sep1}${folder}${sep2}<user>`);
-  out = out.replace(EMAIL_PATTERN, (match) => `email#${shortHash(match)}`);
-  out = out.replace(UUID_PATTERN, (match) => `uuid#${shortHash(match)}`);
-  out = out.replace(LONG_TOKEN_PATTERN, () => REDACTED);
-  if (out.length > MAX_VALUE_LENGTH) {
-    out = `${out.slice(0, MAX_VALUE_LENGTH)}…`;
-  }
-  return out;
-}
-function nameTokens(name) {
-  return name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[\s_-]+/).map((t) => t.toLowerCase()).filter(Boolean);
-}
-function isSensitiveName(name) {
-  const tokens = nameTokens(name);
-  for (let i = 0;i < tokens.length; i++) {
-    const token = tokens[i];
-    if (SENSITIVE_NAME_TOKENS.has(token)) {
-      return true;
-    }
-    if (token === "key" || token === "keys") {
-      const prev = tokens[i - 1];
-      if (prev && SENSITIVE_KEY_PREFIXES.has(prev)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-function redactProperty(name, value) {
-  if (value === undefined || value === null) {
-    return;
-  }
-  if (isSensitiveName(name)) {
-    return REDACTED;
-  }
-  if (typeof value === "boolean" || typeof value === "number") {
-    return value;
-  }
-  if (typeof value !== "string") {
-    return "[OBJECT]";
-  }
-  return redactValueDetectors(value);
-}
-function redactProperties(properties) {
-  const out = {};
-  for (const [name, value] of Object.entries(properties)) {
-    const redacted = redactProperty(name, value);
-    if (redacted !== undefined) {
-      out[name] = redacted;
-    }
-  }
-  return out;
-}
-
 // ../../common/src/trackedAction.ts
 var pollSignalSlot = singleton("PollSignal");
 var cliErrorCodeValues = new Set(CLI_ERROR_CODES);
 var retryHintValues = new Set(RETRY_HINTS);
+var TELEMETRY_COMMAND_ARG_PREFIX = "uip.cmd.arg.";
 var processContext = {
   exit: (code) => {
     process.exitCode = code;
@@ -28860,22 +28965,18 @@ var processContext = {
 };
 function extractCommandParams(cmd) {
   const params = {};
+  const add2 = (name, value) => {
+    if (name && value !== undefined) {
+      params[`${TELEMETRY_COMMAND_ARG_PREFIX}${name}`] = value;
+    }
+  };
   const registered = cmd.registeredArguments ?? [];
   const processed = cmd.processedArgs ?? [];
   for (let i = 0;i < registered.length; i++) {
-    const value = processed[i];
-    if (value === undefined) {
-      continue;
-    }
-    const name = registered[i].name();
-    if (name) {
-      params[name] = value;
-    }
+    add2(registered[i].name(), processed[i]);
   }
   for (const [key, value] of Object.entries(cmd.opts())) {
-    if (value !== undefined) {
-      params[key] = value;
-    }
+    add2(key, value);
   }
   return params;
 }
@@ -28918,11 +29019,12 @@ Command2.prototype.trackedAction = function(context, fn, properties) {
   return this.action(async (...args) => {
     const telemetryName = deriveCommandPath(command);
     const props = typeof properties === "function" ? properties(...args) : properties;
+    const requestContext = telemetry.createRequestContext();
     const startTime = performance.now();
     let errorMessage2;
     let fallbackExitCode = EXIT_CODES.Success;
     clearRecordedCommandFailureTelemetry();
-    const [error] = await catchError2(fn(...args));
+    const [error] = await catchError2(telemetry.runWithContext(requestContext, () => fn(...args)));
     if (error) {
       errorMessage2 = error instanceof Error ? error.message : String(error);
       logger.debug(`[trackedAction] ${telemetryName} failed: ${errorMessage2}`);
@@ -28958,16 +29060,21 @@ Command2.prototype.trackedAction = function(context, fn, properties) {
       recordedFailure,
       pollSignal: context.pollSignal
     });
-    telemetry.trackEvent(telemetryName, redactProperties({
-      ...extractCommandParams(command),
+    const commandParams = extractCommandParams(command);
+    if (props) {
+      for (const key of Object.keys(props)) {
+        delete commandParams[`${TELEMETRY_COMMAND_ARG_PREFIX}${key}`];
+      }
+    }
+    const baseProperties = redactProperties({
+      ...commandParams,
       ...props,
       ...buildCommandTelemetryAttribution(telemetryName, process.env.UIPATH_SKILL),
       command: "true",
-      duration: String(durationMs),
-      success: String(success),
       ...terminalTelemetry,
       ...errorMessage2 ? { errorMessage: errorMessage2 } : {}
-    }));
+    });
+    telemetry.trackRequestResult(telemetryName, durationMs, success, baseProperties, requestContext);
   });
 };
 // ../../common/src/console-guard.ts
@@ -30185,4 +30292,4 @@ export {
   metadata
 };
 
-//# debugId=F40F8DAD89C81AF364756E2164756E21
+//# debugId=A6EBF7BECA3718DE64756E2164756E21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uipath/apms-tool",
   "license": "MIT",
-  "version": "1.199.0-preview.91",
+  "version": "1.199.0-preview.97",
   "description": "CLI plugin for the UiPath Access Policy Management Service.",
   "private": false,
   "repository": {
@@ -26,5 +26,5 @@
   "files": [
     "dist"
   ],
-  "gitHead": "f428cb1e61ba89ad18394b0c6106784055699f02"
+  "gitHead": "087ae21e842f27bde5eb0013892c9487bfe60568"
 }