@web42/w42 0.1.12 → 0.1.13

package/dist/commands/register.js

@@ -1,51 +1,146 @@
-import { Command } from "commander";
 import chalk from "chalk";
+import { Command } from "commander";
+import inquirer from "inquirer";
 import ora from "ora";
-import { requireAuth } from "../utils/config.js";
+import { apiGet, apiPost } from "../utils/api.js";
+import { getConfig, isAuthenticated } from "../utils/config.js";
+function toSlugPart(name) {
+    return name
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-|-$/g, "");
+}
 export const registerCommand = new Command("register")
     .description("Register an agent with the Web42 Network")
-    .argument("<url>", "Public URL of the running agent (must serve /.well-known/agent-card.json)")
+    .argument("<url>", "Public base URL of the running agent (must serve /.well-known/agent-card.json)")
     .option("--tags <tags>", "Comma-separated discovery tags")
     .option("--categories <cats>", "Comma-separated categories")
     .action(async (url, opts) => {
-    const config = requireAuth();
-    const web42ApiUrl = config.apiUrl ?? "http://localhost:3000";
-    const spinner = ora("Registering agent...").start();
-    const body = { url };
-    if (opts.tags)
-        body.tags = opts.tags.split(",").map((t) => t.trim());
-    if (opts.categories)
-        body.categories = opts.categories.split(",").map((c) => c.trim());
+    // ── Step 1: Fetch agent card ───────────────────────────────────────────
+    const cardUrl = `${url.replace(/\/$/, "")}/.well-known/agent-card.json`;
+    const cardSpinner = ora("Fetching agent card...").start();
+    let agentCard;
     try {
-        const res = await fetch(`${web42ApiUrl}/api/agents`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${config.token}`,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(body),
+        const res = await fetch(cardUrl, {
+            headers: { Accept: "application/json" },
+            signal: AbortSignal.timeout(10000),
         });
         if (!res.ok) {
-            const errBody = (await res.json().catch(() => ({})));
-            spinner.fail("Registration failed");
-            console.error(chalk.red(errBody.error ?? `HTTP ${res.status}`));
+            cardSpinner.fail("Could not fetch agent card");
+            console.error(chalk.red(`  ${cardUrl} returned ${res.status} ${res.statusText}`));
             process.exit(1);
         }
-        const data = (await res.json());
+        agentCard = (await res.json());
+    }
+    catch (err) {
+        cardSpinner.fail("Could not fetch agent card");
+        console.error(chalk.red(`  ${cardUrl}: ${String(err)}`));
+        process.exit(1);
+    }
+    cardSpinner.stop();
+    // ── Step 2: URL check (no auth) ────────────────────────────────────────
+    const checkSpinner = ora("Checking registration status...").start();
+    let alreadyRegistered = false;
+    try {
+        const check = await apiGet(`/api/agents/check?url=${encodeURIComponent(url)}`);
+        if (check.registered) {
+            alreadyRegistered = true;
+            const displaySlug = check.slug.replace("~", "/");
+            checkSpinner.warn(`Already registered as ${chalk.cyan(displaySlug)}`);
+        }
+        else {
+            checkSpinner.stop();
+        }
+    }
+    catch {
+        checkSpinner.warn("Could not verify URL — proceeding anyway");
+    }
+    if (alreadyRegistered) {
+        const { proceed } = await inquirer.prompt([
+            {
+                type: "confirm",
+                name: "proceed",
+                message: "Continue to update the registration?",
+                default: false,
+            },
+        ]);
+        if (!proceed)
+            process.exit(0);
+    }
+    // ── Step 3: Auth gate ──────────────────────────────────────────────────
+    if (!isAuthenticated()) {
+        console.log();
+        console.log(chalk.yellow("You must be logged in to register an agent."));
+        console.log(chalk.dim("Run: ") + chalk.cyan("w42 auth login"));
+        process.exit(0);
+    }
+    const cfg = getConfig();
+    const username = cfg.username;
+    // ── Step 4: Slug prompt + availability check ───────────────────────────
+    const defaultSlugPart = toSlugPart(agentCard.name ?? "my-agent") || "my-agent";
+    console.log();
+    if (agentCard.name)
+        console.log(chalk.bold(agentCard.name));
+    if (agentCard.description)
+        console.log(chalk.dim(agentCard.description));
+    console.log();
+    let slugPart;
+    while (true) {
+        const answer = await inquirer.prompt([
+            {
+                type: "input",
+                name: "slugPart",
+                message: `Agent slug ${chalk.dim(`(@${username}/`)}`,
+                default: defaultSlugPart,
+                validate: (input) => {
+                    if (!input)
+                        return "Slug cannot be empty";
+                    if (!/^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/.test(input))
+                        return "Lowercase letters, numbers, and hyphens only (no leading/trailing hyphens)";
+                    return true;
+                },
+            },
+        ]);
+        slugPart = answer.slugPart;
+        const fullSlug = `@${username}~${slugPart}`;
+        const slugSpinner = ora("Checking slug availability...").start();
+        try {
+            const check = await apiGet(`/api/agents/check?slug=${encodeURIComponent(fullSlug)}`);
+            if (check.taken) {
+                slugSpinner.fail(`${chalk.cyan(`@${username}/${slugPart}`)} is already taken — choose another`);
+                continue;
+            }
+            slugSpinner.stop();
+        }
+        catch {
+            slugSpinner.warn("Could not verify slug — proceeding anyway");
+        }
+        console.log(chalk.dim(`  Full slug: @${username}/${slugPart}`));
+        break;
+    }
+    // ── Step 5: POST ───────────────────────────────────────────────────────
+    const registerSpinner = ora("Registering agent...").start();
+    const body = { url, slug: slugPart };
+    if (opts.tags)
+        body.tags = opts.tags.split(",").map((t) => t.trim());
+    if (opts.categories)
+        body.categories = opts.categories.split(",").map((c) => c.trim());
+    try {
+        const data = await apiPost("/api/agents", body);
         const slug = data.agent?.slug ?? "unknown";
-        const name = data.agent?.agent_card?.name ?? slug;
+        const name = data.agent?.agent_card?.name ?? agentCard.name ?? slug;
         const displaySlug = slug.replace("~", "/");
         if (data.created) {
-            spinner.succeed(`Registered "${name}" (${displaySlug})`);
+            registerSpinner.succeed(`Registered "${name}" (${displaySlug})`);
         }
         else {
-            spinner.succeed(`Updated "${name}" (${displaySlug})`);
+            registerSpinner.succeed(`Updated "${name}" (${displaySlug})`);
         }
         console.log(chalk.dim(`  Send:  w42 send ${slug} "hello"`));
-        console.log(chalk.dim(`  View:  ${web42ApiUrl}/${displaySlug.replace("@", "")}`));
+        console.log(chalk.dim(`  View:  ${cfg.apiUrl}/${displaySlug.replace("@", "")}`));
     }
     catch (err) {
-        spinner.fail("Registration failed");
+        registerSpinner.fail("Registration failed");
         console.error(chalk.red(String(err)));
         process.exit(1);
     }

package/dist/commands/send.js

@@ -28,6 +28,20 @@ function printPart(part) {
         process.stdout.write("\n" + JSON.stringify(part.data, null, 2) + "\n");
     }
 }
+function handleTaskState(state, taskId) {
+    if (state === "input-required") {
+        process.stdout.write("\n");
+        console.log(chalk.yellow(`[task ${taskId} is awaiting input — reply with --task-id ${taskId}]`));
+    }
+    else if (state === "auth-required") {
+        console.error(chalk.red("\nAgent requires authentication."));
+        process.exit(1);
+    }
+    else if (state === "failed" || state === "canceled" || state === "rejected") {
+        console.error(chalk.red(`\nAgent ${state}.`));
+        process.exit(1);
+    }
+}
 function getCachedToken(slug) {
     const raw = getConfigValue(`agentTokens.${slug}`);
     if (!raw)
@@ -186,48 +200,21 @@ export const sendCommand = new Command("send")
                     for (const part of event.status.message.parts ?? [])
                         printPart(part);
                 }
-                const state = event.status?.state;
-                if (state === "input-required") {
-                    process.stdout.write("\n");
-                    console.log(chalk.yellow(`[task ${event.taskId} is awaiting input — reply with --task-id ${event.taskId}]`));
-                }
-                else if (state === "auth-required") {
-                    console.error(chalk.red("\nAgent requires authentication."));
-                    process.exit(1);
-                }
-                else if (state === "failed" ||
-                    state === "canceled" ||
-                    state === "rejected") {
-                    console.error(chalk.red(`\nAgent ${state}.`));
-                    process.exit(1);
-                }
+                handleTaskState(event.status?.state, event.taskId);
             }
             else if (event.kind === "task") {
                 // Non-streaming fallback: server returned the full task object.
                 // Print accumulated artifacts and handle terminal state.
-                const task = event;
-                for (const artifact of task.artifacts ?? []) {
+                for (const artifact of event.artifacts ?? []) {
                     process.stdout.write("\n");
                     for (const part of artifact.parts ?? [])
                         printPart(part);
                 }
-                if (task.status?.message) {
-                    for (const part of task.status.message.parts ?? [])
+                if (event.status?.message) {
+                    for (const part of event.status.message.parts ?? [])
                         printPart(part);
                 }
-                const taskState = task.status?.state;
-                if (taskState === "input-required") {
-                    process.stdout.write("\n");
-                    console.log(chalk.yellow(`[task ${task.id} is awaiting input — reply with --task-id ${task.id}]`));
-                }
-                else if (taskState === "auth-required") {
-                    console.error(chalk.red("\nAgent requires authentication."));
-                    process.exit(1);
-                }
-                else if (taskState === "failed" || taskState === "canceled" || taskState === "rejected") {
-                    console.error(chalk.red(`\nAgent ${taskState}.`));
-                    process.exit(1);
-                }
+                handleTaskState(event.status?.state, event.id);
             }
         }
         process.stdout.write("\n");

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const CLI_VERSION = "0.1.12";
+export declare const CLI_VERSION = "0.1.13";

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "0.1.12";
+export const CLI_VERSION = "0.1.13";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web42/w42",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "CLI for the Web42 Agent Network — discover, register, and communicate with A2A agents",
   "type": "module",
   "bin": {