openpond-code 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # openpond-code
 
+## 0.2.1
+
+### Patch Changes
+
+- d1479e9: updated base url
+
 ## 0.2.0
 
 ### Minor Changes

package/README.md

@@ -52,6 +52,7 @@ openpond opentool init --dir .
 Global account selection:
 
 - `--account <name>` (alias `--profile <name>`) selects which stored account/API key to use.
+- `--base-url <url>` (alias `--baseurl`) selects the account entry matching that base URL when duplicate handles exist (for example, staging vs production).
 - `OPENPOND_ACCOUNT=<name>` sets the default selected account for a shell/session.
 - If omitted, CLI uses the last active stored account.
 

package/dist/cli.js

@@ -296,9 +296,15 @@ function resolveWorkerBaseUrl(baseUrl) {
       if (host === "apps.openpond.live") {
         return null;
       }
-      if (host === "api.openpond.ai" || host === "openpond.live" || host === "www.openpond.live") {
+      if (host === "apps.staging.openpond.live") {
+        return null;
+      }
+      if (host === "api.openpond.ai" || host === "openpond.ai" || host === "openpond.live" || host === "www.openpond.live") {
         return "https://apps.openpond.live";
       }
+      if (host === "api.staging-api.openpond.ai" || host === "staging.openpond.ai") {
+        return "https://apps.staging.openpond.live";
+      }
       return null;
     })();
     if (mappedHost) {
@@ -463,11 +469,26 @@ function normalizeHandle(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : null;
 }
+function normalizeBaseUrl(value) {
+  if (typeof value !== "string")
+    return null;
+  const trimmed = value.trim();
+  if (!trimmed)
+    return null;
+  return trimmed.replace(/\/$/, "");
+}
 function handleEquals(left, right) {
   return left.trim().toLowerCase() === right.trim().toLowerCase();
 }
-function findAccountIndex(accounts, handle) {
-  return accounts.findIndex((candidate) => handleEquals(candidate.handle, handle));
+function findAccountIndex(accounts, handle, baseUrl) {
+  const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
+  return accounts.findIndex((candidate) => {
+    if (!handleEquals(candidate.handle, handle))
+      return false;
+    if (!normalizedBaseUrl)
+      return true;
+    return normalizeBaseUrl(candidate.baseUrl) === normalizedBaseUrl;
+  });
 }
 function sanitizeSession(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -549,7 +570,7 @@ function normalizeGlobalConfig(raw) {
     const account = sanitizeAccount(candidate);
     if (!account)
       continue;
-    if (findAccountIndex(accounts, account.handle) !== -1)
+    if (findAccountIndex(accounts, account.handle, account.baseUrl) !== -1)
       continue;
     accounts.push(account);
   }
@@ -569,12 +590,22 @@ function resolveRequestedHandle(global, explicitAccount) {
   const idx = findAccountIndex(accounts, requested);
   return idx === -1 ? requested : accounts[idx].handle;
 }
-function ensureAccount(accounts, handle) {
-  const idx = findAccountIndex(accounts, handle);
+function ensureAccount(accounts, handle, baseUrl) {
+  const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
+  const idx = findAccountIndex(accounts, handle, normalizedBaseUrl);
   if (idx !== -1) {
     return accounts[idx];
   }
+  if (!normalizedBaseUrl) {
+    const firstByHandle = findAccountIndex(accounts, handle);
+    if (firstByHandle !== -1) {
+      return accounts[firstByHandle];
+    }
+  }
   const next = { handle };
+  if (normalizedBaseUrl) {
+    next.baseUrl = normalizedBaseUrl;
+  }
   accounts.push(next);
   return next;
 }
@@ -631,7 +662,8 @@ function applyAccountPatch(global, source, options) {
     return false;
   const accounts = global.accounts ?? [];
   const handle = resolveRequestedHandle(global, source.activeHandle);
-  const account = ensureAccount(accounts, handle);
+  const requestedBaseUrl = normalizeBaseUrl(hasOwn(source, "baseUrl") ? source.baseUrl ?? null : process.env.OPENPOND_BASE_URL);
+  const account = ensureAccount(accounts, handle, requestedBaseUrl);
   for (const key of ACCOUNT_SCOPED_KEYS) {
     if (!hasOwn(source, key))
       continue;
@@ -682,7 +714,9 @@ async function loadConfig(options = {}) {
   const global = await loadGlobalConfig();
   const accounts = global.accounts ?? [];
   const requested = resolveRequestedHandle(global, options.account);
-  const idx = findAccountIndex(accounts, requested);
+  const requestedBaseUrl = normalizeBaseUrl(options.baseUrl ?? process.env.OPENPOND_BASE_URL);
+  const idxWithBase = findAccountIndex(accounts, requested, requestedBaseUrl);
+  const idx = idxWithBase !== -1 ? idxWithBase : findAccountIndex(accounts, requested);
   const account = idx === -1 ? null : accounts[idx];
   const session = account?.session;
   return {
@@ -908,14 +942,43 @@ function resolveAccountOption(options) {
   }
   return trimmed;
 }
+function resolveBaseUrlOption(options) {
+  const raw = typeof options.baseUrl === "string" ? options.baseUrl : typeof options.baseurl === "string" ? options.baseurl : null;
+  if (!raw)
+    return null;
+  const trimmed = raw.trim();
+  if (!trimmed || trimmed === "true") {
+    throw new Error("baseurl must be a non-empty value");
+  }
+  return trimmed.replace(/\/$/, "");
+}
 function resolveBaseUrl(config) {
   const envBase = process.env.OPENPOND_BASE_URL;
   const base = envBase || config.baseUrl || "https://openpond.ai";
   return base.replace(/\/$/, "");
 }
-function resolvePublicApiBaseUrl() {
+function mapUiBaseToApiBase(baseUrl) {
+  if (!baseUrl)
+    return null;
+  const trimmed = baseUrl.replace(/\/$/, "");
+  try {
+    const url = new URL(trimmed);
+    const host = url.hostname.toLowerCase();
+    if (host === "staging.openpond.ai") {
+      return "https://api.staging-api.openpond.ai";
+    }
+    if (host === "openpond.ai" || host === "openpond.live" || host === "www.openpond.live") {
+      return "https://api.openpond.ai";
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+function resolvePublicApiBaseUrl(config) {
   const envBase = process.env.OPENPOND_API_URL;
-  const base = envBase || "https://api.openpond.ai";
+  const mapped = mapUiBaseToApiBase(process.env.OPENPOND_BASE_URL || config?.baseUrl);
+  const base = envBase || mapped || "https://api.openpond.ai";
   return base.replace(/\/$/, "");
 }
 function normalizeTemplateRepoUrl(input2, baseUrl) {
@@ -1193,7 +1256,7 @@ async function pollDeploymentLogs(params) {
 async function runTemplateStatus(_options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const status = await getTemplateStatus(apiBase, apiKey, app.id);
@@ -1202,7 +1265,7 @@ async function runTemplateStatus(_options, target) {
 async function runTemplateBranches(_options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const branches = await listTemplateBranches(apiBase, apiKey, app.id);
@@ -1211,7 +1274,7 @@ async function runTemplateBranches(_options, target) {
 async function runTemplateUpdate(options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const envRaw = typeof options.env === "string" ? options.env : typeof options.environment === "string" ? options.environment : undefined;
@@ -1251,9 +1314,10 @@ function printHelp() {
   console.log("");
   console.log("Global options:");
   console.log("  --account <name> (alias: --profile <name>)");
+  console.log("  --base-url <url> (alias: --baseurl)");
   console.log("");
   console.log("Env:");
-  console.log("  OPENPOND_API_KEY, OPENPOND_ACCOUNT, OPENPOND_API_URL, OPENPOND_TOOL_URL");
+  console.log("  OPENPOND_API_KEY, OPENPOND_ACCOUNT, OPENPOND_BASE_URL, OPENPOND_API_URL, OPENPOND_TOOL_URL");
 }
 async function runLogin(options) {
   const config = await loadConfig();
@@ -1272,7 +1336,7 @@ async function runLogin(options) {
 async function runToolList(options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const branch = typeof options.branch === "string" ? String(options.branch) : undefined;
@@ -1299,7 +1363,7 @@ async function runToolList(options, target) {
 async function runToolRun(options, target, toolName) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const branch = typeof options.branch === "string" ? String(options.branch) : undefined;
@@ -1333,7 +1397,7 @@ async function runToolRun(options, target, toolName) {
 async function runDeployWatch(options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app, handle, repo } = await resolveAppTarget(apiBase, apiKey, target);
   const branch = typeof options.branch === "string" ? String(options.branch) : undefined;
@@ -1363,7 +1427,7 @@ async function runRepoCreate(options, nameParts) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const templateInput = typeof options.template === "string" ? options.template.trim() : "";
   if (templateInput && (options.empty === "true" || options.opentool === "true")) {
     throw new Error("choose one: --template or --empty/--opentool");
@@ -1576,14 +1640,14 @@ async function runAppsTools() {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const tools = await fetchToolsWithCache({ apiBase, apiKey });
   console.log(JSON.stringify(tools, null, 2));
 }
 async function runAppsList(options) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const handle = typeof options.handle === "string" ? String(options.handle) : undefined;
   const normalizedHandle = handle ? normalizeRepoName(handle) : null;
@@ -1613,7 +1677,7 @@ async function runAppsPerformance(options) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const appId = typeof options.appId === "string" ? String(options.appId) : undefined;
   const performance = await getUserPerformance(apiBase, apiKey, { appId });
   console.log(JSON.stringify(performance, null, 2));
@@ -1621,7 +1685,7 @@ async function runAppsPerformance(options) {
 async function runAppsSummary(_options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const summary = await getAppRuntimeSummary(apiBase, apiKey, app.id);
@@ -1634,7 +1698,7 @@ async function runAppsAssistant(options, mode, target, contentParts) {
   }
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const result = await runAssistantMode(apiBase, apiKey, {
@@ -1648,7 +1712,7 @@ async function runAppsAgentCreate(options, contentParts) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const prompt = (typeof options.prompt === "string" ? options.prompt : null) || contentParts.join(" ");
   if (!prompt.trim()) {
     throw new Error("usage: apps agent create --prompt <text>");
@@ -1732,7 +1796,7 @@ async function runAppsToolsExecute(options, appId, deploymentId, toolName) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const methodRaw = typeof options.method === "string" ? String(options.method).toUpperCase() : undefined;
   const method = methodRaw && ["GET", "POST", "PUT", "DELETE"].includes(methodRaw) ? methodRaw : undefined;
   if (methodRaw && !method) {
@@ -1780,7 +1844,7 @@ async function runAppsEnvSet(options, target) {
   }
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const result = await updateAppEnvironment(apiBase, apiKey, app.id, { envVars });
@@ -1789,7 +1853,7 @@ async function runAppsEnvSet(options, target) {
 async function runAppsEnvGet(_options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app } = await resolveAppTarget(apiBase, apiKey, target);
   const result = await getAppEnvironment(apiBase, apiKey, app.id);
@@ -1798,7 +1862,7 @@ async function runAppsEnvGet(_options, target) {
 async function runAppsDeploy(options, target) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
   const { app, handle, repo } = await resolveAppTarget(apiBase, apiKey, target);
   const envRaw = typeof options.env === "string" ? options.env : typeof options.environment === "string" ? options.environment : undefined;
@@ -1821,7 +1885,7 @@ async function runAppsPositionsTx(options) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const methodRaw = typeof options.method === "string" ? String(options.method).toUpperCase() : "POST";
   const method = methodRaw === "GET" ? "GET" : "POST";
   if (methodRaw !== "GET" && methodRaw !== "POST") {
@@ -1889,7 +1953,7 @@ async function runAppsStoreEvents(options) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const query = resolveStoreEventsParams(options);
   const result = await submitPositionsTx(apiBase, apiKey, {
     method: "GET",
@@ -1901,7 +1965,7 @@ async function runAppsTradeFacts(options) {
   const config = await loadConfig();
   const uiBase = resolveBaseUrl(config);
   const apiKey = await ensureApiKey(config, uiBase);
-  const apiBase = resolvePublicApiBaseUrl();
+  const apiBase = resolvePublicApiBaseUrl(config);
   const appId = typeof options.appId === "string" ? options.appId : undefined;
   const performance = await getUserPerformance(apiBase, apiKey, { appId });
   if (performance && typeof performance === "object" && "trades" in performance && Array.isArray(performance.trades)) {
@@ -1913,9 +1977,16 @@ async function runAppsTradeFacts(options) {
 async function main() {
   const { command, options, rest } = parseArgs(process.argv.slice(2));
   const selectedAccount = resolveAccountOption(options);
+  const selectedBaseUrl = resolveBaseUrlOption(options);
   if (selectedAccount) {
     process.env.OPENPOND_ACCOUNT = selectedAccount;
   }
+  if (!selectedAccount && typeof options.handle === "string" && options.handle.trim().length > 0) {
+    process.env.OPENPOND_ACCOUNT = options.handle.trim();
+  }
+  if (selectedBaseUrl) {
+    process.env.OPENPOND_BASE_URL = selectedBaseUrl;
+  }
   if (!command || command === "help") {
     printHelp();
     return;

package/dist/config.d.ts

@@ -26,6 +26,7 @@ export type LocalConfig = {
 };
 export type LoadConfigOptions = {
     account?: string;
+    baseUrl?: string;
 };
 export declare function getConfigPath(): string;
 export declare function loadGlobalConfig(): Promise<LocalConfig>;

package/dist/index.js

@@ -356,9 +356,15 @@ function resolveWorkerBaseUrl(baseUrl) {
       if (host === "apps.openpond.live") {
         return null;
       }
-      if (host === "api.openpond.ai" || host === "openpond.live" || host === "www.openpond.live") {
+      if (host === "apps.staging.openpond.live") {
+        return null;
+      }
+      if (host === "api.openpond.ai" || host === "openpond.ai" || host === "openpond.live" || host === "www.openpond.live") {
         return "https://apps.openpond.live";
       }
+      if (host === "api.staging-api.openpond.ai" || host === "staging.openpond.ai") {
+        return "https://apps.staging.openpond.live";
+      }
       return null;
     })();
     if (mappedHost) {
@@ -859,11 +865,26 @@ function normalizeHandle(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : null;
 }
+function normalizeBaseUrl(value) {
+  if (typeof value !== "string")
+    return null;
+  const trimmed = value.trim();
+  if (!trimmed)
+    return null;
+  return trimmed.replace(/\/$/, "");
+}
 function handleEquals(left, right) {
   return left.trim().toLowerCase() === right.trim().toLowerCase();
 }
-function findAccountIndex(accounts, handle) {
-  return accounts.findIndex((candidate) => handleEquals(candidate.handle, handle));
+function findAccountIndex(accounts, handle, baseUrl) {
+  const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
+  return accounts.findIndex((candidate) => {
+    if (!handleEquals(candidate.handle, handle))
+      return false;
+    if (!normalizedBaseUrl)
+      return true;
+    return normalizeBaseUrl(candidate.baseUrl) === normalizedBaseUrl;
+  });
 }
 function sanitizeSession(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -945,7 +966,7 @@ function normalizeGlobalConfig(raw) {
     const account = sanitizeAccount(candidate);
     if (!account)
       continue;
-    if (findAccountIndex(accounts, account.handle) !== -1)
+    if (findAccountIndex(accounts, account.handle, account.baseUrl) !== -1)
       continue;
     accounts.push(account);
   }
@@ -965,12 +986,22 @@ function resolveRequestedHandle(global, explicitAccount) {
   const idx = findAccountIndex(accounts, requested);
   return idx === -1 ? requested : accounts[idx].handle;
 }
-function ensureAccount(accounts, handle) {
-  const idx = findAccountIndex(accounts, handle);
+function ensureAccount(accounts, handle, baseUrl) {
+  const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
+  const idx = findAccountIndex(accounts, handle, normalizedBaseUrl);
   if (idx !== -1) {
     return accounts[idx];
   }
+  if (!normalizedBaseUrl) {
+    const firstByHandle = findAccountIndex(accounts, handle);
+    if (firstByHandle !== -1) {
+      return accounts[firstByHandle];
+    }
+  }
   const next = { handle };
+  if (normalizedBaseUrl) {
+    next.baseUrl = normalizedBaseUrl;
+  }
   accounts.push(next);
   return next;
 }
@@ -1027,7 +1058,8 @@ function applyAccountPatch(global, source, options) {
     return false;
   const accounts = global.accounts ?? [];
   const handle = resolveRequestedHandle(global, source.activeHandle);
-  const account = ensureAccount(accounts, handle);
+  const requestedBaseUrl = normalizeBaseUrl(hasOwn(source, "baseUrl") ? source.baseUrl ?? null : process.env.OPENPOND_BASE_URL);
+  const account = ensureAccount(accounts, handle, requestedBaseUrl);
   for (const key of ACCOUNT_SCOPED_KEYS) {
     if (!hasOwn(source, key))
       continue;
@@ -1078,7 +1110,9 @@ async function loadConfig(options = {}) {
   const global = await loadGlobalConfig();
   const accounts = global.accounts ?? [];
   const requested = resolveRequestedHandle(global, options.account);
-  const idx = findAccountIndex(accounts, requested);
+  const requestedBaseUrl = normalizeBaseUrl(options.baseUrl ?? process.env.OPENPOND_BASE_URL);
+  const idxWithBase = findAccountIndex(accounts, requested, requestedBaseUrl);
+  const idx = idxWithBase !== -1 ? idxWithBase : findAccountIndex(accounts, requested);
   const account = idx === -1 ? null : accounts[idx];
   const session = account?.session;
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openpond-code",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OpenPond CLI (API key only)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",