@yugabytedb/meko-mcp 2.0.0 → 2.2.0

package/assets/skills/meko-select-datapack-desktop/SKILL.md

@@ -3,15 +3,15 @@ name: meko-select-datapack-desktop
 description: >-
   Lists the user's Meko datapacks, shows authorization, supports search and
   pagination, and pins one as the active datapack on Claude Desktop. Triggers
-  when the user says things like "switch datapack", "use datapack <name>",
-  "list my datapacks", "which datapack am I on", "pin <name>", or any request
+  when the user says things like "switch datapack", "use the Acme datapack",
+  "list my datapacks", "which datapack am I on", "pin Acme", or any request
   to change or inspect the active datapack. Persistence is via memory_add
   (Desktop has no SessionStart hook), so the pin survives across sessions
   until the user clears it.
 license: MIT
 metadata:
   author: Meko
-  version: "1.1.0"
+  version: "1.2.1"
   tags: meko, datapack, selection, project, claude-desktop, desktop
 ---
 
@@ -42,10 +42,10 @@ Trigger immediately on any of these signals:
 
 ## On every Meko-touching turn (not just when this skill triggers)
 
-Before issuing a Meko MCP write tool call (memory_add, db_run_write_query, conversation_add_message, etc.), if you don't already know the active pin from this turn's earlier work:
+Before issuing a Meko MCP write tool call (memory_add, conversation_add_message, artifact_put, etc.), if you don't already know the active pin from this turn's earlier work:
 
 ```
-memory_search(scope="read",
+memory_search(
               query="meko_active_datapack",
               agent_id="claude_desktop",
               conversation_id="<this conversation's id>",
@@ -61,7 +61,7 @@ This is once per turn, not once per call. Cache within the turn.
 ### 1. List
 
 Use a **temporary** conversation for browsing only. Call
-`conversation_create(scope="write", agent_id="claude_desktop", title="Claude
+`conversation_create(agent_id="claude_desktop", title="Claude
 Desktop datapack selection")` and use its returned ID for the read-only
 `datapack_list` below and for the pin `memory_add`/`memory_update` in step 4.
 
@@ -72,13 +72,20 @@ must flow through a *new* conversation created in the selected datapack — see
 step 5.
 
 ```
-datapack_list(scope="read", conversation_id="<this conversation's id>")
+datapack_list(conversation_id="<this conversation's id>")
 ```
 
 The response is an array; the fields you'll use are `datapack_id`,
-`datapack_name`, `created_at`, and `account_id`.
+`datapack_name`, `created_at`, `account_id`, and `grant`.
 
-If the response has zero entries, tell the user: *"You don't have any datapacks yet. Run `datapack_create(scope='admin', name='<name>')` to make one, or visit the Meko Cloud console."* Stop here.
+`grant` is the caller's actual authorization on the datapack — one of
+`"owner"`, `"maintainer"`, `"contributor"`, `"viewer"`. Display it verbatim in
+the Role column. Do not hardcode "Owner", do not invent or normalize the value
+(render `"maintainer"` as `maintainer`, not `Maintainer`). The deployed
+response is the source of truth — see `references/role-display-future.md` for
+the taxonomy.
+
+If the response has zero entries, tell the user: *"You don't have any datapacks yet. Run `datapack_create(name='<name>')` to make one, or visit the Meko Cloud console."* Stop here.
 
 If the response has exactly **one** entry, **auto-select it**. Print: *"Only one datapack: `<name>`. Auto-selecting. Run `meko-select-datapack-desktop` again with `clear` to unset."* Skip the table; jump to step 4 (persist) and step 5 (confirm).
 
@@ -89,19 +96,22 @@ For 2+ datapacks, render a numbered table. **Page size 10.** Default sort: `crea
 ```
 Your datapacks (showing 1-10 of 14):
 
-#   Name                                   Role    Created       Status     Active?
-1   meko-local-setup                       Owner   2026-04-30    ready       ←  (pinned)
-2   meko_default_datapack                  Owner   2026-04-30    ready
-3   prod-research                          Owner   2026-04-12    ready
+#   Name                                   Role          Created       Status     Active?
+1   meko-local-setup                       owner         2026-04-30    ready       ←  (pinned)
+2   meko_default_datapack                  owner         2026-04-30    ready
+3   team-onboarding                        maintainer    2026-04-08    ready
+4   q2-roadmap                             viewer         2026-03-22    ready
 …
 
 Reply with: a number (1-10) to pin · a substring to search · `next` / `prev` to page
             · `clear` to unset · `cancel` to leave the current pin alone
-
-Note: Role is hardcoded to "Owner" today. Shared / Viewer / Contributor /
-Maintainer roles are pending upstream backend work — see references/role-display-future.md.
 ```
 
+The **Role** column shows each datapack's `grant` value verbatim (`owner`,
+`maintainer`, `contributor`, `viewer`). Never hardcode "Owner" — shared
+datapacks legitimately carry other grants, and misreporting them (e.g. showing
+a `maintainer` grant as "Owner") misleads the user about their own access.
+
 Mark the currently-pinned row with `←  (pinned)` based on the `memory_search` result (if any).
 
 ### 3. Parse the user's reply
@@ -118,7 +128,7 @@ Mark the currently-pinned row with `←  (pinned)` based on the `memory_search`
 **On first pin (no existing pin memory):**
 
 ```
-memory_add(scope="write",
+memory_add(
            text="meko_active_datapack=<uuid> name=<name> selected_at=<iso8601>",
            agent_id="claude_desktop",
            conversation_id="<this conversation's id>",
@@ -130,7 +140,7 @@ Verify the write with `memory_search` (the standard Meko verify-after-write rule
 **On switch (existing pin memory found):**
 
 ```
-memory_update(scope="write",
+memory_update(
               memory_id="<existing pin id>",
               text="meko_active_datapack=<new uuid> name=<new name> selected_at=<iso8601>",
               agent_id="claude_desktop",
@@ -142,7 +152,7 @@ Always update — never `memory_add` a second pin. Two pin memories will produce
 **On clear:**
 
 ```
-memory_delete_by_id(scope="write",
+memory_delete_by_id(
                     memory_id="<existing pin id>",
                     agent_id="claude_desktop",
                     conversation_id="<this conversation's id>")
@@ -153,7 +163,7 @@ If `memory_search` returned no pin, there's nothing to delete — print *"No pin
 **Conversation transition after a clear (same rule as a switch).** The pin memory is now gone, but the session's current conversation still physically lives in the datapack that was pinned when it was created — a conversation cannot move to the default. You must pick exactly one of these; do not mix them:
 
 - **Option A — keep capturing to the current conversation this session.** It stays in its original (now-unpinned) datapack, so you must keep passing that **same old `datapack_id`** on its `conversation_add_message` calls — do NOT switch it to the default (that would fail). The clear only affects *new* sessions. Disclose: *"Pin cleared. This chat keeps saving to `<old datapack name>`; new chats will use the default datapack."*
-- **Option B — start default-datapack capture immediately.** Create a **new** conversation with no `datapack_id` (`conversation_create(scope="write", agent_id="claude_desktop")`) and post all subsequent turns there. Stop posting to the old conversation. Disclose: *"Pin cleared. Started a new chat context saving to the default datapack."*
+- **Option B — start default-datapack capture immediately.** Create a **new** conversation with no `datapack_id` (`conversation_create(agent_id="claude_desktop")`) and post all subsequent turns there. Stop posting to the old conversation. Disclose: *"Pin cleared. Started a new chat context saving to the default datapack."*
 
 Default to Option A (least disruptive) unless the user wants the switch to take effect right now. Either way, never send `datapack_id=default` to the pre-existing pinned conversation.
 
@@ -173,7 +183,7 @@ right `datapack_id` flows through automatically.
 **Then start a fresh conversation for capture in the selected datapack.** The
 temporary selection conversation from step 1 belongs to the datapack that was
 active when it was created and cannot be moved. For subsequent capture this
-session, call `conversation_create(scope="write", agent_id="claude_desktop",
+session, call `conversation_create(agent_id="claude_desktop",
 datapack_id="<the newly pinned uuid>", title="<topic>")` and post turns
 (`conversation_add_message`) to *that* conversation with the same
 `datapack_id`. Do not keep posting to the selection conversation — doing so

package/assets/skills/meko-select-datapack-desktop/references/cookbook.md

@@ -11,12 +11,12 @@ Concrete transcripts of the four flows the skill supports on Claude Desktop.
 > memory_search(query="meko_active_datapack", agent_id="claude_desktop", limit=1)
 [empty]
 
-> datapack_list(scope="read")
+> datapack_list(conversation_id="<conv-id>")
 [14 entries returned, filtering by "prod-research"]
 
 One match: `prod-research`. Pinning.
 
-> memory_add(scope="write",
+> memory_add(
              text="meko_active_datapack=8b1c…f4a2 name=prod-research selected_at=2026-05-25T18:42:00Z",
              agent_id="claude_desktop",
              conversation_id="<conv-id>",
@@ -44,12 +44,12 @@ datapack_id flows through automatically.
 > memory_search(query="meko_active_datapack", agent_id="claude_desktop", limit=1)
 [returns id=mem_abc123, text="meko_active_datapack=8b1c…f4a2 name=prod-research …"]
 
-> datapack_list(scope="read")
+> datapack_list(conversation_id="<conv-id>")
 [14 entries returned, filtering by "q2-roadmap-deck"]
 
 One match: `q2-roadmap-deck`. Switching pin.
 
-> memory_update(scope="write",
+> memory_update(
                 memory_id="mem_abc123",
                 text="meko_active_datapack=4c2e…a991 name=q2-roadmap-deck selected_at=2026-05-25T19:05:00Z",
                 agent_id="claude_desktop",
@@ -69,12 +69,12 @@ The `memory_update` is critical here — using `memory_add` again would create a
 > memory_search(query="meko_active_datapack", agent_id="claude_desktop", limit=1)
 [empty]
 
-> datapack_list(scope="read")
+> datapack_list(conversation_id="<conv-id>")
 [1 entry returned]
 
 Only one datapack: `meko-local-setup`. Auto-selecting.
 
-> memory_add(scope="write",
+> memory_add(
              text="meko_active_datapack=a17d…cc91 name=meko-local-setup selected_at=…",
              agent_id="claude_desktop",
              conversation_id="<conv-id>",
@@ -93,7 +93,7 @@ Pinned datapack `meko-local-setup` (`a17d…cc91`). Run this skill again with
 > memory_search(query="meko_active_datapack", agent_id="claude_desktop", limit=1)
 [returns id=mem_abc123]
 
-> memory_delete_by_id(scope="write",
+> memory_delete_by_id(
                       memory_id="mem_abc123",
                       agent_id="claude_desktop",
                       conversation_id="<conv-id>")
@@ -114,7 +114,7 @@ This isn't a user-triggered flow — it's the per-turn lookup the skill teaches
 
 # Extract UUID after "meko_active_datapack=" → 8b1c…f4a2
 
-> memory_add(scope="write", text="…", datapack_id="8b1c…f4a2",
+> memory_add(text="…", datapack_id="8b1c…f4a2",
              agent_id="claude_desktop", conversation_id="<conv-id>")
 ```
 

package/assets/skills/meko-select-datapack-desktop/references/role-display-future.md

@@ -0,0 +1,41 @@
+# Role display — current state
+
+## Today: render `grant` verbatim
+
+The deployed Meko `GET /datapacks` response includes a `grant` field on every datapack. Possible values (per maintainer guidance, 2026-05-26):
+
+- `"owner"` — datapacks the caller created.
+- `"maintainer"` — write access to a shared datapack including memories AND collective learnings/knowledge.
+- `"contributor"` — write access to a shared datapack: can generate own memories. (Cannot promote / publish collective learnings — that's the maintainer's job.)
+- `"viewer"` — read-only on a shared datapack.
+
+Use the field directly in the **Role** column:
+
+```
+#   Name                  Role          Created       Active?
+1   prod-research         owner         2026-04-12    ←  (pinned)
+2   team-onboarding       contributor   2026-04-08
+3   q2-roadmap            viewer        2026-03-22
+```
+
+Do not invent values, do not normalize the casing, do not display `"Owner"` if the field says `"owner"`. The deployed schema is the source of truth.
+
+Note that the upstream Go source (the `Datapack` struct in `api_server/internal/models/models.go` of the `meko` API-server repo) does NOT declare `grant` — the deployed server enriches the response beyond what the public Go code lists. Don't rely on the public struct for the wire schema; trust the actual response.
+
+## Other fields the live response includes
+
+Beyond the columns the skill renders by default, `datapack_list` returns counts that may be useful in some flows:
+
+- `memory_count` — total memories the caller has under this datapack (per `(user_id, agent_id)` scoping).
+- `knowledge_count` — knowledge-base entries on the datapack.
+- `learnings_count` — promoted-to-shared memories on the datapack.
+
+These aren't in the spec column set. Don't add them silently. If the user asks for counts, render them on request — and read the numbers from the live response, never invent them.
+
+## Sharing UI vs API state
+
+The Cloud console "Share <datapack>" page (`meko_ui/src/features/datapacks/pages/DatapackSharePage.tsx`) shows interactive controls with "Coming Soon" overlays on a few specific actions (e.g. invite-by-email link sharing, transfer-ownership). Those overlays mean *those specific UI affordances* aren't shipped — NOT that the underlying `grant`/sharing model is absent. Contributor/maintainer/viewer grants are functional in the data layer today; only the user-facing self-serve invite flow is gated.
+
+## Why the skill ships without Mine / Shared / All filter tabs
+
+The tagged pin memory (re-read via `memory_search` before each Meko write) delivers the user's actual ask ("don't make me remember a UUID"). Filter tabs are useful when the response is genuinely mixed-grant; for users with only owner-grant rows they're decorative. We add tabs when there's evidence users with mixed-grant responses want them.

package/assets/skills/meko-select-datapack-desktop/references/troubleshooting.md

@@ -40,7 +40,7 @@ The user has zero datapacks. Print:
 ```
 You don't have any datapacks yet. Create one with:
 
-  datapack_create(scope="admin", name="<your-datapack-name>")
+  datapack_create(name="<your-datapack-name>")
 
 Or visit the Meko Cloud console (Datapacks → New datapack).
 ```

package/bin/create-meko-setup.mjs

@@ -7,12 +7,18 @@ import { dirname, join } from 'node:path';
 
 import { install, uninstall } from '../lib/installer.mjs';
 import { askChoice, askMultiChoice, askText, askSecret, askYesNo, close as closePrompts } from '../lib/prompt.mjs';
-import { banner, error, dim, info } from '../lib/logger.mjs';
-import { isPackagedInstall, selfInvocation } from '../lib/clients/common.mjs';
+import { banner, error, dim, info, warn } from '../lib/logger.mjs';
+import {
+  isPackagedInstall,
+  MEKO_PRODUCTION_CONSOLE_URL,
+  selfInvocation,
+} from '../lib/clients/common.mjs';
 import { getClientAdapters } from '../lib/clients/index.mjs';
+import { resolveSuggestedMcpUrl } from '../lib/url-selection.mjs';
 import { parseClientList } from '../lib/clients/aliases.mjs';
 import { startMigration, runChildMigration, readStatus, stopMigration } from '../lib/migrate.mjs';
 import { checkLatest } from '../lib/version-check.mjs';
+import { runCaptureStatus } from '../lib/capture-status.mjs';
 
 // ---------------------------------------------------------------------------
 // Flag definitions
@@ -39,6 +45,10 @@ const options = {
   help:               { type: 'boolean', short: 'h', default: false },
   version:            { type: 'boolean', short: 'v', default: false },
 
+  // --- Capture health (Capture V2 Workstream D) ---
+  'capture-status':   { type: 'boolean', default: false },
+  json:               { type: 'boolean', default: false },
+
   // --- Migrate subcommand ---
   migrate:            { type: 'boolean', default: false },
   'migrate-status':   { type: 'boolean', default: false },
@@ -65,11 +75,11 @@ function readVersion() {
   return pkg.version;
 }
 
-const ALL_CLIENTS = ['claude-code', 'claude-desktop', 'cursor', 'codex'];
+const ALL_CLIENTS = ['claude-code', 'claude-desktop', 'cursor', 'codex', 'kiro'];
 
 function printHelp() {
   const text = `
-Meko Setup for Claude Clients and Cursor
+Meko Setup for Claude Code, Claude Desktop, Cursor, Codex, and Kiro
 
 Install and configure Meko MCP Server in one command.
 
@@ -81,7 +91,7 @@ Examples:
   create-meko-setup
 
   # Cloud Meko for Claude Code (non-interactive):
-  create-meko-setup --url https://your-mcp.mekodev.com/mcp --api-key "$MEKO_API_KEY" --yes
+  create-meko-setup --url https://mcp.mekodata.ai/mcp --api-key "$MEKO_API_KEY" --yes
 
   # Local Meko with Cursor config:
   create-meko-setup --client cursor --local --scope project --yes
@@ -95,16 +105,24 @@ Examples:
   # Install for OpenAI Codex (CLI + Desktop App share the same config):
   create-meko-setup --client codex --yes
 
+  # Install for Kiro (IDE and kiro-cli share the same config):
+  create-meko-setup --client kiro --yes
+
   # Local Meko (docker-compose stack, Claude Code):
   create-meko-setup --local --yes
 
 Options:
-  --client <list>       Target clients: one or more of claude-code, claude-desktop, cursor, codex.
-                        "claude" is accepted as an alias for claude-code.
+  --client <list>       Target clients: one or more of claude-code, claude-desktop, cursor, codex, kiro.
+                        "claude" is accepted as an alias for claude-code;
+                        "kiro-cli" and "kiro-ide" for kiro.
                         Comma-separated, or "all" to target every supported client (default: claude-code)
                         codex covers BOTH the OpenAI Codex CLI and the Codex Desktop App
                         (they share ~/.codex/config.toml).
-  --url <url>           MCP server URL (from app.mekodev.com > Datapacks > Connect)
+                        kiro covers BOTH the Kiro IDE and kiro-cli. It installs
+                        inline CLI 2.x and standalone CLI 3.x/IDE capture hooks;
+                        untrusted IDE workspaces and non-managed CLI agents fall
+                        back to agent-driven persistence.
+  --url <url>           MCP server URL (from cloud.mekodata.ai > Datapacks > Connect)
   --api-key <key>       API key for Cloud Meko authentication
   --local               Use local Meko at http://localhost:8000/mcp
   --scope <scope>       Config scope: user or project (default: user)
@@ -129,6 +147,14 @@ Options:
   -h, --help            Show this help message
   -v, --version         Show version
 
+Capture health (durable outbox / recovery):
+  --capture-status      Report aggregate conversation-capture health from
+                        ~/.claude/meko-capture (or MEKO_WATERMARK_DIR).
+                        Exit 0 = healthy|catching_up, 2 = degraded_retrying,
+                        3 = blocked_action_required.
+  --json                With --capture-status, print machine-readable JSON
+                        matching the capture-health cache shape.
+
 Migrate existing conversations and memories into Meko:
   --migrate             Start a detached migration of existing Claude Code
                         and Cursor conversations + CLAUDE.md memories.
@@ -262,6 +288,20 @@ async function main() {
     process.exit(0);
   }
 
+  // --capture-status — aggregate outbox health (Capture V2). Combine with
+  // --json for machine-readable output. Exit codes: 0 healthy|catching_up,
+  // 2 degraded_retrying, 3 blocked_action_required.
+  if (flags['capture-status']) {
+    const out = runCaptureStatus({ json: Boolean(flags.json) });
+    if (out.stdout) process.stdout.write(out.stdout);
+    if (out.stderr) process.stderr.write(out.stderr);
+    process.exit(out.code);
+  }
+  if (flags.json) {
+    error('--json requires --capture-status');
+    process.exit(1);
+  }
+
   // --check-updates — synchronous probe of the npm registry. Never fails:
   // network errors produce "status: network error (<message>)" and exit 0.
   if (flags['check-updates']) {
@@ -437,6 +477,7 @@ async function main() {
         'claude-desktop': 'Claude Desktop',
         cursor: 'Cursor',
         codex: 'OpenAI Codex (CLI + App)',
+        kiro: 'Kiro (IDE + kiro-cli)',
       }[id];
       return {
         label: id,
@@ -465,6 +506,28 @@ async function main() {
     }
   }
 
+  let suggestedUrl = null;
+  if (!url && !flags.local) {
+    suggestedUrl = resolveSuggestedMcpUrl({
+      adapters: getClientAdapters(),
+      clients,
+      name: flags.name,
+      scope: flags.scope,
+      projectRoot,
+    });
+    if (flags.yes) {
+      if (suggestedUrl.source === 'conflict') {
+        const conflicts = suggestedUrl.existingUrls.map((existingUrl) => `\n  - ${existingUrl}`).join('');
+        error(
+          `Selected clients have different existing Meko URLs:${conflicts}\n` +
+          'Pass --url explicitly to choose which endpoint to install.',
+        );
+        process.exit(1);
+      }
+      url = suggestedUrl.url;
+    }
+  }
+
   // Interactive mode: URL not provided and not auto-accepting defaults
   if (!url && !flags.yes) {
     banner('Meko Setup');
@@ -475,7 +538,7 @@ async function main() {
     // When only Cloud is available, skip the prompt entirely — asking to
     // pick between one option is pointless UX.
     const connectionOptions = [
-      { label: 'Cloud Meko', description: 'Hosted at mekodev.com (requires URL + API key)' },
+      { label: 'Cloud Meko', description: 'Hosted at mekodata.ai (requires an API key)' },
     ];
     if (!isPackagedInstall()) {
       connectionOptions.push({
@@ -490,7 +553,19 @@ async function main() {
 
     if (connectionType === 'Cloud Meko') {
       // Step 2 — MCP URL
-      url = await askText('MCP server URL (from app.mekodev.com > Datapacks > Connect):');
+      if (suggestedUrl?.source === 'existing') {
+        dim(`Using the existing Meko endpoint as the default: ${suggestedUrl.url}`);
+      } else if (suggestedUrl?.source === 'conflict') {
+        const conflicts = suggestedUrl.existingUrls.map((existingUrl) => `\n  - ${existingUrl}`).join('');
+        warn(
+          `Selected clients use different Meko endpoints:${conflicts}\n` +
+          'Enter the endpoint to use for this install.',
+        );
+      }
+      url = await askText(
+        `MCP server URL (from ${MEKO_PRODUCTION_CONSOLE_URL} > Datapacks > Connect):`,
+        suggestedUrl?.url ?? undefined,
+      );
 
       // Step 3 — API key. Normalize: terminal paste can drag in trailing
       // whitespace/CR or accidental surrounding quotes, all of which would
@@ -503,12 +578,14 @@ async function main() {
     }
 
     // Step 4 — skills
-    const installSkills = await askYesNo(
-      'Install Meko agent skills plugin? (behavioral guides for MCP tools)',
-      true,
-    );
-    if (!installSkills) {
-      skipSkills = true;
+    if (!skipSkills) {
+      const installSkills = await askYesNo(
+        'Install Meko agent skills plugin? (behavioral guides for MCP tools)',
+        true,
+      );
+      if (!installSkills) {
+        skipSkills = true;
+      }
     }
 
     // Step 5 — statusline (Claude Code only). --no-statusline / --statusline

package/lib/capture-status.mjs

@@ -0,0 +1,67 @@
+/**
+ * capture-status.mjs — Installer helper that invokes capture-status-cli.js.
+ *
+ * Resolves the CLI next to bundled/source hooks (same root as capture.js).
+ */
+
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { resolveHooksRoot } from "./clients/common.mjs";
+
+/**
+ * Absolute path to capture-status-cli.js under the active asset root.
+ * @returns {string}
+ */
+export function resolveCaptureStatusCli() {
+  // Prefer the stable source-tree path in a checkout. Bundle tests create and
+  // remove installer/assets concurrently, so probing that transient directory
+  // first can race between existsSync and spawnSync. Published packages do not
+  // contain the repository skills tree and therefore fall back to assets.
+  const here = dirname(fileURLToPath(import.meta.url));
+  const sourceCli = resolve(
+    here,
+    "..",
+    "..",
+    "skills",
+    "hooks-handlers",
+    "lib",
+    "capture-status-cli.js",
+  );
+  if (existsSync(sourceCli)) return sourceCli;
+  return join(resolveHooksRoot(), "lib", "capture-status-cli.js");
+}
+
+/**
+ * Run the capture-status CLI and return its result.
+ *
+ * @param {{ json?: boolean, env?: NodeJS.ProcessEnv }} [opts]
+ * @returns {{ code: number, stdout: string, stderr: string, cliPath: string }}
+ */
+export function runCaptureStatus(opts = {}) {
+  const cliPath = resolveCaptureStatusCli();
+  if (!existsSync(cliPath)) {
+    return {
+      code: 1,
+      stdout: "",
+      stderr: `capture-status CLI not found at ${cliPath}`,
+      cliPath,
+    };
+  }
+  const args = [cliPath];
+  if (opts.json) args.push("--json");
+  const result = spawnSync(process.execPath, args, {
+    encoding: "utf8",
+    env: opts.env ? { ...process.env, ...opts.env } : process.env,
+  });
+  const code =
+    typeof result.status === "number" && result.status >= 0 ? result.status : 1;
+  return {
+    code,
+    stdout: result.stdout || "",
+    stderr: result.stderr || "",
+    cliPath,
+  };
+}

package/lib/clients/aliases.mjs

@@ -3,6 +3,11 @@
 // import it without booting the bin entry point.
 export const CLIENT_ALIASES = Object.freeze({
   claude: "claude-code",
+  // The Kiro IDE and `kiro-cli` share one adapter: same mcp.json paths, same
+  // skills directories. Users reach for whichever name matches the surface
+  // they're installing for, so both resolve to the single `kiro` adapter.
+  "kiro-cli": "kiro",
+  "kiro-ide": "kiro",
 });
 
 /**

package/lib/clients/claude-code.mjs

@@ -288,13 +288,17 @@ export function createClaudeCodeAdapter(options = {}) {
       // leaving the marketplace.json missing. Full clone is small
       // (~few MB, mostly markdown) and is the only way that reliably
       // succeeds today.
-      // Marketplace source is normally the upstream GitHub repo. A dev/e2e
+      // Marketplace source is normally the public generated skills repo. Use
+      // an explicit HTTPS URL: GitHub's owner/repo shorthand makes Claude Code
+      // clone over SSH, which fails for users without GitHub SSH credentials.
+      // A dev/e2e
       // override lets a test install the plugin from a LOCAL working-tree
       // checkout (a directory path) so unreleased skill changes can be
-      // exercised end-to-end before they land on `yugabyte/meko-mcp-server`.
-      // Default is unchanged; only set MEKO_PLUGIN_MARKETPLACE_SOURCE in tests.
+      // exercised end-to-end before they are published to `yugabyte/meko-skills`.
+      // Only set MEKO_PLUGIN_MARKETPLACE_SOURCE in tests.
       const marketplaceSource =
-        process.env.MEKO_PLUGIN_MARKETPLACE_SOURCE || "yugabyte/meko-mcp-server";
+        process.env.MEKO_PLUGIN_MARKETPLACE_SOURCE
+        || "https://github.com/yugabyte/meko-skills.git";
       const marketplaceCmd =
         `claude plugin marketplace add ${shellQuote(marketplaceSource)} --scope ${shellQuote(scope)}`;
       // `claude plugin list` dropped --scope in CLI 2.1.x; it prints all