@zenalexa/unicli 0.215.1 → 0.216.2

package/src/hub/index.ts

@@ -1,12 +1,12 @@
 /**
  * External CLI Hub — registry and auto-discovery for third-party CLIs.
  *
- * Reads `external-clis.yaml` at startup, checks which binaries are
+ * Reads the external CLI registries at startup, checks which binaries are
  * installed on $PATH, and exposes lookup helpers for the rest of the
  * system (Commander registration, `unicli ext` subcommands, AGENTS.md).
  */
 
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { execFileSync } from "node:child_process";
@@ -30,6 +30,7 @@ export interface ExternalCli {
 
 let _cache: ExternalCli[] | null = null;
 const _installedCache = new Map<string, boolean>();
+const REGISTRY_FILES = ["external-clis.yaml", "external-clis-harness.yaml"];
 
 // ── Loader ──────────────────────────────────────────────────────────────
 
@@ -40,26 +41,35 @@ const _installedCache = new Map<string, boolean>();
  * At runtime we may be executing from `dist/hub/`, so we try the source
  * sibling first (`../../src/hub/`) then fall back to the co-located path.
  */
-function resolveYamlPath(): string {
+function resolveYamlPath(fileName: string): string | null {
   // Running from dist/hub/index.js → ../../src/hub/external-clis.yaml
-  const fromDist = join(
-    __dirname,
-    "..",
-    "..",
-    "src",
-    "hub",
-    "external-clis.yaml",
-  );
+  const fromDist = join(__dirname, "..", "..", "src", "hub", fileName);
   // Running from src/hub/index.ts (dev via tsx)
-  const fromSrc = join(__dirname, "external-clis.yaml");
+  const fromSrc = join(__dirname, fileName);
 
   // Prefer the source copy (always present in both dev & installed package)
-  try {
-    readFileSync(fromSrc, "utf-8");
-    return fromSrc;
-  } catch {
-    return fromDist;
-  }
+  if (existsSync(fromSrc)) return fromSrc;
+  if (existsSync(fromDist)) return fromDist;
+  return null;
+}
+
+function readRegistryFile(fileName: string): ExternalCli[] {
+  const path = resolveYamlPath(fileName);
+  if (!path) return [];
+
+  const raw = readFileSync(path, "utf-8");
+  const parsed = yaml.load(raw);
+  return Array.isArray(parsed) ? (parsed as ExternalCli[]) : [];
+}
+
+function dedupeRegistry(entries: ExternalCli[]): ExternalCli[] {
+  const seen = new Set<string>();
+  return entries.filter((entry) => {
+    const key = `${entry.name}\0${entry.binary}`;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
 }
 
 /**
@@ -70,13 +80,7 @@ export function loadExternalClis(): ExternalCli[] {
   if (_cache) return _cache;
 
   try {
-    const raw = readFileSync(resolveYamlPath(), "utf-8");
-    const parsed = yaml.load(raw);
-    if (!Array.isArray(parsed)) {
-      _cache = [];
-      return _cache;
-    }
-    _cache = parsed as ExternalCli[];
+    _cache = dedupeRegistry(REGISTRY_FILES.flatMap(readRegistryFile));
     return _cache;
   } catch {
     _cache = [];

package/src/adapters/linux-do/search.yaml

@@ -1,44 +0,0 @@
-site: linux-do
-name: search
-description: Search Linux.do forum topics
-domain: linux.do
-type: web-api
-strategy: public
-
-args:
-  query:
-    required: true
-    positional: true
-    description: Search query
-  limit:
-    type: int
-    default: 20
-    description: Number of results
-
-pipeline:
-  - fetch:
-      url: https://linux.do/search.json
-      params:
-        q: "${{ args.query }}"
-
-  - select: topics
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: ${{ item.title }}
-      views: ${{ item.views }}
-      likes: ${{ item.like_count }}
-      replies: ${{ (item.posts_count || 1) - 1 }}
-      url: ${{ 'https://linux.do/t/topic/' + item.id }}
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, views, likes, replies, url]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/meituan/hot.yaml

@@ -1,34 +0,0 @@
-site: meituan
-name: hot
-description: Meituan hot search keywords
-domain: apimobile.meituan.com
-type: web-api
-strategy: public
-
-args:
-  limit:
-    type: int
-    default: 20
-
-pipeline:
-  - fetch:
-      url: https://apimobile.meituan.com/group/v1/recommend/hotword/1
-
-  - select: data.hotSearchWords
-
-  - map:
-      rank: ${{ index + 1 }}
-      keyword: "${{ item.word || item }}"
-      count: "${{ item.count || '' }}"
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, keyword, count]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/frontpage.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit frontpage", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "frontpage");
-    expectAdapterShape(output, {
-      columns: ["rank", "title", "subreddit", "score", "comments", "author"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/frontpage.yaml

@@ -1,41 +0,0 @@
-site: reddit
-name: frontpage
-description: Reddit front page / r/all
-domain: www.reddit.com
-type: web-api
-strategy: public
-
-args:
-  limit:
-    type: int
-    default: 20
-    description: Number of posts
-
-pipeline:
-  - fetch:
-      url: https://www.reddit.com/r/all.json
-      params:
-        limit: ${{ args.limit }}
-        raw_json: "1"
-  - select: data.children
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: ${{ item.data.title }}
-      subreddit: ${{ item.data.subreddit_name_prefixed }}
-      score: ${{ item.data.score }}
-      comments: ${{ item.data.num_comments }}
-      author: ${{ item.data.author }}
-      url: ${{ item.data.url }}
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, subreddit, score, comments, author]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/hot.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit hot", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "hot");
-    expectAdapterShape(output, {
-      columns: ["rank", "title", "subreddit", "score", "comments", "author"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/hot.yaml

@@ -1,41 +0,0 @@
-site: reddit
-name: hot
-description: Reddit front page hot posts
-domain: www.reddit.com
-type: web-api
-strategy: public
-browser: false
-
-args:
-  limit:
-    type: int
-    default: 20
-    description: Number of posts
-
-pipeline:
-  - fetch:
-      url: https://www.reddit.com/r/all/hot.json
-      params:
-        limit: ${{ args.limit }}
-  - select: data.children
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: ${{ item.data.title }}
-      subreddit: ${{ item.data.subreddit_name_prefixed }}
-      score: ${{ item.data.score }}
-      comments: ${{ item.data.num_comments }}
-      author: ${{ item.data.author }}
-      url: ${{ item.data.url }}
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, subreddit, score, comments, author]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/new.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit new", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "new");
-    expectAdapterShape(output, {
-      columns: ["title", "author", "subreddit", "score", "comments"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/new.yaml

@@ -1,42 +0,0 @@
-site: reddit
-name: new
-description: Reddit newest posts from all subreddits
-domain: www.reddit.com
-type: web-api
-strategy: public
-
-args:
-  subreddit:
-    type: str
-    description: Subreddit name (without r/)
-  limit:
-    type: int
-    default: 20
-
-pipeline:
-  - fetch:
-      url: "https://www.reddit.com/${{ args.subreddit ? 'r/' + args.subreddit + '/' : '' }}new.json"
-      params:
-        limit: "${{ args.limit }}"
-
-  - select: data.children
-
-  - map:
-      title: "${{ item.data.title }}"
-      author: "${{ item.data.author }}"
-      subreddit: "${{ item.data.subreddit }}"
-      score: "${{ item.data.score }}"
-      comments: "${{ item.data.num_comments }}"
-      url: "${{ 'https://www.reddit.com' + item.data.permalink }}"
-
-  - limit: ${{ args.limit }}
-
-columns: [title, author, subreddit, score, comments]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/popular.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit popular", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "popular");
-    expectAdapterShape(output, {
-      columns: ["rank", "title", "subreddit", "score", "comments", "author"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/popular.yaml

@@ -1,41 +0,0 @@
-site: reddit
-name: popular
-description: Reddit popular posts (/r/popular)
-domain: www.reddit.com
-type: web-api
-strategy: public
-
-args:
-  limit:
-    type: int
-    default: 20
-    description: Number of posts
-
-pipeline:
-  - fetch:
-      url: https://www.reddit.com/r/popular.json
-      params:
-        limit: ${{ args.limit }}
-        raw_json: "1"
-  - select: data.children
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: ${{ item.data.title }}
-      subreddit: ${{ item.data.subreddit_name_prefixed }}
-      score: ${{ item.data.score }}
-      comments: ${{ item.data.num_comments }}
-      author: ${{ item.data.author }}
-      url: ${{ item.data.url }}
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, subreddit, score, comments, author]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/rising.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit rising", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "rising");
-    expectAdapterShape(output, {
-      columns: ["title", "author", "subreddit", "score", "comments"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/rising.yaml

@@ -1,41 +0,0 @@
-site: reddit
-name: rising
-description: Reddit rising posts
-domain: www.reddit.com
-type: web-api
-strategy: public
-
-args:
-  subreddit:
-    type: str
-    description: Subreddit name (without r/)
-  limit:
-    type: int
-    default: 20
-
-pipeline:
-  - fetch:
-      url: "https://www.reddit.com/${{ args.subreddit ? 'r/' + args.subreddit + '/' : '' }}rising.json"
-      params:
-        limit: "${{ args.limit }}"
-
-  - select: data.children
-
-  - map:
-      title: "${{ item.data.title }}"
-      author: "${{ item.data.author }}"
-      subreddit: "${{ item.data.subreddit }}"
-      score: "${{ item.data.score }}"
-      comments: "${{ item.data.num_comments }}"
-
-  - limit: ${{ args.limit }}
-
-columns: [title, author, subreddit, score, comments]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/search.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit search", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "search");
-    expectAdapterShape(output, {
-      columns: ["rank", "title", "subreddit", "score", "comments", "author"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/search.yaml

@@ -1,52 +0,0 @@
-site: reddit
-name: search
-description: Search Reddit posts
-domain: www.reddit.com
-type: web-api
-strategy: public
-browser: false
-
-args:
-  query:
-    type: str
-    required: true
-    positional: true
-    description: Search query
-  limit:
-    type: int
-    default: 20
-    description: Number of results
-  sort:
-    type: str
-    default: relevance
-    choices: [relevance, hot, top, new, comments]
-    description: Sort order
-
-pipeline:
-  - fetch:
-      url: https://www.reddit.com/search.json
-      params:
-        q: ${{ args.query }}
-        sort: ${{ args.sort || 'relevance' }}
-        limit: ${{ args.limit }}
-  - select: data.children
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: ${{ item.data.title }}
-      subreddit: ${{ item.data.subreddit_name_prefixed }}
-      score: ${{ item.data.score }}
-      comments: ${{ item.data.num_comments }}
-      author: ${{ item.data.author }}
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, subreddit, score, comments, author]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/subreddit.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit subreddit", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "subreddit");
-    expectAdapterShape(output, {
-      columns: ["rank", "title", "score", "comments", "author"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/subreddit.yaml

@@ -1,50 +0,0 @@
-site: reddit
-name: subreddit
-description: Get posts from a specific subreddit
-domain: www.reddit.com
-type: web-api
-strategy: public
-
-args:
-  name:
-    type: str
-    required: true
-    positional: true
-    description: "Subreddit name (e.g. programming, rust, webdev)"
-  sort:
-    type: str
-    default: hot
-    choices: [hot, new, top, rising]
-    description: Sort order
-  limit:
-    type: int
-    default: 20
-    description: Number of posts
-
-pipeline:
-  - fetch:
-      url: "https://www.reddit.com/r/${{ args.name }}/${{ args.sort }}.json"
-      params:
-        limit: ${{ args.limit }}
-        raw_json: "1"
-  - select: data.children
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: ${{ item.data.title }}
-      score: ${{ item.data.score }}
-      comments: ${{ item.data.num_comments }}
-      author: ${{ item.data.author }}
-      url: ${{ 'https://www.reddit.com' + item.data.permalink }}
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, score, comments, author]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/top.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit top", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "top");
-    expectAdapterShape(output, {
-      columns: ["rank", "title", "subreddit", "score", "comments"],
-      minItems: 1,
-    });
-  });
-});

package/src/adapters/reddit/top.yaml

@@ -1,48 +0,0 @@
-site: reddit
-name: top
-description: Reddit top posts
-domain: www.reddit.com
-type: web-api
-strategy: public
-
-args:
-  subreddit:
-    type: str
-    description: Subreddit name (without r/)
-  time:
-    type: str
-    default: day
-    choices: [hour, day, week, month, year, all]
-  limit:
-    type: int
-    default: 20
-
-pipeline:
-  - fetch:
-      url: "https://www.reddit.com/${{ args.subreddit ? 'r/' + args.subreddit + '/' : '' }}top.json"
-      params:
-        t: "${{ args.time }}"
-        limit: "${{ args.limit }}"
-
-  - select: data.children
-
-  - map:
-      rank: ${{ index + 1 }}
-      title: "${{ item.data.title }}"
-      author: "${{ item.data.author }}"
-      subreddit: "${{ item.data.subreddit }}"
-      score: "${{ item.data.score }}"
-      comments: "${{ item.data.num_comments }}"
-      url: "${{ 'https://www.reddit.com' + item.data.permalink }}"
-
-  - limit: ${{ args.limit }}
-
-columns: [rank, title, subreddit, score, comments]
-
-# schema-v2 metadata — injected by `unicli migrate schema-v2`
-capabilities: ["http.fetch"]
-minimum_capability: http.fetch
-trust: public
-confidentiality: public
-quarantine: false
-schema_version: v2

package/src/adapters/reddit/trending.test.ts

@@ -1,15 +0,0 @@
-import { describe, it } from "vitest";
-import {
-  runAdapterWithFixture,
-  expectAdapterShape,
-} from "../../../tests/adapter-runner.js";
-
-describe("reddit trending", () => {
-  it("returns rows with declared columns against fixture", async () => {
-    const { output } = await runAdapterWithFixture("reddit", "trending");
-    expectAdapterShape(output, {
-      columns: ["name", "subscribers", "title", "description"],
-      minItems: 1,
-    });
-  });
-});