agentcash 0.7.7 → 0.8.0

package/dist/esm/{commands-IFU565JX.js → commands-YSOBBE4N.js}

@@ -1,51 +1,61 @@
 import {
   registerOrigin
-} from "./chunk-QPL3AVUK.js";
+} from "./chunk-C36IAW7R.js";
 import {
   buildRequest,
   createFetchWithAuth,
   createFetchWithPayment,
   requestSchema
-} from "./chunk-X6KM3YLG.js";
-import "./chunk-XNU6FVCF.js";
+} from "./chunk-Z2R7VYNM.js";
+import {
+  ORIGIN_METADATA,
+  PRIMARY_ORIGINS,
+  addUserOrigin,
+  loadUserOrigins,
+  removeUserOrigin
+} from "./chunk-W7DAJMFQ.js";
 import {
   TEMPO_RPC_URL,
   getOnboardingCta,
   getWalletInfo,
   submitErrorReport
-} from "./chunk-SRV57WB2.js";
-import "./chunk-L7FC4RVF.js";
+} from "./chunk-62B3GENJ.js";
+import "./chunk-FBPC4LGY.js";
 import {
   checkEndpoint,
   discoverResources
-} from "./chunk-5EMDWOPZ.js";
+} from "./chunk-4R52CY5Q.js";
 import {
   getPlatformPath,
   tryAddServer
-} from "./chunk-2XMLNLWS.js";
-import "./chunk-KPEJO3KV.js";
+} from "./chunk-5ELAEV2M.js";
+import "./chunk-ZOVLXKVL.js";
 import {
   MCP_VERSION
-} from "./chunk-JKCEMNAF.js";
+} from "./chunk-VR5I67WE.js";
 import "./chunk-DZNSJ2BA.js";
 import {
   DEFAULT_NETWORK,
   getWallet,
-  redeemInviteCode,
+  redeemInviteCode
+} from "./chunk-UN3PRLTL.js";
+import {
   safeParseJson,
   toJsonObject
-} from "./chunk-24E2V3PA.js";
+} from "./chunk-ZDDDU5O2.js";
 import {
   getBaseUrl,
   getDepositLink
-} from "./chunk-FLIDR6EU.js";
+} from "./chunk-7ZEXMJYJ.js";
 import {
   DEFAULT_USER_FETCH_TIMEOUT,
-  resultFromPromise,
   safeFetch,
   safeFetchJson,
   safeParseResponse
-} from "./chunk-TRPO7BKD.js";
+} from "./chunk-YQFK4U62.js";
+import {
+  resultFromPromise
+} from "./chunk-6PU3XK6I.js";
 import "./chunk-ISR6DJ53.js";
 
 // src/cli/commands/fetch.ts
@@ -317,348 +327,66 @@ function parseRequestInput(surface, args, flags) {
   return inputResult.data;
 }
 
