openmates 0.11.0-alpha.31 → 0.11.0-alpha.32

package/README.md

@@ -39,9 +39,10 @@ The CLI derives the web app URL from the API URL so pair-auth lands on the match
 | --- | --- |
 | Production | _(none)_ |
 | Dev server | `OPENMATES_API_URL=https://api.dev.openmates.org` |
-| Self-hosted | `OPENMATES_API_URL=https://api.example.com OPENMATES_APP_URL=https://example.com` |
+| Installed self-hosted server | _(none after `openmates server install`)_ |
+| Remote self-hosted server | `OPENMATES_API_URL=https://api.example.com` |
 
-You can also pass `--api-url <url>` per command. App-skill execution can use your logged-in session, `--api-key <key>`, or `OPENMATES_API_KEY`.
+After `openmates server install`, fresh CLI commands default to that self-hosted server (`http://localhost:8000`) unless you already have a saved login session, set `OPENMATES_API_URL`, or pass `--api-url <url>`. App-skill execution can use your logged-in session, `--api-key <key>`, or `OPENMATES_API_KEY`.
 
 ## Safety Limits
 

package/dist/{chunk-3TZYVNWL.js → chunk-NI7XPZBV.js}

@@ -874,6 +874,67 @@ function isSyncCacheFresh(maxAgeMs = 3e5) {
   return Date.now() - cache.syncedAt < maxAgeMs;
 }
 
