@dirxai/cli 0.2.0 → 0.3.0

package/dist/index.js

@@ -207,12 +207,100 @@ var init_init = __esm({
   }
 });
 
+// src/commands/register.ts
+var register_exports = {};
+__export(register_exports, {
+  runRegister: () => runRegister
+});
+async function runRegister(options) {
+  const projectDir = options.dir ?? process.cwd();
+  const gatewayUrl = options.gatewayUrl ?? process.env.DIRX_GATEWAY_URL ?? "https://api.dirx.ai";
+  const domain = options.domain ?? process.env.DIRX_DOMAIN;
+  if (!domain) {
+    throw new Error(
+      "Domain is required. Use --domain or DIRX_DOMAIN env var."
+    );
+  }
+  const token = await resolveToken({
+    token: options.token,
+    domain,
+    gatewayUrl
+  });
+  const dirMdPath = join(projectDir, "DIR.md");
+  let dirMd;
+  try {
+    dirMd = await readFile(dirMdPath, "utf-8");
+  } catch {
+    throw new Error(
+      `DIR.md not found at ${dirMdPath}. Run 'dirx init' first.`
+    );
+  }
+  if (!dirMd.trim()) {
+    throw new Error(`DIR.md is empty at ${dirMdPath}`);
+  }
+  const baseUrl = gatewayUrl.replace(/\/$/, "");
+  const url = `${baseUrl}/registry/services?domain=${encodeURIComponent(domain)}`;
+  const res = await fetch(url, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "text/markdown"
+    },
+    body: dirMd
+  });
+  if (!res.ok) {
+    const body = await res.text();
+    throw new Error(`Registration failed (${res.status}): ${body}`);
+  }
+  const result = await res.json();
+  console.log(`Registered ${result.name} as ${result.domain}`);
+}
+async function resolveToken(options) {
+  if (options.token) return options.token;
+  if (process.env.DIRX_PUBLISH_TOKEN) return process.env.DIRX_PUBLISH_TOKEN;
+  if (options.domain) {
+    const stored = await getToken(options.domain);
+    if (stored) return stored;
+    const gw = options.gatewayUrl ?? process.env.DIRX_GATEWAY_URL;
+    if (gw) {
+      const renewed = await renewToken(gw, options.domain);
+      if (renewed) return renewed;
+    }
+  }
+  throw new Error(
+    "No auth token found. Use `dirx claim <domain>` to obtain a publish token, or provide --token."
+  );
+}
+async function renewToken(gatewayUrl, domain) {
+  const baseUrl = gatewayUrl.replace(/\/$/, "");
+  try {
+    const res = await fetch(`${baseUrl}/domains/verify`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ domain })
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    if (!data.publishToken) return null;
+    await saveToken(domain, data.publishToken);
+    console.log(`Token renewed for ${domain}`);
+    return data.publishToken;
+  } catch {
+    return null;
+  }
+}
+var init_register = __esm({
+  "src/commands/register.ts"() {
+    init_credentials();
+  }
+});
+
 // src/commands/generate.ts
 var generate_exports = {};
 __export(generate_exports, {
   runGenerate: () => runGenerate
 });
