run402 1.38.0 → 1.40.0

package/lib/agent.mjs

@@ -1,4 +1,6 @@
-import { API, allowanceAuthHeaders } from "./config.mjs";
+import { allowanceAuthHeaders } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 agent — Manage agent identity
 
@@ -23,20 +25,19 @@ async function contact(args) {
     if (args[i] === "--webhook" && args[i + 1]) webhook = args[++i];
   }
   if (!name) { console.error(JSON.stringify({ status: "error", message: "Missing --name <name>" })); process.exit(1); }
-  const authHeaders = allowanceAuthHeaders("/agent/v1/contact");
-
-  const body = { name };
-  if (email) body.email = email;
-  if (webhook) body.webhook = webhook;
-
-  const res = await fetch(`${API}/agent/v1/contact`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...authHeaders },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  // Preserve the aggressive early exit when no allowance is configured.
+  allowanceAuthHeaders("/agent/v1/contact");
+
+  try {
+    const data = await getSdk().admin.setAgentContact({
+      name,
+      email: email ?? undefined,
+      webhook: webhook ?? undefined,
+    });
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 export async function run(sub, args) {

package/lib/ai.mjs

@@ -1,4 +1,6 @@
-import { findProject, resolveProjectId, API } from "./config.mjs";
+import { resolveProjectId } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 ai — AI translation and moderation tools
 
@@ -68,7 +70,6 @@ async function translate(args) {
   }
 
   const projectId = resolveProjectId(projectOpt || positional[0]);
-  const p = findProject(projectId);
   text = positional[1] || null;
 
   const to = parseFlag(args, "--to");
@@ -78,19 +79,12 @@ async function translate(args) {
   if (!text) { console.error(JSON.stringify({ status: "error", message: "Text required. Usage: run402 ai translate <project_id> <text> --to <lang>" })); process.exit(1); }
   if (!to) { console.error(JSON.stringify({ status: "error", message: "--to <lang> is required" })); process.exit(1); }
 
-  const body = { text, to };
-  if (from) body.from = from;
-  if (context) body.context = context;
-
-  const res = await fetch(`${API}/ai/v1/translate`, {
-    method: "POST",
-    headers: { "Authorization": `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-
-  console.log(JSON.stringify({ status: "ok", text: data.text, from: data.from, to: data.to }));
+  try {
+    const data = await getSdk().ai.translate(projectId, { text, to, from: from ?? undefined, context: context ?? undefined });
+    console.log(JSON.stringify({ status: "ok", text: data.text, from: data.from, to: data.to }));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function moderate(args) {
@@ -105,20 +99,16 @@ async function moderate(args) {
   }
 
   const projectId = resolveProjectId(projectOpt || positional[0]);
-  const p = findProject(projectId);
   text = positional[1] || null;
 
   if (!text) { console.error(JSON.stringify({ status: "error", message: "Text required. Usage: run402 ai moderate <project_id> <text>" })); process.exit(1); }
 
-  const res = await fetch(`${API}/ai/v1/moderate`, {
-    method: "POST",
-    headers: { "Authorization": `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify({ text }),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-
-  console.log(JSON.stringify({ status: "ok", flagged: data.flagged, categories: data.categories, category_scores: data.category_scores }));
+  try {
+    const data = await getSdk().ai.moderate(projectId, text);
+    console.log(JSON.stringify({ status: "ok", flagged: data.flagged, categories: data.categories, category_scores: data.category_scores }));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function usage(args) {
@@ -132,15 +122,13 @@ async function usage(args) {
   }
 
   const projectId = resolveProjectId(projectOpt || positional[0]);
-  const p = findProject(projectId);
-
-  const res = await fetch(`${API}/ai/v1/usage`, {
-    headers: { "Authorization": `Bearer ${p.service_key}` },
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
 
-  console.log(JSON.stringify({ status: "ok", ...data }));
+  try {
+    const data = await getSdk().ai.usage(projectId);
+    console.log(JSON.stringify({ status: "ok", ...data }));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 export async function run(sub, args) {

package/lib/allowance.mjs

@@ -1,4 +1,6 @@
 import { readAllowance, saveAllowance, ALLOWANCE_FILE, API } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 allowance — Manage your agent allowance
 
@@ -76,24 +78,43 @@ async function loadDeps() {
 }
 
 async function status() {
-  const w = readAllowance();
-  if (!w) {
-    console.log(JSON.stringify({ status: "no_wallet", message: "No agent allowance found. Run: run402 allowance create" }));
-    return;
+  try {
+    const data = await getSdk().allowance.status();
+    if (!data.configured) {
+      console.log(JSON.stringify({ status: "no_wallet", message: "No agent allowance found. Run: run402 allowance create" }));
+      return;
+    }
+    // Preserve CLI's rail field (SDK doesn't surface it; read from local allowance).
+    const w = readAllowance();
+    console.log(JSON.stringify({
+      status: "ok",
+      address: data.address,
+      created: data.created,
+      funded: data.funded || false,
+      rail: w?.rail || "x402",
+      path: data.path ?? ALLOWANCE_FILE,
+    }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify({ status: "ok", address: w.address, created: w.created, funded: w.funded || false, rail: w.rail || "x402", path: ALLOWANCE_FILE }));
 }
 
 async function create() {
-  if (readAllowance()) {
-    console.log(JSON.stringify({ status: "error", message: "Agent allowance already exists. Use 'status' to check it." }));
-    process.exit(1);
+  try {
+    const result = await getSdk().allowance.create();
+    console.log(JSON.stringify({
+      status: "ok",
+      address: result.address,
+      message: `Agent allowance created. Stored locally at ${result.path ?? ALLOWANCE_FILE}`,
+    }));
+  } catch (err) {
+    const msg = (err instanceof Error) ? err.message : String(err);
+    if (/already exists/i.test(msg)) {
+      console.log(JSON.stringify({ status: "error", message: "Agent allowance already exists. Use 'status' to check it." }));
+      process.exit(1);
+    }
+    reportSdkError(err);
   }
-  const { generatePrivateKey, privateKeyToAccount } = await loadDeps();
-  const privateKey = generatePrivateKey();
-  const account = privateKeyToAccount(privateKey);
-  saveAllowance({ address: account.address, privateKey, created: new Date().toISOString(), funded: false });
-  console.log(JSON.stringify({ status: "ok", address: account.address, message: `Agent allowance created. Stored locally at ${ALLOWANCE_FILE}` }));
 }
 
 async function fund() {
@@ -199,9 +220,13 @@ async function balance() {
 }
 
 async function exportAddr() {
-  const w = readAllowance();
-  if (!w) { console.log(JSON.stringify({ status: "error", message: "No agent allowance." })); process.exit(1); }
-  console.log(w.address);
+  try {
+    const address = await getSdk().allowance.export();
+    console.log(address);
+  } catch {
+    console.log(JSON.stringify({ status: "error", message: "No agent allowance." }));
+    process.exit(1);
+  }
 }
 
 async function checkout(args) {

package/lib/apps.mjs

@@ -1,4 +1,6 @@
-import { findProject, API, allowanceAuthHeaders, saveProject } from "./config.mjs";
+import { allowanceAuthHeaders, saveProject } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 apps — Browse and manage the app marketplace
 
@@ -101,16 +103,16 @@ Examples:
 };
 
 async function browse(args) {
-  let url = `${API}/apps/v1`;
   const tags = [];
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--tag" && args[i + 1]) tags.push(args[++i]);
   }
-  if (tags.length > 0) url += "?" + tags.map(t => `tag=${encodeURIComponent(t)}`).join("&");
-  const res = await fetch(url);
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().apps.browse(tags.length > 0 ? tags : undefined);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function fork(versionId, name, args) {
@@ -119,33 +121,34 @@ async function fork(versionId, name, args) {
     if (args[i] === "--tier" && args[i + 1]) opts.tier = args[++i];
     if (args[i] === "--subdomain" && args[i + 1]) opts.subdomain = args[++i];
   }
-  const authHeaders = allowanceAuthHeaders("/fork/v1");
-
-  const body = { version_id: versionId, name };
-  if (opts.subdomain) body.subdomain = opts.subdomain;
-
-  const res = await fetch(`${API}/fork/v1`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...authHeaders },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-
-  // Save project credentials locally
-  if (data.project_id) {
-    saveProject(data.project_id, {
-      anon_key: data.anon_key, service_key: data.service_key,
-      tier: data.tier, lease_expires_at: data.lease_expires_at,
-      site_url: data.site_url || data.subdomain_url,
-      deployed_at: new Date().toISOString(),
+  // Preserve the aggressive early exit when no allowance is configured.
+  allowanceAuthHeaders("/fork/v1");
+
+  try {
+    const data = await getSdk().apps.fork({
+      versionId,
+      name,
+      subdomain: opts.subdomain,
     });
+
+    // SDK persists via the Node provider's saveProject/setActiveProject; we
+    // mirror the old CLI behavior here (deployed_at + site_url surfaced from
+    // the fork response) with a follow-up updateProject for the extra fields.
+    if (data.project_id) {
+      saveProject(data.project_id, {
+        anon_key: data.anon_key,
+        service_key: data.service_key,
+        site_url: data.site_url || data.subdomain_url,
+        deployed_at: new Date().toISOString(),
+      });
+    }
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 async function publish(projectId, args) {
-  const p = findProject(projectId);
   const opts = { description: undefined, tags: undefined, visibility: undefined, forkAllowed: undefined };
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--description" && args[i + 1]) opts.description = args[++i];
@@ -153,72 +156,61 @@ async function publish(projectId, args) {
     if (args[i] === "--visibility" && args[i + 1]) opts.visibility = args[++i];
     if (args[i] === "--fork-allowed") opts.forkAllowed = true;
   }
-  const body = {};
-  if (opts.description) body.description = opts.description;
-  if (opts.tags) body.tags = opts.tags;
-  if (opts.visibility) body.visibility = opts.visibility;
-  if (opts.forkAllowed !== undefined) body.fork_allowed = opts.forkAllowed;
-
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/publish`, {
-    method: "POST",
-    headers: { "Authorization": `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().apps.publish(projectId, {
+      description: opts.description,
+      tags: opts.tags,
+      visibility: opts.visibility,
+      fork_allowed: opts.forkAllowed,
+    });
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function versions(projectId) {
-  const p = findProject(projectId);
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/versions`, {
-    headers: { "Authorization": `Bearer ${p.service_key}` },
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().apps.listVersions(projectId);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function inspect(versionId) {
   if (!versionId) { console.error(JSON.stringify({ status: "error", message: "Missing version ID" })); process.exit(1); }
-  const res = await fetch(`${API}/apps/v1/${versionId}`);
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().apps.getApp(versionId);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function update(projectId, versionId, args) {
-  const p = findProject(projectId);
-  const body = {};
+  const opts = {};
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--description" && args[i + 1]) body.description = args[++i];
-    if (args[i] === "--tags" && args[i + 1]) body.tags = args[++i].split(",");
-    if (args[i] === "--visibility" && args[i + 1]) body.visibility = args[++i];
-    if (args[i] === "--fork-allowed") body.fork_allowed = true;
-    if (args[i] === "--no-fork") body.fork_allowed = false;
+    if (args[i] === "--description" && args[i + 1]) opts.description = args[++i];
+    if (args[i] === "--tags" && args[i + 1]) opts.tags = args[++i].split(",");
+    if (args[i] === "--visibility" && args[i + 1]) opts.visibility = args[++i];
+    if (args[i] === "--fork-allowed") opts.fork_allowed = true;
+    if (args[i] === "--no-fork") opts.fork_allowed = false;
+  }
+  try {
+    await getSdk().apps.updateVersion(projectId, versionId, opts);
+    console.log(JSON.stringify({ status: "ok", project_id: projectId, version_id: versionId }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/versions/${versionId}`, {
-    method: "PATCH",
-    headers: { "Authorization": `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 async function deleteVersion(projectId, versionId) {
-  const p = findProject(projectId);
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/versions/${versionId}`, {
-    method: "DELETE",
-    headers: { "Authorization": `Bearer ${p.service_key}` },
-  });
-  if (res.status === 204 || res.ok) {
+  try {
+    await getSdk().apps.deleteVersion(projectId, versionId);
     console.log(JSON.stringify({ status: "ok", message: `Version ${versionId} deleted.` }));
-  } else {
-    const data = await res.json();
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  } catch (err) {
+    reportSdkError(err);
   }
 }
 

package/lib/auth.mjs

@@ -1,4 +1,6 @@
 import { findProject, resolveProjectId, API } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 auth — Manage project user authentication
 
@@ -118,50 +120,30 @@ async function magicLink(args) {
   const email = parseFlag(args, "--email");
   const redirect = parseFlag(args, "--redirect");
   const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const p = findProject(projectId);
 
   if (!email) { console.error(JSON.stringify({ status: "error", message: "Missing --email" })); process.exit(1); }
   if (!redirect) { console.error(JSON.stringify({ status: "error", message: "Missing --redirect <url>" })); process.exit(1); }
 
-  const res = await fetch(`${API}/auth/v1/magic-link`, {
-    method: "POST",
-    headers: {
-      "apikey": p.anon_key,
-      "Authorization": `Bearer ${p.anon_key}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({ email, redirect_url: redirect }),
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    await getSdk().auth.requestMagicLink(projectId, { email, redirectUrl: redirect });
+    console.log(JSON.stringify({ status: "ok", email, redirect_url: redirect }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify({ status: "ok", ...data }));
 }
 
 async function verify(args) {
   const token = parseFlag(args, "--token");
   const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const p = findProject(projectId);
 
   if (!token) { console.error(JSON.stringify({ status: "error", message: "Missing --token" })); process.exit(1); }
 
-  const res = await fetch(`${API}/auth/v1/token?grant_type=magic_link`, {
-    method: "POST",
-    headers: {
-      "apikey": p.anon_key,
-      "Authorization": `Bearer ${p.anon_key}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({ token }),
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    const data = await getSdk().auth.verifyMagicLink(projectId, token);
+    console.log(JSON.stringify({ status: "ok", ...data }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify({ status: "ok", ...data }));
 }
 
 async function setPassword(args) {
@@ -169,59 +151,38 @@ async function setPassword(args) {
   const newPassword = parseFlag(args, "--new");
   const currentPassword = parseFlag(args, "--current");
   const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const p = findProject(projectId);
 
   if (!accessToken) { console.error(JSON.stringify({ status: "error", message: "Missing --token <bearer_token>" })); process.exit(1); }
   if (!newPassword) { console.error(JSON.stringify({ status: "error", message: "Missing --new <password>" })); process.exit(1); }
 
-  const body = { new_password: newPassword };
-  if (currentPassword) body.current_password = currentPassword;
-
-  // /auth/v1/* is gated by apikeyAuth middleware: the `apikey` header must be
-  // the project's anon_key. `Authorization: Bearer <access_token>` stays as
-  // the user's identity so the server knows whose password to change.
-  const res = await fetch(`${API}/auth/v1/user/password`, {
-    method: "PUT",
-    headers: {
-      "apikey": p.anon_key,
-      "Authorization": `Bearer ${accessToken}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    await getSdk().auth.setUserPassword(projectId, {
+      accessToken,
+      newPassword,
+      currentPassword: currentPassword ?? undefined,
+    });
+    console.log(JSON.stringify({ status: "ok" }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify({ status: "ok", ...data }));
 }
 
 async function settings(args) {
   const allowPasswordSet = parseFlag(args, "--allow-password-set");
   const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const p = findProject(projectId);
 
   if (allowPasswordSet === null) { console.error(JSON.stringify({ status: "error", message: "Missing --allow-password-set <true|false>" })); process.exit(1); }
 
-  const res = await fetch(`${API}/auth/v1/settings`, {
-    method: "PATCH",
-    headers: {
-      "apikey": p.anon_key,
-      "Authorization": `Bearer ${p.service_key}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({ allow_password_set: allowPasswordSet === "true" }),
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    await getSdk().auth.settings(projectId, { allow_password_set: allowPasswordSet === "true" });
+    console.log(JSON.stringify({ status: "ok", allow_password_set: allowPasswordSet === "true" }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify({ status: "ok", ...data }));
 }
 
 async function providers(args) {
+  // `providers` isn't in the pilot SDK surface — keep the direct fetch.
   const projectId = resolveProjectId(parseFlag(args, "--project"));
   const p = findProject(projectId);