@hasna/domains 0.0.4 → 0.0.6

package/dist/cli/index.js

@@ -3196,7 +3196,7 @@ var require_headStream = __commonJS((exports) => {
     if ((0, stream_type_check_1.isReadableStream)(stream)) {
       return (0, headStream_browser_1.headStream)(stream, bytes);
     }
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const collector = new Collector;
       collector.limit = bytes;
       stream.pipe(collector);
@@ -3207,7 +3207,7 @@ var require_headStream = __commonJS((exports) => {
       collector.on("error", reject);
       collector.on("finish", function() {
         const bytes2 = new Uint8Array(Buffer.concat(this.buffers));
-        resolve2(bytes2);
+        resolve3(bytes2);
       });
     });
   };
@@ -3403,21 +3403,21 @@ var require_dist_cjs13 = __commonJS((exports) => {
     let sendBody = true;
     if (!externalAgent && expect === "100-continue") {
       sendBody = await Promise.race([
-        new Promise((resolve2) => {
-          timeoutId = Number(timing.setTimeout(() => resolve2(true), Math.max(MIN_WAIT_TIME, maxContinueTimeoutMs)));
+        new Promise((resolve3) => {
+          timeoutId = Number(timing.setTimeout(() => resolve3(true), Math.max(MIN_WAIT_TIME, maxContinueTimeoutMs)));
         }),
-        new Promise((resolve2) => {
+        new Promise((resolve3) => {
           httpRequest.on("continue", () => {
             timing.clearTimeout(timeoutId);
-            resolve2(true);
+            resolve3(true);
           });
           httpRequest.on("response", () => {
             timing.clearTimeout(timeoutId);
-            resolve2(false);
+            resolve3(false);
           });
           httpRequest.on("error", () => {
             timing.clearTimeout(timeoutId);
-            resolve2(false);
+            resolve3(false);
           });
         })
       ]);
@@ -3492,13 +3492,13 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
       return socketWarningTimestamp;
     }
     constructor(options) {
-      this.configProvider = new Promise((resolve2, reject) => {
+      this.configProvider = new Promise((resolve3, reject) => {
         if (typeof options === "function") {
           options().then((_options) => {
-            resolve2(this.resolveDefaultConfig(_options));
+            resolve3(this.resolveDefaultConfig(_options));
           }).catch(reject);
         } else {
-          resolve2(this.resolveDefaultConfig(options));
+          resolve3(this.resolveDefaultConfig(options));
         }
       });
     }
@@ -3518,7 +3518,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
       return new Promise((_resolve, _reject) => {
         let writeRequestBodyPromise = undefined;
         const timeouts = [];
-        const resolve2 = async (arg) => {
+        const resolve3 = async (arg) => {
           await writeRequestBodyPromise;
           timeouts.forEach(timing.clearTimeout);
           _resolve(arg);
@@ -3582,7 +3582,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
             headers: getTransformedHeaders(res.headers),
             body: res
           });
-          resolve2({ response: httpResponse });
+          resolve3({ response: httpResponse });
         });
         req.on("error", (err) => {
           if (NODEJS_TIMEOUT_ERROR_CODES.includes(err.code)) {
@@ -3794,13 +3794,13 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
       return new NodeHttp2Handler(instanceOrOptions);
     }
     constructor(options) {
-      this.configProvider = new Promise((resolve2, reject) => {
+      this.configProvider = new Promise((resolve3, reject) => {
         if (typeof options === "function") {
           options().then((opts) => {
-            resolve2(opts || {});
+            resolve3(opts || {});
           }).catch(reject);
         } else {
-          resolve2(options || {});
+          resolve3(options || {});
         }
       });
     }
@@ -3820,7 +3820,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
       return new Promise((_resolve, _reject) => {
         let fulfilled = false;
         let writeRequestBodyPromise = undefined;
-        const resolve2 = async (arg) => {
+        const resolve3 = async (arg) => {
           await writeRequestBodyPromise;
           _resolve(arg);
         };
@@ -3875,7 +3875,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
             body: req
           });
           fulfilled = true;
-          resolve2({ response: httpResponse });
+          resolve3({ response: httpResponse });
           if (disableConcurrentStreams) {
             session.close();
             this.connectionManager.deleteSession(authority, session);
@@ -3952,7 +3952,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
     if (isReadableStreamInstance(stream)) {
       return collectReadableStream(stream);
     }
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const collector = new Collector;
       stream.pipe(collector);
       stream.on("error", (err) => {
@@ -3962,7 +3962,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
       collector.on("error", reject);
       collector.on("finish", function() {
         const bytes = new Uint8Array(Buffer.concat(this.bufferedBytes));
-        resolve2(bytes);
+        resolve3(bytes);
       });
     });
   };
@@ -4003,7 +4003,7 @@ var require_dist_cjs14 = __commonJS((exports) => {
     return new Request(url, requestOptions);
   }
   function requestTimeout(timeoutInMs = 0) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       if (timeoutInMs) {
         setTimeout(() => {
           const timeoutError = new Error(`Request did not complete within ${timeoutInMs} ms`);
@@ -4119,7 +4119,7 @@ var require_dist_cjs14 = __commonJS((exports) => {
         requestTimeout(requestTimeoutInMs)
       ];
       if (abortSignal) {
-        raceOfPromises.push(new Promise((resolve2, reject) => {
+        raceOfPromises.push(new Promise((resolve3, reject) => {
           const onAbort = () => {
             const abortError = buildAbortError(abortSignal);
             reject(abortError);
@@ -4199,7 +4199,7 @@ var require_dist_cjs14 = __commonJS((exports) => {
     return collected;
   }
   function readToBase64(blob) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const reader = new FileReader;
       reader.onloadend = () => {
         if (reader.readyState !== 2) {
@@ -4208,7 +4208,7 @@ var require_dist_cjs14 = __commonJS((exports) => {
         const result = reader.result ?? "";
         const commaIndex = result.indexOf(",");
         const dataOffset = commaIndex > -1 ? commaIndex + 1 : result.length;
-        resolve2(result.substring(dataOffset));
+        resolve3(result.substring(dataOffset));
       };
       reader.onabort = () => reject(new Error("Read aborted"));
       reader.onerror = () => reject(reader.error);
@@ -5415,11 +5415,11 @@ var require_tslib = __commonJS((exports, module) => {
     };
     __awaiter = function(thisArg, _arguments, P, generator) {
       function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve2) {
-          resolve2(value);
+        return value instanceof P ? value : new P(function(resolve3) {
+          resolve3(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve2, reject) {
+      return new (P || (P = Promise))(function(resolve3, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -5435,7 +5435,7 @@ var require_tslib = __commonJS((exports, module) => {
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -5664,14 +5664,14 @@ var require_tslib = __commonJS((exports, module) => {
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve2, reject) {
-            v = o[n](v), settle(resolve2, reject, v.done, v.value);
+          return new Promise(function(resolve3, reject) {
+            v = o[n](v), settle(resolve3, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve2, reject, d, v) {
+      function settle(resolve3, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve2({ value: v2, done: d });
+          resolve3({ value: v2, done: d });
         }, reject);
       }
     };
@@ -15357,7 +15357,7 @@ var require_dist_cjs31 = __commonJS((exports) => {
       this.refillTokenBucket();
       if (amount > this.currentCapacity) {
         const delay = (amount - this.currentCapacity) / this.fillRate * 1000;
-        await new Promise((resolve2) => DefaultRateLimiter.setTimeoutFn(resolve2, delay));
+        await new Promise((resolve3) => DefaultRateLimiter.setTimeoutFn(resolve3, delay));
       }
       this.currentCapacity = this.currentCapacity - amount;
     }
@@ -15651,7 +15651,7 @@ var require_dist_cjs32 = __commonJS((exports) => {
       }
     }
   }
-  var USER_AGENT = "user-agent";
+  var USER_AGENT2 = "user-agent";
   var X_AMZ_USER_AGENT = "x-amz-user-agent";
   var SPACE = " ";
   var UA_NAME_SEPARATOR = "/";
@@ -15699,9 +15699,9 @@ var require_dist_cjs32 = __commonJS((exports) => {
     ].join(SPACE);
     if (options.runtime !== "browser") {
       if (normalUAValue) {
-        headers[X_AMZ_USER_AGENT] = headers[X_AMZ_USER_AGENT] ? `${headers[USER_AGENT]} ${normalUAValue}` : normalUAValue;
+        headers[X_AMZ_USER_AGENT] = headers[X_AMZ_USER_AGENT] ? `${headers[USER_AGENT2]} ${normalUAValue}` : normalUAValue;
       }
-      headers[USER_AGENT] = sdkUserAgentValue;
+      headers[USER_AGENT2] = sdkUserAgentValue;
     } else {
       headers[X_AMZ_USER_AGENT] = sdkUserAgentValue;
     }
@@ -16803,7 +16803,7 @@ var require_dist_cjs40 = __commonJS((exports) => {
             const delayFromResponse = getDelayFromRetryAfterHeader(err.$response);
             const delay = Math.max(delayFromResponse || 0, delayFromDecider);
             totalDelay += delay;
-            await new Promise((resolve2) => setTimeout(resolve2, delay));
+            await new Promise((resolve3) => setTimeout(resolve3, delay));
             continue;
           }
           if (!err.$metadata) {
@@ -16955,7 +16955,7 @@ var require_dist_cjs40 = __commonJS((exports) => {
           attempts = retryToken.getRetryCount();
           const delay = retryToken.getRetryDelay();
           totalRetryDelay += delay;
-          await new Promise((resolve2) => setTimeout(resolve2, delay));
+          await new Promise((resolve3) => setTimeout(resolve3, delay));
         }
       }
     } else {
@@ -17078,7 +17078,7 @@ var init_dist_es = __esm(() => {
 import { Buffer as Buffer2 } from "buffer";
 import { request } from "http";
 function httpRequest(options) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const req = request({
       method: "GET",
       ...options,
@@ -17103,7 +17103,7 @@ function httpRequest(options) {
         chunks.push(chunk);
       });
       res.on("end", () => {
-        resolve2(Buffer2.concat(chunks));
+        resolve3(Buffer2.concat(chunks));
         req.destroy();
       });
     });
@@ -17564,7 +17564,7 @@ var retryWrapper = (toRetry, maxRetries, delayMs) => {
       try {
         return await toRetry();
       } catch (e) {
-        await new Promise((resolve2) => setTimeout(resolve2, delayMs));
+        await new Promise((resolve3) => setTimeout(resolve3, delayMs));
       }
     }
     return await toRetry();
@@ -17874,12 +17874,12 @@ var require_dist_cjs41 = __commonJS((exports) => {
     }
     return ["md/nodejs", node_process.versions.node];
   };
-  var getNodeModulesParentDirs = (dirname3) => {
+  var getNodeModulesParentDirs = (dirname4) => {
     const cwd = process.cwd();
-    if (!dirname3) {
+    if (!dirname4) {
       return [cwd];
     }
-    const normalizedPath = node_path.normalize(dirname3);
+    const normalizedPath = node_path.normalize(dirname4);
     const parts = normalizedPath.split(node_path.sep);
     const nodeModulesIndex = parts.indexOf("node_modules");
     const parentDir = nodeModulesIndex !== -1 ? parts.slice(0, nodeModulesIndex).join(node_path.sep) : normalizedPath;
@@ -17926,8 +17926,8 @@ var require_dist_cjs41 = __commonJS((exports) => {
       tscVersion = null;
       return;
     }
-    const dirname3 = typeof __dirname !== "undefined" ? __dirname : undefined;
-    const nodeModulesParentDirs = getNodeModulesParentDirs(dirname3);
+    const dirname4 = typeof __dirname !== "undefined" ? __dirname : undefined;
+    const nodeModulesParentDirs = getNodeModulesParentDirs(dirname4);
     let versionFromApp;
     for (const nodeModulesParentDir of nodeModulesParentDirs) {
       try {
@@ -23670,7 +23670,7 @@ var require_signin = __commonJS((exports) => {
 import { createHash, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs2 } from "fs";
 import { homedir as homedir6 } from "os";
-import { dirname as dirname3, join as join7 } from "path";
+import { dirname as dirname4, join as join7 } from "path";
 var import_property_provider18, import_protocol_http2, import_shared_ini_file_loader6, LoginCredentialsFetcher;
 var init_LoginCredentialsFetcher = __esm(() => {
   import_property_provider18 = __toESM(require_dist_cjs23(), 1);
@@ -23823,7 +23823,7 @@ var init_LoginCredentialsFetcher = __esm(() => {
     }
     async saveToken(token) {
       const tokenFilePath = this.getTokenFilePath();
-      const directory = dirname3(tokenFilePath);
+      const directory = dirname4(tokenFilePath);
       try {
         await fs2.mkdir(directory, { recursive: true });
       } catch (error) {}
@@ -24139,7 +24139,7 @@ var fromWebToken = (init) => async (awsIdentityProperties) => {
 };
 
 // node_modules/@aws-sdk/credential-provider-web-identity/dist-es/fromTokenFile.js
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 var import_client12, import_property_provider21, import_shared_ini_file_loader10, ENV_TOKEN_FILE = "AWS_WEB_IDENTITY_TOKEN_FILE", ENV_ROLE_ARN = "AWS_ROLE_ARN", ENV_ROLE_SESSION_NAME = "AWS_ROLE_SESSION_NAME", fromTokenFile = (init = {}) => async (awsIdentityProperties) => {
   init.logger?.debug("@aws-sdk/credential-provider-web-identity - fromTokenFile");
   const webIdentityTokenFile = init?.webIdentityTokenFile ?? process.env[ENV_TOKEN_FILE];
@@ -24152,7 +24152,7 @@ var import_client12, import_property_provider21, import_shared_ini_file_loader10
   }
   const credentials = await fromWebToken({
     ...init,
-    webIdentityToken: import_shared_ini_file_loader10.externalDataInterceptor?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync2(webIdentityTokenFile, { encoding: "ascii" }),
+    webIdentityToken: import_shared_ini_file_loader10.externalDataInterceptor?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync3(webIdentityTokenFile, { encoding: "ascii" }),
     roleArn,
     roleSessionName
   })(awsIdentityProperties);
@@ -33944,11 +33944,14 @@ function listDomains(options = {}) {
     sql += " WHERE " + conditions.join(" AND ");
   }
   sql += " ORDER BY name";
-  if (options.limit) {
+  if (options.limit !== undefined) {
     sql += " LIMIT ?";
     params.push(options.limit);
   }
-  if (options.offset) {
+  if (options.offset !== undefined && options.offset > 0) {
+    if (options.limit === undefined) {
+      sql += " LIMIT -1";
+    }
     sql += " OFFSET ?";
     params.push(options.offset);
   }
@@ -34175,6 +34178,28 @@ function deleteAlert(id) {
 }
 // src/db/dns-tools.ts
 import { execSync } from "child_process";
+
+// src/lib/version.ts
+import { readFileSync as readFileSync2 } from "fs";
+import { dirname as dirname3, resolve as resolve2 } from "path";
+import { fileURLToPath } from "url";
+var cachedVersion = null;
+function getPackageVersion() {
+  if (cachedVersion)
+    return cachedVersion;
+  try {
+    const moduleDir = dirname3(fileURLToPath(import.meta.url));
+    const packageJsonPath = resolve2(moduleDir, "../../package.json");
+    const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+    cachedVersion = pkg.version ?? "0.0.0";
+  } catch {
+    cachedVersion = "0.0.0";
+  }
+  return cachedVersion;
+}
+var USER_AGENT = `open-domains/${getPackageVersion()}`;
+
+// src/db/dns-tools.ts
 function whoisLookup(domainName) {
   let raw;
   try {
@@ -34388,7 +34413,7 @@ async function discoverSubdomains(domain) {
     const url = `https://crt.sh/?q=%25.${encodeURIComponent(domain)}&output=json`;
     const response = await fetch(url, {
       signal: AbortSignal.timeout(15000),
-      headers: { "User-Agent": "open-domains/0.0.1" }
+      headers: { "User-Agent": USER_AGENT }
     });
     if (!response.ok) {
       return {
@@ -41824,7 +41849,7 @@ async function apiRequest3(method, path, apiKey, body, baseUrl = BRANDSIGHT_BASE
     Authorization: `Bearer ${apiKey}`,
     "Content-Type": "application/json",
     Accept: "application/json",
-    "User-Agent": "open-domains/0.0.3"
+    "User-Agent": USER_AGENT
   };
   try {
     const response = await fetchFn(url, {
@@ -41851,7 +41876,7 @@ async function apiGet(path, apiKey, baseUrl = BRANDSIGHT_BASE) {
     Authorization: `Bearer ${apiKey}`,
     "Content-Type": "application/json",
     Accept: "application/json",
-    "User-Agent": "open-domains/0.0.3"
+    "User-Agent": USER_AGENT
   };
   try {
     const response = await fetchFn(url, {
@@ -42269,7 +42294,7 @@ function autoDetectRegistrar(domain, getDomainByName2) {
 }
 
 // src/lib/config.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join8 } from "path";
 function configPath() {
@@ -42280,7 +42305,7 @@ function loadConfig3() {
   if (!existsSync6(path))
     return {};
   try {
-    return JSON.parse(readFileSync3(path, "utf-8"));
+    return JSON.parse(readFileSync4(path, "utf-8"));
   } catch {
     return {};
   }
@@ -42331,10 +42356,25 @@ function resolveContact(opts) {
 // src/cli/commands/domain.ts
 function registerDomainCommand(program2) {
   const domain = program2.command("domain").description("Domain portfolio management");
-  domain.command("list").description("List all domains in the portfolio").option("--status <status>", "Filter by status (active/expired/transferring/redemption)").option("--registrar <name>", "Filter by registrar").option("--json", "Output JSON").action((opts) => {
-    const domains = listDomains({ status: opts.status, registrar: opts.registrar });
+  domain.command("list").description("List all domains in the portfolio").option("--status <status>", "Filter by status (active/expired/transferring/redemption)").option("--registrar <name>", "Filter by registrar").option("--limit <n>", "Limit number of returned domains").option("--offset <n>", "Skip first N domains", "0").option("-j, --json", "Output JSON").action((opts) => {
+    const limit = opts.limit ? parseInt(opts.limit, 10) : undefined;
+    const offset = opts.offset ? parseInt(opts.offset, 10) : 0;
+    if (limit !== undefined && (!Number.isInteger(limit) || limit < 0)) {
+      console.error("--limit must be a non-negative integer");
+      process.exit(1);
+    }
+    if (!Number.isInteger(offset) || offset < 0) {
+      console.error("--offset must be a non-negative integer");
+      process.exit(1);
+    }
+    const domains = listDomains({
+      status: opts.status,
+      registrar: opts.registrar,
+      limit,
+      offset
+    });
     if (opts.json) {
-      console.log(JSON.stringify({ domains, count: domains.length }, null, 2));
+      console.log(JSON.stringify({ domains, count: domains.length, limit: limit ?? null, offset }, null, 2));
       return;
     }
     if (domains.length === 0) {
@@ -42347,8 +42387,11 @@ function registerDomainCommand(program2) {
     }
     console.log(`
 ${domains.length} domain(s)`);
+    if (limit !== undefined || offset > 0) {
+      console.log(`Page: limit=${limit ?? "all"}, offset=${offset}`);
+    }
   });
-  domain.command("get <id>").description("Get a domain by ID").option("--json", "Output JSON").action((id, opts) => {
+  domain.command("get <id>").description("Get a domain by ID").option("-j, --json", "Output JSON").action((id, opts) => {
     const d3 = getDomain(id);
     if (!d3) {
       console.error(`Domain '${id}' not found.`);
@@ -42369,7 +42412,7 @@ ${d3.name} [${d3.status}]`);
       console.log(`  Notes:      ${d3.notes}`);
     console.log();
   });
-  domain.command("add").description("Add a domain to the portfolio").requiredOption("--name <name>", "Domain name").option("--registrar <name>", "Registrar name").option("--status <s>", "Status (active/expired/transferring/redemption)", "active").option("--expires <date>", "Expiry date (YYYY-MM-DD)").option("--notes <text>", "Notes").option("--json", "Output JSON").action((opts) => {
+  domain.command("add").description("Add a domain to the portfolio").requiredOption("--name <name>", "Domain name").option("--registrar <name>", "Registrar name").option("--status <s>", "Status (active/expired/transferring/redemption)", "active").option("--expires <date>", "Expiry date (YYYY-MM-DD)").option("--notes <text>", "Notes").option("-j, --json", "Output JSON").action((opts) => {
     const d3 = createDomain({
       name: opts.name,
       registrar: opts.registrar,
@@ -42383,7 +42426,7 @@ ${d3.name} [${d3.status}]`);
     }
     console.log(`Created domain: ${d3.name} (${d3.id})`);
   });
-  domain.command("update <id>").description("Update a domain").option("--registrar <name>", "Registrar").option("--status <s>", "Status").option("--expires <date>", "Expiry date").option("--notes <text>", "Notes").option("--json", "Output JSON").action((id, opts) => {
+  domain.command("update <id>").description("Update a domain").option("--registrar <name>", "Registrar").option("--status <s>", "Status").option("--expires <date>", "Expiry date").option("--notes <text>", "Notes").option("-j, --json", "Output JSON").action((id, opts) => {
     const d3 = updateDomain(id, {
       registrar: opts.registrar,
       status: opts.status,
@@ -42400,16 +42443,34 @@ ${d3.name} [${d3.status}]`);
     }
     console.log(`Updated: ${d3.name}`);
   });
-  domain.command("delete <id>").description("Delete a domain from the portfolio").action((id) => {
+  domain.command("delete <id>").description("Delete a domain from the portfolio").option("-f, --force", "Required confirmation for destructive delete").option("-j, --json", "Output JSON").action((id, opts) => {
+    if (!opts.force) {
+      const message = `Refusing to delete domain '${id}' without --force.`;
+      if (opts.json) {
+        console.log(JSON.stringify({ deleted: false, id, error: message }, null, 2));
+      } else {
+        console.error(message);
+        console.error("Re-run with --force to confirm deletion.");
+      }
+      process.exit(1);
+    }
     const deleted = deleteDomain(id);
-    if (deleted)
-      console.log(`Deleted domain ${id}`);
-    else {
-      console.error(`Domain '${id}' not found.`);
+    if (!deleted) {
+      const message = `Domain '${id}' not found.`;
+      if (opts.json) {
+        console.log(JSON.stringify({ deleted: false, id, error: message }, null, 2));
+      } else {
+        console.error(message);
+      }
       process.exit(1);
     }
+    if (opts.json) {
+      console.log(JSON.stringify({ deleted: true, id }, null, 2));
+      return;
+    }
+    console.log(`Deleted domain ${id}`);
   });
-  domain.command("search <query>").description("Search domains by name, registrar, or notes").option("--json", "Output JSON").action((query, opts) => {
+  domain.command("search <query>").description("Search domains by name, registrar, or notes").option("-j, --json", "Output JSON").action((query, opts) => {
     const results = searchDomains(query);
     if (opts.json) {
       console.log(JSON.stringify({ results, count: results.length }, null, 2));
@@ -42420,7 +42481,7 @@ ${d3.name} [${d3.status}]`);
     if (results.length === 0)
       console.log("No results.");
   });
-  domain.command("expiring").description("List domains expiring soon").option("--days <n>", "Days threshold", "30").option("--json", "Output JSON").action((opts) => {
+  domain.command("expiring").description("List domains expiring soon").option("--days <n>", "Days threshold", "30").option("-j, --json", "Output JSON").action((opts) => {
     const domains = listExpiring(parseInt(opts.days));
     if (opts.json) {
       console.log(JSON.stringify(domains, null, 2));
@@ -42436,7 +42497,7 @@ Expiring within ${opts.days} days:`);
       console.log(`  ${d3.name.padEnd(40)} expires ${(d3.expires_at ?? "").split("T")[0]}`);
     console.log();
   });
-  domain.command("stats").description("Show portfolio statistics").option("--json", "Output JSON").action((opts) => {
+  domain.command("stats").description("Show portfolio statistics").option("-j, --json", "Output JSON").action((opts) => {
     const stats = getDomainStats();
     if (opts.json) {
       console.log(JSON.stringify(stats, null, 2));
@@ -42447,7 +42508,7 @@ Expiring within ${opts.days} days:`);
       console.log(`  ${k3.replace(/_/g, " ")}: ${v3}`);
     }
   });
-  domain.command("whois <name>").description("Run WHOIS lookup and update local DB record").option("--json", "Output JSON").action((name, opts) => {
+  domain.command("whois <name>").description("Run WHOIS lookup and update local DB record").option("-j, --json", "Output JSON").action((name, opts) => {
     const result = whoisLookup(name);
     if (opts.json) {
       console.log(JSON.stringify(result, null, 2));
@@ -42650,7 +42711,7 @@ Setting up ${name}`);
 }
 
 // src/cli/commands/dns.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
 function registerDnsCommands(program2) {
   const dnsCmd = program2.command("dns").description("DNS record management");
   dnsCmd.command("list").description("List DNS records for a domain").argument("<domain-id>", "Domain ID").option("--type <type>", "Filter by record type (A/AAAA/CNAME/MX/TXT/NS/SRV)").option("--json", "Output as JSON", false).action((domainId, opts) => {
@@ -42745,7 +42806,7 @@ function registerDnsCommands(program2) {
   dnsCmd.command("import").description("Import DNS records from a BIND zone file").argument("<domain-id>", "Domain ID").requiredOption("--file <path>", "Path to zone file").option("--json", "Output as JSON", false).action((domainId, opts) => {
     let content;
     try {
-      content = readFileSync4(opts.file, "utf-8");
+      content = readFileSync5(opts.file, "utf-8");
     } catch {
       console.error(`Could not read file: ${opts.file}`);
       process.exit(1);
@@ -43234,29 +43295,41 @@ Configuration (~/.hasna/domains/config.json):`);
 // src/cli/commands/doctor.ts
 import { execSync as execSync2 } from "child_process";
 function registerDoctorCommand(program2) {
-  program2.command("doctor").description("Run diagnostics \u2014 check credentials, DB, and provider connectivity").action(async () => {
+  program2.command("doctor").description("Run diagnostics \u2014 check credentials, DB, and provider connectivity").option("--json", "Output structured JSON").action(async (opts) => {
     let passed = 0;
     let failed = 0;
+    const checks = [];
+    let currentSection = "general";
+    function section(name) {
+      currentSection = name;
+      if (!opts.json) {
+        console.log(`
+\u2500\u2500 ${name} \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+      }
+    }
     function ok(msg) {
-      console.log(`  \u2713 ${msg}`);
+      checks.push({ section: currentSection, status: "pass", message: msg });
+      if (!opts.json)
+        console.log(`  \u2713 ${msg}`);
       passed++;
     }
     function fail(msg, fix) {
-      console.log(`  \u2717 ${msg}`);
-      if (fix)
-        console.log(`    \u2192 ${fix}`);
+      checks.push({ section: currentSection, status: "fail", message: msg, fix });
+      if (!opts.json) {
+        console.log(`  \u2717 ${msg}`);
+        if (fix)
+          console.log(`    \u2192 ${fix}`);
+      }
       failed++;
     }
-    console.log(`
-\u2500\u2500 Database \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    section("Database");
     try {
       const count = countDomains();
       ok(`Local DB accessible (${count} domain${count !== 1 ? "s" : ""})`);
-    } catch (e3) {
-      fail("Local DB not accessible", `Check ~/.hasna/domains/domains.db`);
+    } catch {
+      fail("Local DB not accessible", "Check ~/.hasna/domains/domains.db");
     }
-    console.log(`
-\u2500\u2500 Config \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    section("Config");
     const cfg = loadConfig3();
     if (cfg.default_registrar)
       ok(`default-registrar: ${cfg.default_registrar}`);
@@ -43272,8 +43345,7 @@ function registerDoctorCommand(program2) {
       ok("Registrant contact info complete");
     else
       fail(`Missing contact fields: ${missingContact.join(", ")}`, "domains config set contact.<field> <value>");
-    console.log(`
-\u2500\u2500 Providers \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    section("Providers");
     const providers = getAvailableProviders().filter((p3) => p3.name !== "brandsight");
     for (const p3 of providers) {
       if (!p3.configured) {
@@ -43298,25 +43370,33 @@ function registerDoctorCommand(program2) {
         }
       }
     }
-    console.log(`
-\u2500\u2500 Tools \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
+    section("Tools");
     try {
       execSync2("whois --version 2>/dev/null || whois example.com 2>/dev/null", { timeout: 3000 });
       ok("whois binary found");
     } catch {
       fail("whois not installed", "apt install whois  /  brew install whois");
     }
-    console.log(`
+    if (opts.json) {
+      console.log(JSON.stringify({
+        passed,
+        failed,
+        healthy: failed === 0,
+        checks
+      }, null, 2));
+    } else {
+      console.log(`
 ${"\u2500".repeat(45)}`);
-    console.log(`  ${passed} passed  /  ${failed} failed
+      console.log(`  ${passed} passed  /  ${failed} failed
 `);
+    }
     if (failed > 0)
       process.exit(1);
   });
 }
 
 // src/cli/commands/mcp-install.ts
-import { existsSync as existsSync7, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir9 } from "os";
 import { join as join9 } from "path";
 import { execSync as execSync3 } from "child_process";
@@ -43343,7 +43423,7 @@ function registerMcpCommand(program2) {
     let config = {};
     if (existsSync7(configPath2)) {
       try {
-        config = JSON.parse(readFileSync5(configPath2, "utf-8"));
+        config = JSON.parse(readFileSync6(configPath2, "utf-8"));
       } catch {
         config = {};
       }
@@ -43365,7 +43445,7 @@ function registerMcpCommand(program2) {
       console.log("Config file not found \u2014 nothing to remove.");
       return;
     }
-    const config = JSON.parse(readFileSync5(configPath2, "utf-8"));
+    const config = JSON.parse(readFileSync6(configPath2, "utf-8"));
     const mcpServers = config.mcpServers;
     if (!mcpServers?.[MCP_SERVER_NAME]) {
       console.log(`MCP server '${MCP_SERVER_NAME}' is not registered.`);
@@ -43383,7 +43463,7 @@ function registerMcpCommand(program2) {
         continue;
       }
       try {
-        const config = JSON.parse(readFileSync5(configPath2, "utf-8"));
+        const config = JSON.parse(readFileSync6(configPath2, "utf-8"));
         const mcpServers = config.mcpServers;
         if (mcpServers?.[MCP_SERVER_NAME]) {
           console.log(`  ${label}: \u2713 registered`);
@@ -43399,6 +43479,7 @@ function registerMcpCommand(program2) {
 
 // src/cli/commands/serve.ts
 function registerServeCommand(program2) {
+  const packageVersion = getPackageVersion();
   program2.command("serve").description("Start HTTP API server").option("--port <n>", "Port to listen on", "3000").option("--host <h>", "Host to bind to", "127.0.0.1").action(async (opts) => {
     const port = parseInt(opts.port);
     const server = Bun.serve({
@@ -43415,7 +43496,7 @@ function registerServeCommand(program2) {
         const notFound = () => json({ error: "Not found" }, 404);
         try {
           if (method === "GET" && path === "/health") {
-            return json({ status: "ok", version: "0.0.3" });
+            return json({ status: "ok", version: packageVersion });
           }
           if (method === "GET" && path === "/domains") {
             const search = url.searchParams.get("search") ?? undefined;
@@ -43483,7 +43564,7 @@ function registerServeCommand(program2) {
 }
 
 // src/cli/commands/route53.ts
-import { readFileSync as readFileSync6 } from "fs";
+import { readFileSync as readFileSync7 } from "fs";
 function registerRoute53Commands(program2) {
   const r53 = program2.command("r53").description("AWS Route 53 \u2014 domain purchase, hosted zones & DNS");
   r53.command("check <domains...>").description("Check if one or more domains are available for purchase").action(async (domains) => {
@@ -43772,7 +43853,7 @@ DNS Records for ${domain}:`);
     try {
       let raw;
       try {
-        raw = readFileSync6(opts.file, "utf-8");
+        raw = readFileSync7(opts.file, "utf-8");
       } catch {
         console.error(`Could not read file: ${opts.file}`);
         process.exit(1);
@@ -43884,7 +43965,7 @@ DNS Records for ${domain}:`);
 
 // src/cli/index.ts
 var program2 = new Command;
-program2.name("domains").description("Domain portfolio and DNS management for AI agents").version("0.0.4");
+program2.name("domains").description("Domain portfolio and DNS management for AI agents").version(getPackageVersion());
 registerDomainCommand(program2);
 registerDnsCommands(program2);
 registerZoneCommand(program2);