@web42/cli 0.2.7 → 0.2.9

package/dist/commands/search.js

@@ -2,6 +2,16 @@ import { Command } from "commander";
 import chalk from "chalk";
 import ora from "ora";
 import { apiGet } from "../utils/api.js";
+function getCardName(card) {
+    return card?.name ?? "Untitled Agent";
+}
+function getCardDescription(card) {
+    return card?.description ?? "";
+}
+function getMarketplacePrice(card) {
+    const ext = card?.capabilities?.extensions?.find((e) => e.uri === "https://web42.ai/ext/marketplace/v1");
+    return ext?.params?.price_cents ?? 0;
+}
 function truncate(str, max) {
     if (str.length <= max)
         return str;
@@ -10,7 +20,6 @@ function truncate(str, max) {
 export const searchCommand = new Command("search")
     .description("Search the marketplace for agents")
     .argument("<query>", "Search query")
-    .option("-p, --platform <platform>", "Filter results by platform (e.g. openclaw)")
     .option("-l, --limit <number>", "Max results to show", "10")
     .action(async (query, opts) => {
     const spinner = ora(`Searching for "${query}"...`).start();
@@ -26,24 +35,20 @@ export const searchCommand = new Command("search")
         console.log(chalk.bold(`Found ${agents.length} agent(s) for "${query}":`));
         console.log();
         for (const agent of results) {
+            const name = getCardName(agent.agent_card);
+            const description = getCardDescription(agent.agent_card);
+            const priceCents = getMarketplacePrice(agent.agent_card);
             const ref = `@${agent.owner.username}/${agent.slug}`;
             const stars = agent.stars_count > 0 ? chalk.yellow(` \u2605 ${agent.stars_count}`) : "";
-            const price = agent.price_cents > 0
-                ? chalk.green(` $${(agent.price_cents / 100).toFixed(2)}`)
+            const price = priceCents > 0
+                ? chalk.green(` $${(priceCents / 100).toFixed(2)}`)
                 : chalk.dim(" Free");
-            console.log(`  ${chalk.cyan.bold(agent.name)}${stars}${price}`);
+            console.log(`  ${chalk.cyan.bold(name)}${stars}${price}`);
             console.log(`  ${chalk.dim(ref)}`);
-            if (agent.description) {
-                console.log(`  ${truncate(agent.description, 80)}`);
-            }
-            const platform = agent.manifest?.platform ?? "openclaw";
-            if (agent.price_cents > 0) {
-                const siteUrl = process.env.WEB42_API_URL ?? "https://web42.ai";
-                console.log(chalk.dim(`  Purchase: ${siteUrl}/${agent.owner.username}/${agent.slug}`));
-            }
-            else {
-                console.log(chalk.dim(`  Install: web42 ${platform} install ${ref}`));
+            if (description) {
+                console.log(`  ${truncate(description, 80)}`);
             }
+            console.log(chalk.dim(`  Send: web42 send ${agent.slug} "hello"`));
             console.log();
         }
         if (agents.length > limit) {
@@ -52,7 +57,7 @@ export const searchCommand = new Command("search")
     }
     catch (error) {
         spinner.fail("Search failed");
-        console.error(chalk.red(error.message));
+        console.error(chalk.red(String(error)));
         process.exit(1);
     }
 });

package/dist/commands/send.js

@@ -3,44 +3,85 @@ import chalk from "chalk";
 import ora from "ora";
 import { v4 as uuidv4 } from "uuid";
 import { requireAuth, setConfigValue, getConfigValue } from "../utils/config.js";
-import { apiGet } from "../utils/api.js";
+import { apiPost } from "../utils/api.js";
+function isUrl(s) {
+    return s.startsWith("http://") || s.startsWith("https://");
+}
+function getCachedToken(slug) {
+    const raw = getConfigValue(`agentTokens.${slug}`);
+    if (!raw)
+        return null;
+    try {
+        const cached = typeof raw === "string" ? JSON.parse(raw) : raw;
+        if (new Date(cached.expiresAt) <= new Date())
+            return null;
+        return cached;
+    }
+    catch {
+        return null;
+    }
+}
 export const sendCommand = new Command("send")
-    .description("Send a message to a live web42 agent")
-    .argument("<agent>", "Agent handle, e.g. @javier/gilfoyle")
+    .description("Send a message to an A2A agent")
+    .argument("<agent>", "Agent slug (e.g. my-agent) or direct URL (http://localhost:3001)")
     .argument("<message>", "Message to send")
     .option("--new", "Start a new conversation (clears saved context)")
-    .action(async (agentHandle, userMessage, opts) => {
+    .option("--context <id>", "Use a specific context ID")
+    .action(async (agent, userMessage, opts) => {
     const config = requireAuth();
-    // 1. Parse @user/slug
-    const match = agentHandle.match(/^@?([\w-]+)\/([\w-]+)$/);
-    if (!match) {
-        console.error(chalk.red("Invalid agent handle. Expected format: @user/agent-slug"));
-        process.exit(1);
-    }
-    const [, username, slug] = match;
-    // 2. Look up agent A2A URL from marketplace
-    const spinner = ora(`Looking up @${username}/${slug}...`).start();
-    let a2aData;
-    try {
-        a2aData = await apiGet(`/api/agents/${slug}/a2a`);
+    let agentUrl;
+    let bearerToken;
+    let agentKey;
+    if (isUrl(agent)) {
+        // Direct URL mode — local development, no handshake needed
+        agentUrl = agent;
+        bearerToken = config.token;
+        agentKey = new URL(agent).host.replace(/[.:]/g, "-");
     }
-    catch {
-        spinner.fail(`Agent @${username}/${slug} not found`);
-        process.exit(1);
+    else {
+        // Slug mode — handshake with Web42 platform
+        agentKey = agent;
+        const cached = getCachedToken(agent);
+        if (cached) {
+            agentUrl = cached.agentUrl;
+            bearerToken = cached.token;
+        }
+        else {
+            const spinner = ora(`Authenticating with ${agent}...`).start();
+            try {
+                const res = await apiPost("/api/auth/handshake", {
+                    agentSlug: agent,
+                });
+                agentUrl = res.agentUrl;
+                bearerToken = res.token;
+                setConfigValue(`agentTokens.${agent}`, JSON.stringify({
+                    token: res.token,
+                    agentUrl: res.agentUrl,
+                    expiresAt: res.expiresAt,
+                }));
+                spinner.succeed(`Authenticated with ${agent}`);
+            }
+            catch (err) {
+                spinner.fail(`Failed to authenticate with ${agent}`);
+                console.error(chalk.red(String(err)));
+                process.exit(1);
+            }
+        }
     }
-    if (!a2aData.a2a_enabled || !a2aData.a2a_url) {
-        spinner.fail(`@${username}/${slug} is not live. Publisher must run: web42 serve --url <url>`);
-        process.exit(1);
+    // Resolve contextId
+    const contextKey = `context.${agentKey}`;
+    let contextId;
+    if (opts.context) {
+        contextId = opts.context;
     }
-    spinner.stop();
-    // 3. Resolve contextId — reuse existing session or start fresh
-    const contextKey = `context.${username}.${slug}`;
-    let contextId = getConfigValue(contextKey) ?? uuidv4();
-    if (opts.new) {
+    else if (opts.new) {
         contextId = uuidv4();
     }
+    else {
+        contextId = getConfigValue(contextKey) ?? uuidv4();
+    }
     setConfigValue(contextKey, contextId);
-    // 4. Dynamically import @a2a-js/sdk client (ESM)
+    // Dynamically import @a2a-js/sdk client
     let ClientFactory;
     let JsonRpcTransportFactory;
     let ClientFactoryOptions;
@@ -54,22 +95,18 @@ export const sendCommand = new Command("send")
         console.error(chalk.red("Failed to load @a2a-js/sdk. Run: pnpm add @a2a-js/sdk"));
         process.exit(1);
     }
-    // 5. Bearer token interceptor
-    const token = config.token;
     const bearerInterceptor = {
         before: async (args) => {
-            if (!args.options) {
+            if (!args.options)
                 args.options = {};
-            }
             args.options.serviceParameters = {
                 ...(args.options.serviceParameters ?? {}),
-                Authorization: `Bearer ${token}`,
+                Authorization: `Bearer ${bearerToken}`,
             };
         },
         after: async () => { },
     };
-    // 6. Create A2A client
-    const connectSpinner = ora(`Connecting to @${username}/${slug}...`).start();
+    const connectSpinner = ora(`Connecting to ${agentKey}...`).start();
     let client;
     try {
         const factory = new ClientFactory(ClientFactoryOptions.createFrom(ClientFactoryOptions.default, {
@@ -78,18 +115,15 @@ export const sendCommand = new Command("send")
                 interceptors: [bearerInterceptor],
             },
         }));
-        // a2aData.a2a_url is the full JSON-RPC endpoint, e.g. https://foo.ngrok.dev/a2a/jsonrpc
-        // createFromUrl needs the base URL; it will append /.well-known/agent-card.json itself
-        const a2aBaseUrl = new URL(a2aData.a2a_url).origin;
+        const a2aBaseUrl = new URL(agentUrl).origin;
         client = await factory.createFromUrl(a2aBaseUrl);
         connectSpinner.stop();
     }
     catch {
-        connectSpinner.fail(`Could not reach agent at ${a2aData.a2a_url}`);
-        console.error(chalk.dim("Is the publisher running web42 serve? Is ngrok still active?"));
+        connectSpinner.fail(`Could not reach agent at ${agentUrl}`);
+        console.error(chalk.dim("Is the agent server running?"));
         process.exit(1);
     }
-    // 7. Stream response to stdout
     try {
         const stream = client.sendMessageStream({
             message: {

package/dist/commands/serve.d.ts

@@ -1,2 +1,2 @@
-import { Command } from 'commander';
+import { Command } from "commander";
 export declare const serveCommand: Command;