-async function runGenerate(dir) {
+async function runGenerate(dir, opts) {
   const target = dir === "." ? process.cwd() : dir;
   const dirJsonPath = join(target, "dir.json");
   if (!existsSync(dirJsonPath)) {
@@ -242,6 +330,17 @@ No route definitions detected.`);
   }
   console.log(`
 Edit DIR.md and dir.json to describe your API.`);
+  if (opts?.register) {
+    console.log(`
+Registering with gateway...`);
+    const { runRegister: runRegister2 } = await Promise.resolve().then(() => (init_register(), register_exports));
+    await runRegister2({
+      gatewayUrl: opts.gatewayUrl,
+      token: opts.token,
+      domain: opts.domain,
+      dir: target
+    });
+  }
 }
 function detectFrameworkFromPackage(target) {
   const pkgPath = join(target, "package.json");
@@ -427,94 +526,6 @@ var init_claim = __esm({
   }
 });
 
-// src/commands/register.ts
-var register_exports = {};
-__export(register_exports, {
-  runRegister: () => runRegister
-});
-async function runRegister(options) {
-  const projectDir = options.dir ?? process.cwd();
-  const gatewayUrl = options.gatewayUrl ?? process.env.DIRX_GATEWAY_URL ?? "https://api.dirx.ai";
-  const domain = options.domain ?? process.env.DIRX_DOMAIN;
-  if (!domain) {
-    throw new Error(
-      "Domain is required. Use --domain or DIRX_DOMAIN env var."
-    );
-  }
-  const token = await resolveToken({
-    token: options.token,
-    domain,
-    gatewayUrl
-  });
-  const dirMdPath = join(projectDir, "DIR.md");
-  let dirMd;
-  try {
-    dirMd = await readFile(dirMdPath, "utf-8");
-  } catch {
-    throw new Error(
-      `DIR.md not found at ${dirMdPath}. Run 'dirx init' first.`
-    );
-  }
-  if (!dirMd.trim()) {
-    throw new Error(`DIR.md is empty at ${dirMdPath}`);
-  }
-  const baseUrl = gatewayUrl.replace(/\/$/, "");
-  const url = `${baseUrl}/registry/services?domain=${encodeURIComponent(domain)}`;
-  const res = await fetch(url, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "text/markdown"
-    },
-    body: dirMd
-  });
-  if (!res.ok) {
-    const body = await res.text();
-    throw new Error(`Registration failed (${res.status}): ${body}`);
-  }
-  const result = await res.json();
-  console.log(`Registered ${result.name} as ${result.domain}`);
-}
-async function resolveToken(options) {
-  if (options.token) return options.token;
-  if (process.env.DIRX_PUBLISH_TOKEN) return process.env.DIRX_PUBLISH_TOKEN;
-  if (options.domain) {
-    const stored = await getToken(options.domain);
-    if (stored) return stored;
-    const gw = options.gatewayUrl ?? process.env.DIRX_GATEWAY_URL;
-    if (gw) {
-      const renewed = await renewToken(gw, options.domain);
-      if (renewed) return renewed;
-    }
-  }
-  throw new Error(
-    "No auth token found. Use `dirx claim <domain>` to obtain a publish token, or provide --token."
-  );
-}
-async function renewToken(gatewayUrl, domain) {
-  const baseUrl = gatewayUrl.replace(/\/$/, "");
-  try {
-    const res = await fetch(`${baseUrl}/domains/verify`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ domain })
-    });
-    if (!res.ok) return null;
-    const data = await res.json();
-    if (!data.publishToken) return null;
-    await saveToken(domain, data.publishToken);
-    console.log(`Token renewed for ${domain}`);
-    return data.publishToken;
-  } catch {
-    return null;
-  }
-}
-var init_register = __esm({
-  "src/commands/register.ts"() {
-    init_credentials();
-  }
-});
-
 // src/commands/status.ts
 var status_exports = {};
 __export(status_exports, {
@@ -664,13 +675,140 @@ var init_provider_map = __esm({
   }
 });
 
+// src/format.ts
+function isSearchResults(data) {
+  if (!Array.isArray(data) || data.length === 0) return false;
+  const first = data[0];
+  return typeof first === "object" && first !== null && "domain" in first && ("title" in first || "name" in first);
+}
+function isEndpointResults(data) {
+  if (!Array.isArray(data) || data.length === 0) return false;
+  const first = data[0];
+  return typeof first === "object" && first !== null && "method" in first && "path" in first;
+}
+function extractPayload(result) {
+  if (typeof result !== "object" || result === null) return result;
+  const obj = result;
+  if ("ok" in obj && "data" in obj) {
+    const data = obj.data;
+    if (typeof data === "object" && data !== null && "results" in data) {
+      return data.results;
+    }
+    return data;
+  }
+  if ("results" in obj && "query" in obj) return obj.results;
+  return result;
+}
+function formatLs(result) {
+  const payload = extractPayload(result);
+  if (Array.isArray(payload)) {
+    if (payload.length === 0) return "(empty)";
+    return payload.map((item) => typeof item === "string" ? item : JSON.stringify(item)).join("\n");
+  }
+  if (typeof payload === "object" && payload !== null && "items" in payload) {
+    const items = payload.items;
+    if (!Array.isArray(items) || items.length === 0) return "(empty)";
+    const rich = items.some(
+      (item) => typeof item === "object" && item !== null && "path" in item
+    );
+    if (!rich) {
+      return items.map((item) => typeof item === "string" ? item : JSON.stringify(item)).join("\n");
+    }
+    const entries = items;
+    const maxPath = Math.min(
+      40,
+      Math.max(8, ...entries.map((e) => (e.path ?? "").length))
+    );
+    return entries.map((entry) => {
+      const path = entry.path ?? "<unknown>";
+      const title = entry.title ?? "";
+      if (title) {
+        return `${path.padEnd(maxPath)}  ${title}`;
+      }
+      return path;
+    }).join("\n");
+  }
+  return JSON.stringify(payload);
+}
+function formatGrep(result) {
+  const payload = extractPayload(result);
+  if (isSearchResults(payload)) {
+    if (payload.length === 0) return "(no matches)";
+    let domainCount = 0;
+    let endpointCount = 0;
+    const blocks = payload.map((s) => {
+      domainCount++;
+      const name = s.title || s.name || "";
+      const header = name ? `${s.domain}  ${name}` : s.domain;
+      const lines = [header];
+      if (s.description) {
+        const desc = s.description.length > 80 ? s.description.slice(0, 77) + "..." : s.description;
+        lines.push(`  ${desc}`);
+      }
+      const endpoints = s.matched_endpoints;
+      if (endpoints && endpoints.length > 0) {
+        lines[0] += ` \xB7 ${endpoints.length} matched`;
+        for (const ep of endpoints) {
+          endpointCount++;
+          const method = (ep.method ?? "").padEnd(6);
+          const desc = ep.description ? `  -- ${ep.description}` : "";
+          lines.push(`    ${method} ${ep.path}${desc}`);
+        }
+      }
+      return lines.join("\n");
+    });
+    const output2 = blocks.join("\n\n");
+    if (domainCount > 0 || endpointCount > 0) {
+      const parts = [];
+      if (domainCount > 0) parts.push(`${domainCount} service${domainCount === 1 ? "" : "s"}`);
+      if (endpointCount > 0) parts.push(`${endpointCount} endpoint${endpointCount === 1 ? "" : "s"}`);
+      return `${output2}
+
+-- ${parts.join(", ")} matched`;
+    }
+    return output2;
+  }
+  if (isEndpointResults(payload)) {
+    if (payload.length === 0) return "(no matches)";
+    return payload.map((ep) => {
+      const method = (ep.method ?? "").padEnd(6);
+      const desc = ep.description ? `  -- ${ep.description}` : "";
+      return `${method} ${ep.path}${desc}`;
+    }).join("\n");
+  }
+  return JSON.stringify(payload);
+}
+function formatCat(result) {
+  const payload = extractPayload(result);
+  if (typeof payload === "string") return payload;
+  return JSON.stringify(payload);
+}
+function formatMutate(result, verb, path) {
+  const payload = extractPayload(result);
+  if (payload === null || payload === void 0) {
+    return `${verb}: ${path}`;
+  }
+  if (typeof payload === "object" && Object.keys(payload).length === 0) {
+    return `${verb}: ${path}`;
+  }
+  return `${verb}: ${path}
+${JSON.stringify(payload)}`;
+}
+function formatJson(result) {
+  return JSON.stringify(result);
+}
+var init_format = __esm({
+  "src/format.ts"() {
+  }
+});
+
 // src/commands/fs.ts
 var fs_exports = {};
 __export(fs_exports, {
   registerFsCommands: () => registerFsCommands
 });
-function output(result) {
-  console.log(JSON.stringify(result, null, 2));
+function output(result, jsonMode) {
+  console.log(jsonMode ? formatJson(result) : formatCat(result));
 }
 function extractDomain(path) {
   const cleaned = path.replace(/^\/+/, "");
@@ -708,33 +846,40 @@ function handleError(err, cmdPath) {
       process.exit(1);
     }
   }
-  console.error(JSON.stringify({ error: message }));
+  console.error(message);
   process.exit(1);
 }
 function registerFsCommands(program2) {
-  program2.command("ls").description("List directory contents in the DirX path space").argument("<path>", "Directory path (e.g. /net/)").action(async (path) => {
+  program2.command("ls").description("List directory contents in the DirX path space").argument("[path]", "Directory path (e.g. /net/)", "/").action(async (path) => {
     try {
+      let normalizedPath = path.trim();
+      if (normalizedPath.length > 1 && normalizedPath.endsWith("/")) {
+        normalizedPath = normalizedPath.replace(/\/+$/, "");
+      }
+      const jsonMode = program2.opts().json === true;
       const client = await createClient();
-      const result = await client.execute(`ls ${path}`);
-      output(result);
+      const result = await client.execute(`ls ${normalizedPath}`);
+      console.log(jsonMode ? formatJson(result) : formatLs(result));
     } catch (err) {
       handleError(err, path);
     }
   });
   program2.command("cat").description("Read file contents from a DirX path").argument("<path>", "File path").action(async (path) => {
     try {
+      const jsonMode = program2.opts().json === true;
       const client = await createClient();
       const result = await client.execute(`cat ${path}`);
-      output(result);
+      output(result, jsonMode);
     } catch (err) {
       handleError(err, path);
     }
   });
   program2.command("read").description("Read file contents (alias for cat)").argument("<path>", "File path").action(async (path) => {
     try {
+      const jsonMode = program2.opts().json === true;
       const client = await createClient();
       const result = await client.execute(`cat ${path}`);
-      output(result);
+      output(result, jsonMode);
     } catch (err) {
       handleError(err, path);
     }
@@ -747,9 +892,10 @@ function registerFsCommands(program2) {
           const { readFileSync: readFileSync4 } = await import('fs');
           payload = readFileSync4(opts.file, "utf-8");
         }
+        const jsonMode = program2.opts().json === true;
         const client = await createClient();
         const result = await client.execute(`write ${path} ${payload}`);
-        output(result);
+        console.log(jsonMode ? formatJson(result) : formatMutate(result, "Created", path));
       } catch (err) {
         handleError(err, path);
       }
@@ -763,28 +909,41 @@ function registerFsCommands(program2) {
           const { readFileSync: readFileSync4 } = await import('fs');
           payload = readFileSync4(opts.file, "utf-8");
         }
+        const jsonMode = program2.opts().json === true;
         const client = await createClient();
         const result = await client.execute(`edit ${path} ${payload}`);
-        output(result);
+        console.log(jsonMode ? formatJson(result) : formatMutate(result, "Updated", path));
       } catch (err) {
         handleError(err, path);
       }
     }
   );
+  program2.command("rm").description("Remove a resource at a DirX path").argument("<path>", "Resource path").action(async (path) => {
+    try {
+      const jsonMode = program2.opts().json === true;
+      const client = await createClient();
+      const result = await client.execute(`rm ${path}`);
+      console.log(jsonMode ? formatJson(result) : formatMutate(result, "Removed", path));
+    } catch (err) {
+      handleError(err, path);
+    }
+  });
   program2.command("bash").description("Execute a multi-step pipeline on the gateway").argument("<pipeline>", "Pipeline expression").action(async (pipeline) => {
     try {
+      const jsonMode = program2.opts().json === true;
       const client = await createClient();
       const result = await client.execute(`bash ${pipeline}`);
-      output(result);
+      output(result, jsonMode);
     } catch (err) {
       handleError(err);
     }
   });
-  program2.command("grep").description("Search across services in the DirX path space").argument("<pattern>", "Search pattern").argument("<path>", "Search scope path").action(async (pattern, path) => {
+  program2.command("grep").description("Search across services in the DirX path space").argument("<pattern>", "Search pattern").argument("[path]", "Search scope path", "/").action(async (pattern, path) => {
     try {
+      const jsonMode = program2.opts().json === true;
       const client = await createClient();
       const result = await client.execute(`grep ${pattern} ${path}`);
-      output(result);
+      console.log(jsonMode ? formatJson(result) : formatGrep(result));
     } catch (err) {
       handleError(err, path);
     }
@@ -794,6 +953,7 @@ var init_fs = __esm({
   "src/commands/fs.ts"() {
     init_client();
     init_provider_map();
+    init_format();
   }
 });
 
@@ -860,7 +1020,7 @@ function registerKeysCommand(program2) {
       try {
         const client = await createClient();
         const result = await client.listByok();
-        console.log(JSON.stringify(result, null, 2));
+        console.log(JSON.stringify(result));
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         console.error(`Error: ${msg}`);
@@ -916,7 +1076,7 @@ try {
 } catch {
 }
 var program = new Command();
-program.name("dirx").description("DirX \u2014 Unified Gateway & CLI for Agents").version(version);
+program.name("dirx").description("DirX \u2014 Unified Gateway & CLI for Agents").version(version).option("--json", "Output raw JSON instead of human-readable text");
 program.command("auth").description("Authenticate with the DirX gateway").option("--gateway-url <url>", "Gateway URL (default: https://api.dirx.ai)").action(async (opts) => {
   const { runAuth: runAuth2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
   await runAuth2({ gatewayUrl: opts.gatewayUrl });
@@ -925,9 +1085,14 @@ program.command("init").description("Initialize DirX in the current project").ar
   const { runInit: runInit2 } = await Promise.resolve().then(() => (init_init(), init_exports));
   await runInit2(dir);
 });
-program.command("generate").description("Scan project and detect route definitions").argument("[dir]", "Project directory", ".").action(async (dir) => {
+program.command("generate").description("Scan project and generate DIR.md, optionally register").argument("[dir]", "Project directory", ".").option("--register", "Register the service with the gateway after generating").option("--gateway-url <url>", "Gateway URL for registration").option("--token <token>", "Auth token for registration").option("--domain <domain>", "Domain name for the service").action(async (dir, opts) => {
   const { runGenerate: runGenerate2 } = await Promise.resolve().then(() => (init_generate(), generate_exports));
-  await runGenerate2(dir);
+  await runGenerate2(dir, {
+    register: opts.register,
+    gatewayUrl: opts.gatewayUrl,
+    token: opts.token,
+    domain: opts.domain
+  });
 });
 program.command("claim").description("Claim domain ownership via DNS verification").argument("<domain>", "Domain to claim").option("--verify", "Verify DNS record and obtain publish token").option("--gateway-url <url>", "Gateway URL").action(
   async (domain, opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dirxai/cli",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "DirX — Unified Gateway & CLI for Agents",
     "license": "MIT",
     "type": "module",
@@ -9,22 +9,16 @@
     },
     "scripts": {
         "build": "tsup",
-        "dev": "tsup --watch",
-        "lint": "tsc --noEmit",
-        "test": "vitest run"
+        "dev": "tsup --watch"
     },
     "dependencies": {
+        "@dirxai/core": "^0.3.0",
         "commander": "^13.0.0"
     },
-    "devDependencies": {
-        "@types/node": "^22.0.0",
-        "tsup": "^8.0.0",
-        "typescript": "^5.7.0",
-        "vitest": "^4.0.0"
-    },
     "repository": {
         "type": "git",
-        "url": "https://github.com/dirxai/dirx.git"
+        "url": "https://github.com/dirxai/dirx.git",
+        "directory": "packages/cli"
     },
     "homepage": "https://dirx.ai",
     "keywords": [

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 DirX AI
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/README.md

@@ -1,89 +0,0 @@
-# DirX — Unified Gateway & CLI for Agents
-
-[![npm version](https://img.shields.io/npm/v/@dirxai/cli.svg)](https://www.npmjs.com/package/@dirxai/cli)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-
-DirX gives AI agents a unified, file-system-like interface to discover and interact with internet APIs — with built-in governance, access control, and auditing.
-
-## Install
-
-```bash
-npm install -g @dirxai/cli
-```
-
-## Quick Start
-
-```bash
-# Authenticate with the gateway
-dirx auth
-
-# Browse the API directory
-dirx ls /
-dirx ls /net/
-
-# Read service descriptions
-dirx cat /net/api.github.com/DIR.md
-
-# Search across services
-dirx grep "weather" /net/
-
-# Write data
-dirx write /net/api.example.com/data -d '{"key": "value"}'
-
-# Manage API keys (BYOK)
-dirx keys set api.github.com --token ghp_xxxx --sync
-```
-
-## Commands
-
-### Agent Commands
-
-| Command | Description |
-|---------|-------------|
-| `dirx ls <path>` | List directory contents |
-| `dirx cat <path>` | Read file contents |
-| `dirx write <path>` | Write data |
-| `dirx edit <path>` | Partial update |
-| `dirx grep <pattern> <path>` | Search across services |
-| `dirx bash <pipeline>` | Execute multi-step pipeline |
-
-### Developer Tools
-
-| Command | Description |
-|---------|-------------|
-| `dirx init [dir]` | Initialize DirX in a project |
-| `dirx generate [dir]` | Scan and detect route definitions |
-| `dirx claim <domain>` | Claim domain via DNS verification |
-| `dirx register` | Register DIR.md with the gateway |
-
-### Configuration
-
-| Command | Description |
-|---------|-------------|
-| `dirx auth` | Authenticate with the gateway |
-| `dirx keys set <domain>` | Set an API key |
-| `dirx keys list` | List stored keys |
-| `dirx keys remove <domain>` | Remove a key |
-| `dirx status` | Show CLI config and auth status |
-
-## Environment Variables
-
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `DIRX_GATEWAY_URL` | Gateway URL | `https://api.dirx.ai` |
-| `DIRX_TOKEN` | Agent token | — |
-| `DIRX_HOME` | Config directory | `~/.dirx` |
-
-## Development
-
-```bash
-git clone https://github.com/dirxai/dirx.git
-cd dirx
-npm install
-npm run build
-npm run lint
-```
-
-## License
-
-MIT