@dexto/image-logger-agent 1.6.1 → 1.6.3

package/dist/index.cjs

@@ -31,13 +31,62 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
+var import_agent_management = require("@dexto/agent-management");
 var import_image_local = __toESM(require("@dexto/image-local"), 1);
 var import_zod = require("zod");
-var import_node_module = require("node:module");
+var import_node_fs = require("node:fs");
+var import_node_path = __toESM(require("node:path"), 1);
+var import_node_url = require("node:url");
 var import_request_logger = require("./hooks/request-logger.js");
 const import_meta = {};
-const require2 = (0, import_node_module.createRequire)(import_meta.url);
-const packageJson = require2("../package.json");
+function readPackageJson(packageJsonPath) {
+  if (!(0, import_node_fs.existsSync)(packageJsonPath)) {
+    return null;
+  }
+  try {
+    return JSON.parse((0, import_node_fs.readFileSync)(packageJsonPath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function resolveModuleDir() {
+  const importMetaUrl = typeof import_meta !== "undefined" ? import_meta.url : void 0;
+  if (importMetaUrl) {
+    return import_node_path.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl));
+  }
+  const filenameFromGlobal = globalThis.__filename;
+  if (typeof filenameFromGlobal === "string" && filenameFromGlobal.length > 0) {
+    return import_node_path.default.dirname(filenameFromGlobal);
+  }
+  return void 0;
+}
+function resolveImageMetadata(defaultName) {
+  const moduleDir = resolveModuleDir();
+  if (moduleDir) {
+    const localPackageJson = readPackageJson(import_node_path.default.resolve(moduleDir, "..", "package.json"));
+    if (localPackageJson) {
+      return {
+        name: localPackageJson.name ?? defaultName,
+        version: localPackageJson.version ?? "0.0.0"
+      };
+    }
+  }
+  const packageRoot = (0, import_agent_management.getDextoPackageRoot)();
+  if (packageRoot) {
+    const bundledPackageJson = readPackageJson(import_node_path.default.join(packageRoot, "package.json"));
+    if (bundledPackageJson) {
+      return {
+        name: defaultName,
+        version: bundledPackageJson.version ?? "0.0.0"
+      };
+    }
+  }
+  return {
+    name: defaultName,
+    version: process.env.DEXTO_CLI_VERSION || "0.0.0"
+  };
+}
+const imageMetadata = resolveImageMetadata("@dexto/image-logger-agent");
 const requestLoggerConfigSchema = import_zod.z.object({
   type: import_zod.z.literal("request-logger"),
   logDir: import_zod.z.string().optional(),
@@ -50,8 +99,8 @@ const requestLoggerFactory = {
 const imageLoggerAgent = {
   ...import_image_local.default,
   metadata: {
-    name: packageJson.name ?? "@dexto/image-logger-agent",
-    version: packageJson.version ?? "0.0.0",
+    name: imageMetadata.name,
+    version: imageMetadata.version,
     description: "Example image for the Logger Agent (adds request-logger hook which logs requests)",
     target: "local-development",
     constraints: ["filesystem-required"]

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,qBAAqB,CAAC;AAsBnE,QAAA,MAAM,gBAAgB,EAAE,UAcvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,qBAAqB,CAAC;AAkFnE,QAAA,MAAM,gBAAgB,EAAE,UAcvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/index.js

@@ -1,9 +1,58 @@
+import { getDextoPackageRoot } from "@dexto/agent-management";
 import imageLocal from "@dexto/image-local";
 import { z } from "zod";
-import { createRequire } from "node:module";
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { RequestLoggerHook } from "./hooks/request-logger.js";
-const require2 = createRequire(import.meta.url);
-const packageJson = require2("../package.json");
+function readPackageJson(packageJsonPath) {
+  if (!existsSync(packageJsonPath)) {
+    return null;
+  }
+  try {
+    return JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function resolveModuleDir() {
+  const importMetaUrl = typeof import.meta !== "undefined" ? import.meta.url : void 0;
+  if (importMetaUrl) {
+    return path.dirname(fileURLToPath(importMetaUrl));
+  }
+  const filenameFromGlobal = globalThis.__filename;
+  if (typeof filenameFromGlobal === "string" && filenameFromGlobal.length > 0) {
+    return path.dirname(filenameFromGlobal);
+  }
+  return void 0;
+}
+function resolveImageMetadata(defaultName) {
+  const moduleDir = resolveModuleDir();
+  if (moduleDir) {
+    const localPackageJson = readPackageJson(path.resolve(moduleDir, "..", "package.json"));
+    if (localPackageJson) {
+      return {
+        name: localPackageJson.name ?? defaultName,
+        version: localPackageJson.version ?? "0.0.0"
+      };
+    }
+  }
+  const packageRoot = getDextoPackageRoot();
+  if (packageRoot) {
+    const bundledPackageJson = readPackageJson(path.join(packageRoot, "package.json"));
+    if (bundledPackageJson) {
+      return {
+        name: defaultName,
+        version: bundledPackageJson.version ?? "0.0.0"
+      };
+    }
+  }
+  return {
+    name: defaultName,
+    version: process.env.DEXTO_CLI_VERSION || "0.0.0"
+  };
+}
+const imageMetadata = resolveImageMetadata("@dexto/image-logger-agent");
 const requestLoggerConfigSchema = z.object({
   type: z.literal("request-logger"),
   logDir: z.string().optional(),
@@ -16,8 +65,8 @@ const requestLoggerFactory = {
 const imageLoggerAgent = {
   ...imageLocal,
   metadata: {
-    name: packageJson.name ?? "@dexto/image-logger-agent",
-    version: packageJson.version ?? "0.0.0",
+    name: imageMetadata.name,
+    version: imageMetadata.version,
     description: "Example image for the Logger Agent (adds request-logger hook which logs requests)",
     target: "local-development",
     constraints: ["filesystem-required"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/image-logger-agent",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Example image for the Logger Agent (adds request-logger hook)",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,9 +20,10 @@
   ],
   "dependencies": {
     "zod": "^3.25.0",
-    "@dexto/agent-config": "1.6.1",
-    "@dexto/core": "1.6.1",
-    "@dexto/image-local": "1.6.1"
+    "@dexto/agent-config": "1.6.3",
+    "@dexto/agent-management": "1.6.3",
+    "@dexto/core": "1.6.3",
+    "@dexto/image-local": "1.6.3"
   },
   "devDependencies": {
     "tsup": "^8.0.0",