-// src/cli/commands/fetch.ts
-var SURFACE = "cli:fetch";
-async function fetchCommand(args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  const sessionId = randomBytes(16).toString("hex");
-  const input = parseRequestInput(SURFACE, args, flags);
-  const publicClient = createPublicClient({
-    chain: base,
-    transport: http()
-  });
-  const coreClient = x402Client.fromConfig({
-    schemes: [
-      {
-        network: DEFAULT_NETWORK,
-        client: new ExactEvmScheme(toClientEvmSigner(account, publicClient))
-      }
-    ]
-  });
-  const x402HttpClient = new x402HTTPClient(coreClient);
-  const mppxClient = Mppx.create({
-    polyfill: false,
-    methods: [
-      tempoMethod({
-        account,
-        getClient: () => createClient({ chain: tempo, transport: http(TEMPO_RPC_URL) })
-      })
-    ]
-  });
-  const provider = flags.provider ?? `agentcash@${MCP_VERSION}`;
-  const paymentMethod = args.paymentMethod ?? "auto";
-  const request = buildRequest({
-    input,
-    address: account.address,
-    sessionId,
-    provider
-  });
-  const fetchResult = await createFetchWithPayment({
-    surface: SURFACE,
-    clients: { x402: x402HttpClient, mpp: mppxClient },
-    paymentMethod,
-    account,
-    flags
-  })(request);
-  if (fetchResult.isErr()) {
-    return outputAndExit(fromNeverthrowError(fetchResult), flags);
-  }
-  const { response, paymentInfo } = fetchResult.value;
-  if (!response.ok) {
-    const parseResult = await safeParseResponse(SURFACE, response);
-    const details = { statusCode: response.status };
-    let serverMessage;
-    if (parseResult.isOk()) {
-      const { type } = parseResult.value;
-      if (type === "json") {
-        details.body = parseResult.value.data;
-        serverMessage = extractJsonErrorMessage(parseResult.value.data);
-      } else if (type === "text") {
-        details.body = parseResult.value.data;
-        serverMessage = parseResult.value.data;
-      } else {
-        details.bodyType = type;
-      }
-    }
-    return outputAndExit(
-      errorResponse({
-        code: "HTTP_ERROR",
-        message: serverMessage ?? response.statusText,
-        surface: SURFACE,
-        cause: "http",
-        details
-      }),
-      flags
-    );
-  }
-  const parseResponseResult = await safeParseResponse(SURFACE, response);
-  if (parseResponseResult.isErr()) {
-    return outputAndExit(fromNeverthrowError(parseResponseResult), flags);
-  }
-  const data = parseResponseResult.value.type === "json" ? parseResponseResult.value.data : parseResponseResult.value.type === "text" ? parseResponseResult.value.data : { type: parseResponseResult.value.type };
-  const metadata = paymentInfo ? {
-    protocol: paymentInfo.protocol,
-    ...paymentInfo.price ? { price: paymentInfo.price } : {},
-    ...paymentInfo.payment ? { payment: paymentInfo.payment } : {}
-  } : void 0;
-  outputAndExit(successResponse(data, metadata), flags);
+// src/cli/commands/lib/resolve-origin.ts
+function resolveTitle(result, url) {
+  if (result.info?.title) return result.info.title;
+  const hostname = new URL(url).hostname.replace(/^www\./, "");
+  const parts = hostname.split(".");
+  return parts.length > 1 ? parts.slice(0, -1).join(".") : hostname;
 }
-function extractJsonErrorMessage(body) {
-  if (typeof body === "object" && body !== null) {
-    const obj = body;
-    if (typeof obj.error === "string") return obj.error;
-    if (typeof obj.error === "object" && obj.error !== null && typeof obj.error.message === "string") {
-      return obj.error.message;
-    }
-    if (typeof obj.message === "string") return obj.message;
-  }
-  return void 0;
+function resolveDescription(result) {
+  if (result.info?.description) return result.info.description;
+  if (result.guidance) return result.guidance.slice(0, 100);
+  return null;
 }
-
-// src/cli/commands/fetch-auth.ts
-import { randomBytes as randomBytes2 } from "crypto";
-var SURFACE2 = "cli:fetch-auth";
-async function fetchAuthCommand(args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  const sessionId = randomBytes2(16).toString("hex");
-  const input = parseRequestInput(SURFACE2, args, flags);
-  const result = await createFetchWithAuth({
-    surface: SURFACE2,
-    account,
-    timeout: input.timeout ?? DEFAULT_USER_FETCH_TIMEOUT
-  })(buildRequest({ input, address: account.address, sessionId }));
-  if (result.isErr()) {
-    return outputAndExit(fromNeverthrowError(result), flags);
-  }
-  const value = result.value;
-  if (value.outcome === "no_siwx_extension") {
-    return outputAndExit(
-      errorResponse({
+async function resolveOrigin(rawUrl, surface) {
+  const url = /^https?:\/\//i.test(rawUrl) ? rawUrl : `https://${rawUrl}`;
+  if (!URL.canParse(url)) {
+    return {
+      ok: false,
+      error: errorResponse({
         code: "GENERAL_ERROR",
-        message: "Endpoint returned 402 but no sign-in-with-x extension found. Use `fetch` for paid endpoints.",
-        surface: SURFACE2,
-        cause: "no_siwx_extension",
-        details: { extensions: value.extensions }
-      }),
-      flags
-    );
-  }
-  const { response } = value;
-  if (!response.ok) {
-    return outputAndExit(
-      errorResponse({
-        code: "HTTP_ERROR",
-        message: response.statusText,
-        surface: SURFACE2,
-        cause: "http",
-        details: { statusCode: response.status }
-      }),
-      flags
-    );
-  }
-  const parseResult = await safeParseResponse(SURFACE2, response);
-  if (parseResult.isErr()) {
-    return outputAndExit(fromNeverthrowError(parseResult), flags);
+        message: `Invalid URL: ${url}`,
+        surface,
+        cause: "invalid_url"
+      })
+    };
   }
-  const data = parseResult.value.type === "json" ? parseResult.value.data : parseResult.value.type === "text" ? parseResult.value.data : { type: parseResult.value.type };
-  outputAndExit(successResponse(data), flags);
-}
-
-// src/cli/commands/check.ts
-import { randomBytes as randomBytes3 } from "crypto";
-var SURFACE3 = "cli:check";
-async function checkCommand(args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  const sessionId = randomBytes3(16).toString("hex");
-  const parsedBody = args.body ? JSON.parse(args.body) : void 0;
-  const parsedHeaders = args.headers ? JSON.parse(args.headers) : void 0;
-  const result = await checkEndpoint(
-    SURFACE3,
-    args.url,
-    args.method ? [args.method] : void 0,
-    parsedBody,
-    {
-      ...parsedHeaders,
-      "X-Wallet-Address": account.address,
-      "X-Session-ID": sessionId
-    }
-  );
+  const result = await discoverResources(surface, url);
   if (!result.found) {
-    return outputAndExit(
-      successResponse(
-        toJsonObject({
-          url: args.url,
-          error: result.cause,
-          message: result.message
-        })
-      ),
-      flags
-    );
+    return {
+      ok: false,
+      error: errorResponse({
+        code: "GENERAL_ERROR",
+        message: result.message ?? `No OpenAPI spec found for ${url}`,
+        surface,
+        cause: result.cause
+      })
+    };
   }
-  const results = result.advisories.map((a) => ({
-    ...a,
-    requiresPayment: a.authMode === "paid" || a.authMode === "apiKey+paid"
-  }));
-  return outputAndExit(
-    successResponse(toJsonObject({ url: args.url, results })),
-    flags
-  );
-}
-
-// src/cli/commands/discover.ts
-async function discoverCommand(args, flags) {
-  const result = await discoverResources("cli:discover", args.url, {
-    includeGuidance: args.includeGuidance
-  });
-  if (result.found) {
-    return outputAndExit(
-      successResponse({
-        found: true,
-        origin: result.origin,
-        source: result.source,
-        ...result.info ? { info: result.info } : {},
-        guidanceAvailable: result.guidanceAvailable,
-        ...result.guidanceTokens != null ? { guidanceTokens: result.guidanceTokens } : {},
-        ...result.guidance ? { guidance: result.guidance } : {},
-        endpoints: result.endpoints.map((e) => ({ ...e }))
-      }),
-      flags
+  const description = resolveDescription(result) ?? "";
+  const warnings = [];
+  if (!result.info?.title)
+    warnings.push("No title found in OpenAPI spec; derived from URL.");
+  if (!result.info?.description)
+    warnings.push(
+      description ? "No description found in OpenAPI spec; derived from guidance." : "No description could be found."
     );
-  }
-  const origin = URL.canParse(args.url) ? new URL(args.url).origin : args.url;
-  return outputAndExit(
-    errorResponse({
-      code: "GENERAL_ERROR",
-      message: result.message ?? `No OpenAPI spec found for ${origin}. Tried: /openapi.json, /.well-known/openapi.json`,
-      surface: "cli:discover",
-      cause: result.cause,
-      details: { origin }
-    }),
-    flags
-  );
+  return {
+    ok: true,
+    origin: {
+      url,
+      title: resolveTitle(result, url),
+      description,
+      warnings
+    }
+  };
 }
 
-// src/cli/commands/register.ts
-var SURFACE4 = "cli:register";
-async function registerCommand(args, flags) {
-  const result = await registerOrigin(SURFACE4, { url: args.url }, flags.dev);
-  if (result.isErr()) {
-    return outputAndExit(fromNeverthrowError(result), flags);
-  }
-  const { origin, resourceCount } = result.value;
-  return outputAndExit(
-    successResponse({
-      origin: {
-        id: origin.id,
-        origin: origin.origin,
-        name: origin.name
-      },
-      resourceCount
-    }),
-    flags
-  );
-}
-
-// src/cli/commands/wallet.ts
-var SURFACE5 = "cli:wallet";
-async function walletInfoCommand(_args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  const result = await getWalletInfo(SURFACE5, account.address, flags);
-  if (result.isErr()) {
-    return outputAndExit(fromNeverthrowError(result), flags);
-  }
-  return outputAndExit(
-    successResponse({
-      address: result.value.address,
-      balance: result.value.balance,
-      chains: result.value.chains.map((c) => ({
-        chain: c.chain,
-        balance: c.balance
-      })),
-      isNewWallet: result.value.isNewWallet,
-      depositLink: result.value.depositLink,
-      ...result.value.onboardingCta ? {
-        onboardingCta: {
-          onboardLink: result.value.onboardingCta.onboardLink,
-          depositLink: result.value.onboardingCta.depositLink,
-          message: result.value.onboardingCta.message
-        }
-      } : {},
-      ...result.value.message ? { message: result.value.message } : {}
-    }),
-    flags
-  );
-}
-async function walletRedeemCommand(args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  const result = await redeemInviteCode({
-    code: args.code,
-    address: account.address,
-    surface: SURFACE5,
-    dev: flags.dev
-  });
-  if (result.isErr()) {
-    return outputAndExit(fromNeverthrowError(result), flags);
-  }
-  return outputAndExit(
-    successResponse({
-      redeemed: true,
-      amount: `${result.value.amount} USDC`,
-      txHash: result.value.txHash
-    }),
-    flags
-  );
-}
-async function walletAddressCommand(_args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  return outputAndExit(successResponse({ address: account.address }), flags);
-}
-
-// src/cli/commands/report-error.ts
-var SURFACE6 = "cli:report-error";
-async function reportErrorCommand(args, flags) {
-  const { account } = await getWalletOrExit(flags);
-  const result = await submitErrorReport(
-    SURFACE6,
-    {
-      tool: args.tool,
-      summary: args.summary,
-      errorMessage: args.errorMessage,
-      resource: args.resource,
-      stack: args.stack,
-      fullReport: args.fullReport
-    },
-    account.address,
-    flags.dev
-  );
-  if (result.isErr()) {
-    return outputAndExit(fromNeverthrowError(result), flags);
-  }
-  return outputAndExit(
-    successResponse({
-      submitted: result.value.submitted,
-      reportId: result.value.reportId,
-      message: result.value.message
-    }),
-    flags
-  );
-}
-
-// src/cli/commands/server.ts
-async function serverCommand(flags) {
-  if (process.stdout.isTTY) {
-    process.stdout.write(
-      "MCP server started. If you meant to explore the CLI, run: npx agentcash --help\n"
-    );
-  }
-  const { startServer } = await import("./server-VU3UAM7K.js");
-  await startServer(flags);
-}
-
-// src/cli/commands/add-skill.ts
-import * as fs2 from "fs/promises";
-import * as os2 from "os";
-import * as path2 from "path";
+// src/cli/commands/lib/add-origin-skill.ts
+import * as fs2 from "fs/promises";
+import * as os2 from "os";
+import * as path2 from "path";
 
 // src/shared/skills/agents.ts
 import * as fs from "fs";
@@ -829,175 +557,558 @@ var all = [
 function detect() {
   return all.filter((a) => a.detect());
 }
-function installSkills(sourceDir, options = {}) {
-  const isGlobal = options.global !== false;
-  const cwd = options.cwd ?? process.cwd();
-  const base2 = isGlobal ? home : cwd;
-  const canonicalBase = path.join(base2, ".agents", "skills");
-  const detected = options.agents ?? detect();
-  const paths = [];
-  const agents = [];
-  for (const skill of discoverSkills(sourceDir)) {
-    const canonicalDir = path.join(canonicalBase, skill.name);
-    rmForce(canonicalDir);
-    fs.mkdirSync(canonicalDir, { recursive: true });
-    if (skill.root)
-      fs.copyFileSync(
-        path.join(skill.dir, "SKILL.md"),
-        path.join(canonicalDir, "SKILL.md")
-      );
-    else fs.cpSync(skill.dir, canonicalDir, { recursive: true });
-    paths.push(canonicalDir);
-    for (const agent of detected) {
-      if (agent.universal) continue;
-      const agentSkillsDir = isGlobal ? agent.globalSkillsDir : path.join(cwd, agent.projectSkillsDir);
-      const agentDir = path.join(agentSkillsDir, skill.name);
-      if (agentDir === canonicalDir) continue;
-      try {
-        rmForce(agentDir);
-        fs.mkdirSync(path.dirname(agentDir), { recursive: true });
-        const realLinkDir = resolveParent(path.dirname(agentDir));
-        const realTarget = resolveParent(canonicalDir);
-        const rel = path.relative(realLinkDir, realTarget);
-        fs.symlinkSync(rel, agentDir);
-        agents.push({ agent: agent.name, path: agentDir, mode: "symlink" });
-      } catch {
-        try {
-          fs.cpSync(canonicalDir, agentDir, { recursive: true });
-          agents.push({ agent: agent.name, path: agentDir, mode: "copy" });
-        } catch {
-        }
-      }
-    }
+function installSkills(sourceDir, options = {}) {
+  const isGlobal = options.global !== false;
+  const cwd = options.cwd ?? process.cwd();
+  const base2 = isGlobal ? home : cwd;
+  const canonicalBase = path.join(base2, ".agents", "skills");
+  const detected = options.agents ?? detect();
+  const paths = [];
+  const agents = [];
+  for (const skill of discoverSkills(sourceDir)) {
+    const canonicalDir = path.join(canonicalBase, skill.name);
+    rmForce(canonicalDir);
+    fs.mkdirSync(canonicalDir, { recursive: true });
+    if (skill.root)
+      fs.copyFileSync(
+        path.join(skill.dir, "SKILL.md"),
+        path.join(canonicalDir, "SKILL.md")
+      );
+    else fs.cpSync(skill.dir, canonicalDir, { recursive: true });
+    paths.push(canonicalDir);
+    for (const agent of detected) {
+      if (agent.universal) continue;
+      const agentSkillsDir = isGlobal ? agent.globalSkillsDir : path.join(cwd, agent.projectSkillsDir);
+      const agentDir = path.join(agentSkillsDir, skill.name);
+      if (agentDir === canonicalDir) continue;
+      try {
+        rmForce(agentDir);
+        fs.mkdirSync(path.dirname(agentDir), { recursive: true });
+        const realLinkDir = resolveParent(path.dirname(agentDir));
+        const realTarget = resolveParent(canonicalDir);
+        const rel = path.relative(realLinkDir, realTarget);
+        fs.symlinkSync(rel, agentDir);
+        agents.push({ agent: agent.name, path: agentDir, mode: "symlink" });
+      } catch {
+        try {
+          fs.cpSync(canonicalDir, agentDir, { recursive: true });
+          agents.push({ agent: agent.name, path: agentDir, mode: "copy" });
+        } catch {
+        }
+      }
+    }
+  }
+  return { paths, agents };
+}
+function discoverSkills(rootDir) {
+  const results = [];
+  function visit(dir) {
+    let entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const subDir = path.join(dir, entry.name);
+      const skillPath = path.join(subDir, "SKILL.md");
+      if (fs.existsSync(skillPath)) {
+        const content = fs.readFileSync(skillPath, "utf8");
+        const nameMatch = /^name:\s*(.+)$/m.exec(content);
+        results.push({
+          name: sanitizeName(nameMatch?.[1] ?? entry.name),
+          dir: subDir
+        });
+      }
+      visit(subDir);
+    }
+  }
+  visit(rootDir);
+  const rootSkill = path.join(rootDir, "SKILL.md");
+  if (fs.existsSync(rootSkill)) {
+    const content = fs.readFileSync(rootSkill, "utf8");
+    const nameMatch = /^name:\s*(.+)$/m.exec(content);
+    const name = sanitizeName(nameMatch?.[1] ?? "skill");
+    if (!results.some((r) => r.name === name))
+      results.push({ name, dir: rootDir, root: true });
+  }
+  return results;
+}
+function sanitizeName(name) {
+  return name.trim().replace(/[/\\]/g, "-").replace(/\.\./g, "").slice(0, 255);
+}
+function rmForce(target) {
+  try {
+    const stat = fs.lstatSync(target);
+    if (stat.isSymbolicLink()) fs.unlinkSync(target);
+    else fs.rmSync(target, { recursive: true, force: true });
+  } catch {
+  }
+}
+function resolveParent(dir) {
+  try {
+    return fs.realpathSync(dir);
+  } catch {
+    const parent = path.dirname(dir);
+    if (parent === dir) return dir;
+    try {
+      return path.join(fs.realpathSync(parent), path.relative(parent, dir));
+    } catch {
+      return dir;
+    }
+  }
+}
+
+// src/cli/commands/lib/add-origin-skill.ts
+async function addOriginSkill(origin, surface, options) {
+  const title = origin.title.toLowerCase().replace(/[ .]/g, "-");
+  const tmpDir = await fs2.mkdtemp(path2.join(os2.tmpdir(), "incur-skill-add-"));
+  const result = await resultFromPromise(
+    "add-origin-skill",
+    surface,
+    (async () => {
+      const skillDir = path2.join(tmpDir, title);
+      await fs2.mkdir(skillDir, { recursive: true });
+      await fs2.writeFile(
+        path2.join(skillDir, "SKILL.md"),
+        `---
+name: ${title}
+description: ${origin.description}
+command: npx agentcash discover ${origin.url}
+---
+Call \`npx agentcash discover ${origin.url}\` to discover how to use ${origin.title}.`
+      );
+      return installSkills(tmpDir, { cwd: options.cwd });
+    })(),
+    (e) => ({
+      cause: "install_failed",
+      message: e instanceof Error ? e.message : "Skill could not be written to /skills directory."
+    })
+  );
+  await fs2.rm(tmpDir, { recursive: true, force: true }).catch(() => void 0);
+  return result;
+}
+
+// src/cli/commands/fetch.ts
+var SURFACE = "cli:fetch";
+async function fetchCommand(args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  const sessionId = randomBytes(16).toString("hex");
+  const input = parseRequestInput(SURFACE, args, flags);
+  const publicClient = createPublicClient({
+    chain: base,
+    transport: http()
+  });
+  const coreClient = x402Client.fromConfig({
+    schemes: [
+      {
+        network: DEFAULT_NETWORK,
+        client: new ExactEvmScheme(toClientEvmSigner(account, publicClient))
+      }
+    ]
+  });
+  const x402HttpClient = new x402HTTPClient(coreClient);
+  const mppxClient = Mppx.create({
+    polyfill: false,
+    methods: [
+      tempoMethod({
+        account,
+        getClient: () => createClient({ chain: tempo, transport: http(TEMPO_RPC_URL) })
+      })
+    ]
+  });
+  const provider = flags.provider ?? `agentcash@${MCP_VERSION}`;
+  const paymentMethod = args.paymentMethod ?? "auto";
+  const request = buildRequest({
+    input,
+    address: account.address,
+    sessionId,
+    provider
+  });
+  const fetchResult = await createFetchWithPayment({
+    surface: SURFACE,
+    clients: { x402: x402HttpClient, mpp: mppxClient },
+    paymentMethod,
+    account,
+    flags
+  })(request);
+  if (fetchResult.isErr()) {
+    return outputAndExit(fromNeverthrowError(fetchResult), flags);
+  }
+  const { response, paymentInfo } = fetchResult.value;
+  if (!response.ok) {
+    const parseResult = await safeParseResponse(SURFACE, response);
+    const details = { statusCode: response.status };
+    let serverMessage;
+    if (parseResult.isOk()) {
+      const { type } = parseResult.value;
+      if (type === "json") {
+        details.body = parseResult.value.data;
+        serverMessage = extractJsonErrorMessage(parseResult.value.data);
+      } else if (type === "text") {
+        details.body = parseResult.value.data;
+        serverMessage = parseResult.value.data;
+      } else {
+        details.bodyType = type;
+      }
+    }
+    return outputAndExit(
+      errorResponse({
+        code: "HTTP_ERROR",
+        message: serverMessage ?? response.statusText,
+        surface: SURFACE,
+        cause: "http",
+        details
+      }),
+      flags
+    );
+  }
+  const parseResponseResult = await safeParseResponse(SURFACE, response);
+  if (parseResponseResult.isErr()) {
+    return outputAndExit(fromNeverthrowError(parseResponseResult), flags);
+  }
+  const data = parseResponseResult.value.type === "json" ? parseResponseResult.value.data : parseResponseResult.value.type === "text" ? parseResponseResult.value.data : { type: parseResponseResult.value.type };
+  const metadata = paymentInfo ? {
+    protocol: paymentInfo.protocol,
+    ...paymentInfo.price ? { price: paymentInfo.price } : {},
+    ...paymentInfo.payment ? { payment: paymentInfo.payment } : {}
+  } : void 0;
+  outputAndExit(successResponse(data, metadata), flags);
+}
+function extractJsonErrorMessage(body) {
+  if (typeof body === "object" && body !== null) {
+    const obj = body;
+    if (typeof obj.error === "string") return obj.error;
+    if (typeof obj.error === "object" && obj.error !== null && typeof obj.error.message === "string") {
+      return obj.error.message;
+    }
+    if (typeof obj.message === "string") return obj.message;
+  }
+  return void 0;
+}
+
+// src/cli/commands/fetch-auth.ts
+import { randomBytes as randomBytes2 } from "crypto";
+var SURFACE2 = "cli:fetch-auth";
+async function fetchAuthCommand(args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  const sessionId = randomBytes2(16).toString("hex");
+  const input = parseRequestInput(SURFACE2, args, flags);
+  const result = await createFetchWithAuth({
+    surface: SURFACE2,
+    account,
+    timeout: input.timeout ?? DEFAULT_USER_FETCH_TIMEOUT
+  })(buildRequest({ input, address: account.address, sessionId }));
+  if (result.isErr()) {
+    return outputAndExit(fromNeverthrowError(result), flags);
+  }
+  const value = result.value;
+  if (value.outcome === "no_siwx_extension") {
+    return outputAndExit(
+      errorResponse({
+        code: "GENERAL_ERROR",
+        message: "Endpoint returned 402 but no sign-in-with-x extension found. Use `fetch` for paid endpoints.",
+        surface: SURFACE2,
+        cause: "no_siwx_extension",
+        details: { extensions: value.extensions }
+      }),
+      flags
+    );
+  }
+  const { response } = value;
+  if (!response.ok) {
+    return outputAndExit(
+      errorResponse({
+        code: "HTTP_ERROR",
+        message: response.statusText,
+        surface: SURFACE2,
+        cause: "http",
+        details: { statusCode: response.status }
+      }),
+      flags
+    );
+  }
+  const parseResult = await safeParseResponse(SURFACE2, response);
+  if (parseResult.isErr()) {
+    return outputAndExit(fromNeverthrowError(parseResult), flags);
+  }
+  const data = parseResult.value.type === "json" ? parseResult.value.data : parseResult.value.type === "text" ? parseResult.value.data : { type: parseResult.value.type };
+  outputAndExit(successResponse(data), flags);
+}
+
+// src/cli/commands/check.ts
+import { randomBytes as randomBytes3 } from "crypto";
+var SURFACE3 = "cli:check";
+async function checkCommand(args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  const sessionId = randomBytes3(16).toString("hex");
+  const parsedBody = args.body ? JSON.parse(args.body) : void 0;
+  const parsedHeaders = args.headers ? JSON.parse(args.headers) : void 0;
+  const result = await checkEndpoint(
+    SURFACE3,
+    args.url,
+    args.method ? [args.method] : void 0,
+    parsedBody,
+    {
+      ...parsedHeaders,
+      "X-Wallet-Address": account.address,
+      "X-Session-ID": sessionId
+    }
+  );
+  if (!result.found) {
+    return outputAndExit(
+      successResponse(
+        toJsonObject({
+          url: args.url,
+          error: result.cause,
+          message: result.message
+        })
+      ),
+      flags
+    );
+  }
+  const results = result.advisories.map((a) => ({
+    ...a,
+    requiresPayment: a.authMode === "paid" || a.authMode === "apiKey+paid"
+  }));
+  return outputAndExit(
+    successResponse(toJsonObject({ url: args.url, results })),
+    flags
+  );
+}
+
+// src/cli/commands/discover.ts
+async function discoverCommand(args, flags) {
+  const result = await discoverResources("cli:discover", args.url, {
+    includeGuidance: args.includeGuidance
+  });
+  if (result.found) {
+    return outputAndExit(
+      successResponse({
+        found: true,
+        origin: result.origin,
+        source: result.source,
+        ...result.info ? { info: result.info } : {},
+        guidanceAvailable: result.guidanceAvailable,
+        ...result.guidanceTokens != null ? { guidanceTokens: result.guidanceTokens } : {},
+        ...result.guidance ? { guidance: result.guidance } : {},
+        endpoints: result.endpoints.map((e) => ({ ...e }))
+      }),
+      flags
+    );
+  }
+  const origin = URL.canParse(args.url) ? new URL(args.url).origin : args.url;
+  return outputAndExit(
+    errorResponse({
+      code: "GENERAL_ERROR",
+      message: result.message ?? `No OpenAPI spec found for ${origin}. Tried: /openapi.json, /.well-known/x402`,
+      surface: "cli:discover",
+      cause: result.cause,
+      details: { origin }
+    }),
+    flags
+  );
+}
+
+// src/cli/commands/register.ts
+var SURFACE4 = "cli:register";
+async function registerCommand(args, flags) {
+  const result = await registerOrigin(SURFACE4, { url: args.url }, flags.dev);
+  if (result.isErr()) {
+    return outputAndExit(fromNeverthrowError(result), flags);
   }
-  return { paths, agents };
+  const { origin, resourceCount } = result.value;
+  return outputAndExit(
+    successResponse({
+      origin: {
+        id: origin.id,
+        origin: origin.origin,
+        name: origin.name
+      },
+      resourceCount
+    }),
+    flags
+  );
 }
-function discoverSkills(rootDir) {
-  const results = [];
-  function visit(dir) {
-    let entries;
-    try {
-      entries = fs.readdirSync(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const subDir = path.join(dir, entry.name);
-      const skillPath = path.join(subDir, "SKILL.md");
-      if (fs.existsSync(skillPath)) {
-        const content = fs.readFileSync(skillPath, "utf8");
-        const nameMatch = /^name:\s*(.+)$/m.exec(content);
-        results.push({
-          name: sanitizeName(nameMatch?.[1] ?? entry.name),
-          dir: subDir
-        });
-      }
-      visit(subDir);
-    }
+
+// src/cli/commands/wallet.ts
+var SURFACE5 = "cli:wallet";
+async function walletInfoCommand(_args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  const result = await getWalletInfo(SURFACE5, account.address, flags);
+  if (result.isErr()) {
+    return outputAndExit(fromNeverthrowError(result), flags);
   }
-  visit(rootDir);
-  const rootSkill = path.join(rootDir, "SKILL.md");
-  if (fs.existsSync(rootSkill)) {
-    const content = fs.readFileSync(rootSkill, "utf8");
-    const nameMatch = /^name:\s*(.+)$/m.exec(content);
-    const name = sanitizeName(nameMatch?.[1] ?? "skill");
-    if (!results.some((r) => r.name === name))
-      results.push({ name, dir: rootDir, root: true });
+  return outputAndExit(
+    successResponse({
+      address: result.value.address,
+      balance: result.value.balance,
+      chains: result.value.chains.map((c) => ({
+        chain: c.chain,
+        balance: c.balance
+      })),
+      isNewWallet: result.value.isNewWallet,
+      depositLink: result.value.depositLink,
+      ...result.value.onboardingCta ? {
+        onboardingCta: {
+          onboardLink: result.value.onboardingCta.onboardLink,
+          depositLink: result.value.onboardingCta.depositLink,
+          message: result.value.onboardingCta.message
+        }
+      } : {},
+      ...result.value.message ? { message: result.value.message } : {}
+    }),
+    flags
+  );
+}
+async function walletRedeemCommand(args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  const result = await redeemInviteCode({
+    code: args.code,
+    address: account.address,
+    surface: SURFACE5,
+    dev: flags.dev
+  });
+  if (result.isErr()) {
+    return outputAndExit(fromNeverthrowError(result), flags);
   }
-  return results;
+  return outputAndExit(
+    successResponse({
+      redeemed: true,
+      amount: `${result.value.amount} USDC`,
+      txHash: result.value.txHash
+    }),
+    flags
+  );
 }
-function sanitizeName(name) {
-  return name.trim().replace(/[/\\]/g, "-").replace(/\.\./g, "").slice(0, 255);
+async function walletAddressCommand(_args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  return outputAndExit(successResponse({ address: account.address }), flags);
 }
-function rmForce(target) {
-  try {
-    const stat = fs.lstatSync(target);
-    if (stat.isSymbolicLink()) fs.unlinkSync(target);
-    else fs.rmSync(target, { recursive: true, force: true });
-  } catch {
+
+// src/cli/commands/report-error.ts
+var SURFACE6 = "cli:report-error";
+async function reportErrorCommand(args, flags) {
+  const { account } = await getWalletOrExit(flags);
+  const result = await submitErrorReport(
+    SURFACE6,
+    {
+      tool: args.tool,
+      summary: args.summary,
+      errorMessage: args.errorMessage,
+      resource: args.resource,
+      stack: args.stack,
+      fullReport: args.fullReport
+    },
+    account.address,
+    flags.dev
+  );
+  if (result.isErr()) {
+    return outputAndExit(fromNeverthrowError(result), flags);
   }
+  return outputAndExit(
+    successResponse({
+      submitted: result.value.submitted,
+      reportId: result.value.reportId,
+      message: result.value.message
+    }),
+    flags
+  );
 }
-function resolveParent(dir) {
-  try {
-    return fs.realpathSync(dir);
-  } catch {
-    const parent = path.dirname(dir);
-    if (parent === dir) return dir;
-    try {
-      return path.join(fs.realpathSync(parent), path.relative(parent, dir));
-    } catch {
-      return dir;
-    }
+
+// src/cli/commands/server.ts
+async function serverCommand(flags) {
+  if (process.stdout.isTTY) {
+    process.stdout.write(
+      "MCP server started. If you meant to explore the CLI, run: npx agentcash --help\n"
+    );
   }
+  const { startServer } = await import("./server-QARME5NA.js");
+  await startServer(flags);
 }
 
 // src/cli/commands/add-skill.ts
 var SURFACE7 = "cli:add-skill";
 async function addSkillCommand(args, flags) {
-  if (!/^https?:\/\//i.test(args.url)) {
-    args.url = `https://${args.url}`;
-  }
-  if (!URL.canParse(args.url)) {
-    return outputAndExit(
-      errorResponse({
-        code: "GENERAL_ERROR",
-        message: `Invalid URL: ${args.url}`,
-        surface: SURFACE7,
-        cause: "invalid_url"
-      })
-    );
-  }
-  const result = await discoverResources("cli:add-skill", args.url);
-  if (!result.found) {
-    return outputAndExit(
-      errorResponse({
-        code: "GENERAL_ERROR",
-        message: result.message ?? `No OpenAPI spec found for ${args.url}`,
-        surface: SURFACE7,
-        cause: result.cause
-      }),
-      flags
+  const resolved = await resolveOrigin(args.url, SURFACE7);
+  if (!resolved.ok) return outputAndExit(resolved.error, flags);
+  const { origin } = resolved;
+  addUserOrigin(origin);
+  const skillResult = await addOriginSkill(origin, SURFACE7, {
+    cwd: process.cwd()
+  });
+  if (!skillResult.isOk()) {
+    origin.warnings.push(
+      "Failed to install skill: " + skillResult.error.cause + " " + skillResult.error.message
     );
   }
-  if (!result.info?.title) {
-    return outputAndExit(
-      errorResponse({
-        code: "GENERAL_ERROR",
-        message: `No description found for ${args.url}`,
-        surface: SURFACE7,
-        cause: "no_description"
+  const installedPaths = skillResult.isOk() ? skillResult.value.paths : [];
+  return outputAndExit(
+    successResponse(
+      toJsonObject({
+        url: origin.url,
+        title: origin.title,
+        description: origin.description,
+        installed: installedPaths,
+        note: "Restart your MCP server for this origin to appear in the model context.",
+        ...origin.warnings.length > 0 && { warnings: origin.warnings }
       })
-    );
-  }
-  const title = result.info.title.toLowerCase().replace(/[ .]/g, "-");
-  const tmpDir = await fs2.mkdtemp(path2.join(os2.tmpdir(), "incur-skill-add-"));
-  try {
-    const skillDir = path2.join(tmpDir, title);
-    await fs2.mkdir(skillDir, { recursive: true });
-    await fs2.writeFile(
-      path2.join(skillDir, "SKILL.md"),
-      `---
-name: ${title}
-description: ${result.info.description}
-command: npx agentcash discover ${args.url}
----
-Call \`npx agentcash discover ${args.url}\` to discover how to use ${result.info.title}.`
-    );
-    const installResult = installSkills(tmpDir, {
-      cwd: process.cwd()
-    });
+    ),
+    flags
+  );
+}
+
+// src/cli/commands/origins.ts
+var SURFACE8 = "cli:origins";
+async function originsAddCommand(args, flags) {
+  const resolved = await resolveOrigin(args.url, SURFACE8);
+  if (!resolved.ok) return outputAndExit(resolved.error, flags);
+  const origin = addUserOrigin(resolved.origin);
+  return outputAndExit(
+    successResponse({
+      url: origin.url,
+      title: origin.title,
+      description: origin.description,
+      note: "Restart your MCP server for this origin to appear in the model context.",
+      ...resolved.origin.warnings.length > 0 && {
+        warnings: resolved.origin.warnings
+      }
+    }),
+    flags
+  );
+}
+function originsListCommand(_args, flags) {
+  const primary = PRIMARY_ORIGINS.flatMap((o) => {
+    const meta = ORIGIN_METADATA[o];
+    return meta ? [{ url: o, title: meta.title, description: meta.description }] : [];
+  });
+  const added = loadUserOrigins();
+  return outputAndExit(successResponse({ primary, added }), flags);
+}
+function originsRemoveCommand(args, flags) {
+  const url = /^https?:\/\//i.test(args.url) ? args.url : `https://${args.url}`;
+  const result = removeUserOrigin(url);
+  if (!result.removed) {
+    const isPrimary = PRIMARY_ORIGINS.some((o) => String(o) === url);
     return outputAndExit(
-      successResponse(
-        toJsonObject({
-          installed: installResult.paths
-        })
+      errorResponse(
+        isPrimary ? {
+          code: "GENERAL_ERROR",
+          message: `Cannot remove primary origin: ${url}. Only user-added origins can be removed.`,
+          surface: SURFACE8,
+          cause: "primary_origin"
+        } : {
+          code: "GENERAL_ERROR",
+          message: `Origin not found: ${url}`,
+          surface: SURFACE8,
+          cause: "not_found"
+        }
       ),
       flags
     );
-  } finally {
-    await fs2.rm(tmpDir, { recursive: true, force: true });
   }
+  return outputAndExit(successResponse({ removed: true, url }), flags);
 }
 
 // src/cli/commands/onboard.ts
@@ -1017,7 +1128,7 @@ var agentClientMap = {
   Cursor: "cursor" /* Cursor */,
   "Gemini CLI": "gemini-cli" /* GeminiCli */,
   Goose: "goose" /* Goose */,
-  OpenCode: "opencode" /* Opencode */,
+  OpenCode: "opencode" /* OpenCode */,
   Roo: "roo-cline" /* RooCline */,
   Windsurf: "windsurf" /* Windsurf */
 };
@@ -1225,7 +1336,7 @@ function formatDemoPromptsJson(baseUrl) {
 }
 
 // src/cli/commands/onboard.ts
-var SURFACE8 = "cli:onboard";
+var SURFACE9 = "cli:onboard";
 var AGENTCASH_SKILL = {
   owner: "merit-systems",
   repo: "agentcash-skills",
@@ -1287,14 +1398,14 @@ function installAgentcashWalletSkill() {
   const detectedAgents = detect();
   return resultFromPromise(
     "skill",
-    SURFACE8,
+    SURFACE9,
     (async () => {
       const tmpDir = await fs5.mkdtemp(
         path5.join(os4.tmpdir(), "agentcash-onboard-")
       );
       const installPromise = (async () => {
         const downloaded = await downloadGitHubSkill(
-          SURFACE8,
+          SURFACE9,
           AGENTCASH_SKILL,
           tmpDir
         );
@@ -1357,7 +1468,7 @@ async function onboardCommand(args, flags) {
       errorResponse({
         code: "GENERAL_ERROR",
         message: skillInstallResult.error.message,
-        surface: SURFACE8,
+        surface: SURFACE9,
         cause: "skill_install_failed"
       }),
       flags
@@ -1374,7 +1485,7 @@ async function onboardCommand(args, flags) {
       address,
       code: args.code,
       dev: flags.dev,
-      surface: SURFACE8
+      surface: SURFACE9
     });
     if (redeemResult.isErr()) {
       const format2 = getOutputFormat(flags.format);
@@ -1425,7 +1536,7 @@ async function onboardCommand(args, flags) {
     redeemValue = redeemResult.value;
   }
   progress(flags, "Fetching wallet balance...");
-  const walletInfoResult = await getWalletInfo(SURFACE8, address, flags);
+  const walletInfoResult = await getWalletInfo(SURFACE9, address, flags);
   const walletInfo = walletInfoResult.isOk() ? walletInfoResult.value : void 0;
   if (!args.code && (!walletInfo?.balance || walletInfo.balance <= 0)) {
     const cta = getOnboardingCta(address, flags);
@@ -1433,7 +1544,7 @@ async function onboardCommand(args, flags) {
       errorResponse({
         code: "GENERAL_ERROR",
         message: cta.message,
-        surface: SURFACE8,
+        surface: SURFACE9,
         cause: "no_funds"
       }),
       flags
@@ -1556,6 +1667,12 @@ async function tryCommand(args, flags) {
       `If you have the AgentCash MCP installed, you can also call this directly using the check_endpoint_schema and fetch tools.`
     ].join("\n");
   }
+  const modelInstructions = [
+    `Present the originSummary to the user, then ask them what they would like to do \u2014 e.g. "What would you like to do with ${title}?"`,
+    ...onboardingCta ? [
+      `IMPORTANT: The user has not yet onboarded. Show the onboard link VERBATIM as a clickable URL so the user can click it: ${onboardingCta.onboardLink}`
+    ] : []
+  ].join("\n");
   return outputAndExit(
     successResponse({
       ...onboardingCta ? {
@@ -1563,7 +1680,8 @@ async function tryCommand(args, flags) {
         onboardLink: onboardingCta.onboardLink
       } : {},
       originSummary,
-      ...callToAction ? { callToAction } : {}
+      ...callToAction ? { callToAction } : {},
+      modelInstructions
     }),
     flags
   );
@@ -1575,6 +1693,9 @@ export {
   fetchAuthCommand,
   fetchCommand,
   onboardCommand,
+  originsAddCommand,
+  originsListCommand,
+  originsRemoveCommand,
   registerCommand,
   reportErrorCommand,
   serverCommand,
@@ -1583,4 +1704,4 @@ export {
   walletInfoCommand,
   walletRedeemCommand
 };
-//# sourceMappingURL=commands-IFU565JX.js.map
+//# sourceMappingURL=commands-YSOBBE4N.js.map