+// src/serverConfig.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join2, resolve } from "path";
+var STATE_DIR = join2(homedir3(), ".openmates");
+var CONFIG_FILE = "server.json";
+function ensureStateDir2() {
+  if (!existsSync3(STATE_DIR)) {
+    mkdirSync2(STATE_DIR, { recursive: true, mode: 448 });
+  }
+  return STATE_DIR;
+}
+function saveServerConfig(config) {
+  const dir = ensureStateDir2();
+  const filePath = join2(dir, CONFIG_FILE);
+  writeFileSync2(filePath, `${JSON.stringify(config, null, 2)}
+`, { mode: 420 });
+}
+function loadServerConfig() {
+  const filePath = join2(STATE_DIR, CONFIG_FILE);
+  if (!existsSync3(filePath)) return null;
+  try {
+    return JSON.parse(readFileSync3(filePath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function removeServerConfig() {
+  const filePath = join2(STATE_DIR, CONFIG_FILE);
+  if (existsSync3(filePath)) {
+    rmSync2(filePath);
+  }
+}
+var SOURCE_COMPOSE_MARKER = join2("backend", "core", "docker-compose.yml");
+var IMAGE_COMPOSE_MARKER = join2("backend", "core", "docker-compose.selfhost.yml");
+function isOpenMatesDir(dir) {
+  return existsSync3(join2(dir, SOURCE_COMPOSE_MARKER)) || existsSync3(join2(dir, IMAGE_COMPOSE_MARKER));
+}
+function resolveServerPath(flags) {
+  if (typeof flags.path === "string" && flags.path) {
+    const explicit = resolve(flags.path);
+    if (!isOpenMatesDir(explicit)) {
+      throw new Error(
+        `${explicit} does not appear to be an OpenMates installation (missing ${SOURCE_COMPOSE_MARKER} or ${IMAGE_COMPOSE_MARKER}).`
+      );
+    }
+    return explicit;
+  }
+  const config = loadServerConfig();
+  if (config?.installPath && isOpenMatesDir(config.installPath)) {
+    return config.installPath;
+  }
+  const cwd = process.cwd();
+  if (isOpenMatesDir(cwd)) {
+    return cwd;
+  }
+  throw new Error(
+    "No OpenMates installation found.\nRun 'openmates server install' to set up a new server, or use --path <dir>."
+  );
+}
+
 // src/ws.ts
 import { createRequire } from "module";
 var require2 = createRequire(import.meta.url);
@@ -1910,9 +1971,14 @@ function deriveWebOrigin(apiUrl) {
     const url = new URL(apiUrl);
     if (url.hostname === "api.dev.openmates.org") {
       url.hostname = "app.dev.openmates.org";
+    } else if (url.hostname === "api.openmates.org") {
+      url.hostname = "openmates.org";
     } else {
-      url.hostname = url.hostname.replace(/^api\./, "");
+      url.hostname = url.hostname.replace(/^api\./, "app.");
     }
+    url.pathname = "";
+    url.search = "";
+    url.hash = "";
     url.port = "";
     return url.origin;
   } catch {
@@ -2382,24 +2448,50 @@ var MATE_NAMES = {
   general_knowledge: "George",
   onboarding_support: "Suki"
 };
-var DEFAULT_API_URL = process.env.OPENMATES_API_URL ?? "https://api.openmates.org";
+var CLOUD_API_URL = "https://api.openmates.org";
+var DEFAULT_API_URL = process.env.OPENMATES_API_URL ?? CLOUD_API_URL;
 var SETTINGS_GET_RATE_LIMIT_RETRY_MS = 61e3;
 var SKILL_TASK_POLL_INTERVAL_MS = 2e3;
 var SKILL_TASK_POLL_TIMEOUT_MS = 3e5;
+function normalizeOrigin(url) {
+  url.pathname = "";
+  url.search = "";
+  url.hash = "";
+  return url.toString().replace(/\/$/, "");
+}
+function isLocalHost(hostname) {
+  return ["localhost", "127.0.0.1", "::1"].includes(hostname);
+}
+function loadDefaultServerApiUrl() {
+  const config = loadServerConfig();
+  return config?.apiUrl?.replace(/\/$/, "") ?? null;
+}
 function deriveAppUrl(apiUrl) {
   if (process.env.OPENMATES_APP_URL) {
     return process.env.OPENMATES_APP_URL.replace(/\/$/, "");
   }
-  if (apiUrl.includes("api.dev.openmates.org")) {
-    return "https://app.dev.openmates.org";
+  const serverAppUrl = loadServerConfig()?.appUrl;
+  if (serverAppUrl && apiUrl.replace(/\/$/, "") === loadDefaultServerApiUrl()) {
+    return serverAppUrl.replace(/\/$/, "");
   }
-  if (apiUrl.includes("api.openmates.org")) {
+  try {
+    const url = new URL(apiUrl);
+    if (url.hostname === "api.dev.openmates.org") {
+      return "https://app.dev.openmates.org";
+    }
+    if (url.hostname === "api.openmates.org") {
+      return "https://openmates.org";
+    }
+    if (isLocalHost(url.hostname)) {
+      return "http://localhost:5173";
+    }
+    if (url.hostname.startsWith("api.")) {
+      url.hostname = `app.${url.hostname.slice(4)}`;
+    }
+    return normalizeOrigin(url);
+  } catch {
     return "https://openmates.org";
   }
-  if (apiUrl.includes("localhost")) {
-    return "http://localhost:5173";
-  }
-  return "https://openmates.org";
 }
 var CLI_DEVICE_NAME_PREFIX = "OpenMates CLI";
 var BLOCKED_SETTINGS_MUTATE_PATHS = /* @__PURE__ */ new Set([
@@ -2420,7 +2512,7 @@ var OpenMatesClient = class _OpenMatesClient {
   http;
   constructor(options = {}) {
     const diskSession = options.session ?? this.getValidSessionFromDisk();
-    this.apiUrl = (options.apiUrl ?? process.env.OPENMATES_API_URL ?? diskSession?.apiUrl ?? DEFAULT_API_URL).replace(/\/$/, "");
+    this.apiUrl = (options.apiUrl ?? process.env.OPENMATES_API_URL ?? diskSession?.apiUrl ?? loadDefaultServerApiUrl() ?? DEFAULT_API_URL).replace(/\/$/, "");
     this.session = diskSession;
     this.http = new OpenMatesHttpClient({
       apiUrl: this.apiUrl,
@@ -5838,9 +5930,9 @@ var OutputRedactor = class {
 };
 
 // src/fileEmbed.ts
-import { readFileSync as readFileSync3, statSync, existsSync as existsSync3 } from "fs";
-import { basename, extname, resolve } from "path";
-import { homedir as homedir3 } from "os";
+import { readFileSync as readFileSync4, statSync, existsSync as existsSync4 } from "fs";
+import { basename, extname, resolve as resolve2 } from "path";
+import { homedir as homedir4 } from "os";
 import { createHash as createHash4 } from "crypto";
 var MAX_PER_FILE_SIZE = 100 * 1024 * 1024;
 var BLOCKED_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -6045,9 +6137,9 @@ function processEnvFileZeroKnowledge(content) {
 }
 function resolvePath(filePath) {
   if (filePath.startsWith("~/")) {
-    return resolve(homedir3(), filePath.slice(2));
+    return resolve2(homedir4(), filePath.slice(2));
   }
-  return resolve(filePath);
+  return resolve2(filePath);
 }
 function processFiles(filePaths, redactor) {
   const embeds = [];
@@ -6057,7 +6149,7 @@ function processFiles(filePaths, redactor) {
     const resolvedPath = resolvePath(rawPath);
     const filename = basename(resolvedPath);
     const ext = getExt(filename);
-    if (!existsSync3(resolvedPath)) {
+    if (!existsSync4(resolvedPath)) {
       errors.push({ path: rawPath, error: "File not found" });
       continue;
     }
@@ -6123,7 +6215,7 @@ function processFiles(filePaths, redactor) {
 }
 function processCodeFile(filePath, filename, redactor) {
   try {
-    let content = readFileSync3(filePath, "utf-8");
+    let content = readFileSync4(filePath, "utf-8");
     let secretsRedacted = false;
     let zeroKnowledge = false;
     if (isEnvFile(filename)) {
@@ -7544,69 +7636,6 @@ import { copyFileSync, existsSync as existsSync5, mkdirSync as mkdirSync3, readF
 import { createInterface as createInterface2 } from "readline";
 import { homedir as homedir5 } from "os";
 import { join as join3, resolve as resolve3 } from "path";
-
-// src/serverConfig.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join2, resolve as resolve2 } from "path";
-var STATE_DIR = join2(homedir4(), ".openmates");
-var CONFIG_FILE = "server.json";
-function ensureStateDir2() {
-  if (!existsSync4(STATE_DIR)) {
-    mkdirSync2(STATE_DIR, { recursive: true, mode: 448 });
-  }
-  return STATE_DIR;
-}
-function saveServerConfig(config) {
-  const dir = ensureStateDir2();
-  const filePath = join2(dir, CONFIG_FILE);
-  writeFileSync2(filePath, `${JSON.stringify(config, null, 2)}
-`, { mode: 420 });
-}
-function loadServerConfig() {
-  const filePath = join2(STATE_DIR, CONFIG_FILE);
-  if (!existsSync4(filePath)) return null;
-  try {
-    return JSON.parse(readFileSync4(filePath, "utf-8"));
-  } catch {
-    return null;
-  }
-}
-function removeServerConfig() {
-  const filePath = join2(STATE_DIR, CONFIG_FILE);
-  if (existsSync4(filePath)) {
-    rmSync2(filePath);
-  }
-}
-var SOURCE_COMPOSE_MARKER = join2("backend", "core", "docker-compose.yml");
-var IMAGE_COMPOSE_MARKER = join2("backend", "core", "docker-compose.selfhost.yml");
-function isOpenMatesDir(dir) {
-  return existsSync4(join2(dir, SOURCE_COMPOSE_MARKER)) || existsSync4(join2(dir, IMAGE_COMPOSE_MARKER));
-}
-function resolveServerPath(flags) {
-  if (typeof flags.path === "string" && flags.path) {
-    const explicit = resolve2(flags.path);
-    if (!isOpenMatesDir(explicit)) {
-      throw new Error(
-        `${explicit} does not appear to be an OpenMates installation (missing ${SOURCE_COMPOSE_MARKER} or ${IMAGE_COMPOSE_MARKER}).`
-      );
-    }
-    return explicit;
-  }
-  const config = loadServerConfig();
-  if (config?.installPath && isOpenMatesDir(config.installPath)) {
-    return config.installPath;
-  }
-  const cwd = process.cwd();
-  if (isOpenMatesDir(cwd)) {
-    return cwd;
-  }
-  throw new Error(
-    "No OpenMates installation found.\nRun 'openmates server install' to set up a new server, or use --path <dir>."
-  );
-}
-
-// src/server.ts
 var SOURCE_COMPOSE_FILE = join3("backend", "core", "docker-compose.yml");
 var IMAGE_COMPOSE_FILE = join3("backend", "core", "docker-compose.selfhost.yml");
 var COMPOSE_OVERRIDE = join3("backend", "core", "docker-compose.override.yml");
@@ -7779,6 +7808,15 @@ function setEnvVar(content, name, value) {
 function setEnvIfEmpty(content, name, value) {
   return getEnvVar(content, name) ? content : setEnvVar(content, name, value);
 }
+function firstCsvValue(value) {
+  return value.split(",").map((item) => item.trim()).find(Boolean) ?? "";
+}
+function deriveSelfHostCliUrls(envContent) {
+  return {
+    apiUrl: firstCsvValue(getEnvVar(envContent, "VITE_API_URL")) || "http://localhost:8000",
+    appUrl: firstCsvValue(getEnvVar(envContent, "PRODUCTION_URL")) || "http://localhost:5173"
+  };
+}
 async function fetchText(url) {
   const response = await fetch(url);
   if (!response.ok) {
@@ -8014,6 +8052,7 @@ async function serverInstall(flags) {
     const imageTag = typeof flags["image-tag"] === "string" ? flags["image-tag"] : getDefaultImageTag();
     console.error(`Preparing OpenMates image-mode install at ${installPath}...`);
     await writeImageModeRuntimeFiles(installPath, imageTag);
+    const cliUrls2 = deriveSelfHostCliUrls(readFileSync5(join3(installPath, ".env"), "utf-8"));
     try {
       exec("docker network create openmates", installPath);
     } catch {
@@ -8023,7 +8062,8 @@ async function serverInstall(flags) {
       installedAt: Date.now(),
       composeProfile: "core",
       installMode: "image",
-      imageTag
+      imageTag,
+      ...cliUrls2
     });
     if (flags.json === true) {
       printJson({ command: "install", status: "success", path: installPath, mode: "image", imageTag });
@@ -8037,6 +8077,8 @@ OpenMates installed at ${installPath}`);
       console.log("  2. Open http://localhost:5173");
       if (firstInvite) console.log(`  3. Sign up with invite code: ${firstInvite}`);
       console.log("  4. After signup, make yourself admin: openmates server make-admin your@email.com");
+      console.log(`
+CLI default API: ${cliUrls2.apiUrl}`);
       console.log("\nOptional: edit .env first to add LLM provider API keys. Source builds are available with --from-source.");
     }
     return;
@@ -8079,11 +8121,14 @@ OpenMates installed at ${installPath}`);
     console.error("Setup script failed. Check the output above for details.");
     process.exit(setupCode);
   }
+  const envPath = join3(installPath, ".env");
+  const cliUrls = deriveSelfHostCliUrls(existsSync5(envPath) ? readFileSync5(envPath, "utf-8") : "");
   saveServerConfig({
     installPath,
     installedAt: Date.now(),
     composeProfile: "core",
-    installMode: "source"
+    installMode: "source",
+    ...cliUrls
   });
   if (flags.json === true) {
     printJson({ command: "install", status: "success", path: installPath, mode: "source" });
@@ -8094,6 +8139,8 @@ OpenMates installed at ${installPath}`);
     console.log("  1. Run: openmates server start");
     console.log("  2. Open http://localhost:5173");
     console.log("  3. After signup, make yourself admin: openmates server make-admin your@email.com");
+    console.log(`
+CLI default API: ${cliUrls.apiUrl}`);
     console.log("\nOptional: edit .env first to add LLM provider API keys. Without keys, the web app and backend still start, but AI model processing is unavailable.");
   }
 }
@@ -45138,7 +45185,7 @@ Commands:
 
 Flags:
   --json          Output raw JSON instead of formatted output
-  --api-url <url> Override API base URL (default: https://api.openmates.org)
+  --api-url <url> Override API base URL (default: installed self-host server, then https://api.openmates.org)
   --api-key <key> Optional API key override (or set OPENMATES_API_KEY)
   --help          Show contextual help for any command`);
 }

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   getExtForLang,
   serializeToYaml
-} from "./chunk-3TZYVNWL.js";
+} from "./chunk-NI7XPZBV.js";
 import "./chunk-AXNRPVLE.js";
 export {
   getExtForLang,

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   getExtForLang,
   parseNewChatSuggestionText,
   serializeToYaml
-} from "./chunk-3TZYVNWL.js";
+} from "./chunk-NI7XPZBV.js";
 import "./chunk-AXNRPVLE.js";
 export {
   MATE_NAMES,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmates",
-  "version": "0.11.0-alpha.31",
+  "version": "0.11.0-alpha.32",
   "description": "OpenMates CLI and SDK",
   "type": "module",
   "main": "dist/index.js",