@dev-anywhere/proxy 0.1.0 → 0.1.2

package/dist/serve.js

@@ -5,7 +5,7 @@ import {
   KnownContentBlockSchema,
   SeqCounter,
   StreamJsonEventSchema
-} from "./chunk-JPJMOVQ5.js";
+} from "./chunk-QXOARRC2.js";
 import {
   createFSM,
   defineFSM,
@@ -14,7 +14,7 @@ import {
   serviceLogger,
   shouldReleaseApprovalWait,
   stateAfterApprovalRelease
-} from "./chunk-WXWH6L7J.js";
+} from "./chunk-TG7JPHE5.js";
 import {
   spawnScript
 } from "./chunk-ZUWAB67J.js";
@@ -27,9 +27,12 @@ import {
   CONFIG_PATH,
   ControlErrorCode,
   DATA_DIR,
+  DEFAULT_PROXY_PROFILE,
   HOOK_REGISTRY_PATH,
   MessageEnvelopeSchema,
   PID_PATH,
+  PROFILE_NAME,
+  PROXY_ID_PATH,
   SESSIONS_PATH,
   SOCK_PATH,
   STOPPED_PATH,
@@ -37,11 +40,13 @@ import {
   buildMessage,
   createIpcReader,
   createWorkerReader,
+  defaultHookPortForProfile,
+  ensureProfileWorkspace,
   serializeIpc,
   serializeWorkerMsg,
   sessionPaths,
   tildify
-} from "./chunk-QWPI6YON.js";
+} from "./chunk-DFLQ3TFT.js";
 
 // src/serve.ts
 import { createServer as createServer2 } from "net";
@@ -620,31 +625,20 @@ function parsePort(value, source) {
   }
   return port;
 }
-function resolveFileConfig(fromFile, requestedEnv) {
-  if (!fromFile.envs) {
-    return {
-      envName: void 0,
-      envNameSource: fromFile.relayUrl || fromFile.relayToken || fromFile.hookPort ? "single" : "none",
-      config: fromFile
-    };
-  }
-  const envName = requestedEnv ?? fromFile.defaultEnv ?? "local";
-  const config = fromFile.envs[envName];
-  if (!config) {
-    const available = Object.keys(fromFile.envs).sort();
-    throw new Error(
-      `Unknown config env "${envName}". Available envs: ${available.length > 0 ? available.join(", ") : "(none)"}`
-    );
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function validateConfigShape(value) {
+  if (!isRecord(value) || !isRecord(value.profiles) || !isRecord(value.relays)) {
+    throw new Error(`Invalid config shape in ${CONFIG_PATH}: expected "profiles" and "relays".`);
   }
-  return {
-    envName,
-    envNameSource: requestedEnv ? "cli" : fromFile.defaultEnv ? "file" : "default",
-    config
-  };
+  return value;
 }
 function readConfigFile() {
-  if (!existsSync3(CONFIG_PATH)) return {};
-  return JSON.parse(readFileSync3(CONFIG_PATH, "utf-8"));
+  if (!existsSync3(CONFIG_PATH)) {
+    throw new Error(`Dev Anywhere config not found at ${CONFIG_PATH}. Run "dev-anywhere init".`);
+  }
+  return validateConfigShape(JSON.parse(readFileSync3(CONFIG_PATH, "utf-8")));
 }
 function agentCliField(provider) {
   return provider === "claude" ? "claudeBin" : "codexBin";
@@ -669,68 +663,71 @@ function uniqueAbsolutePaths(paths) {
   }
   return result;
 }
-function updateAgentCliPathInEnvConfig(config, provider, path) {
-  const field = agentCliField(provider);
-  const historyField = agentCliHistoryField(provider);
-  const history = uniqueAbsolutePaths([path, ...config[historyField] ?? []]).slice(0, 8);
+function resolveRelayConfig(fromFile, requestedRelayName) {
+  const profile = fromFile.profiles[PROFILE_NAME];
+  if (!profile) {
+    const available = Object.keys(fromFile.profiles).sort();
+    throw new Error(
+      `Unknown profile "${PROFILE_NAME}". Available profiles: ${available.length > 0 ? available.join(", ") : "(none)"}`
+    );
+  }
+  const relayName = requestedRelayName?.trim() || profile.relay?.trim();
+  if (!relayName) {
+    throw new Error(`Profile "${PROFILE_NAME}" must specify a relay.`);
+  }
+  const relay = fromFile.relays[relayName];
+  if (!relay) {
+    const available = Object.keys(fromFile.relays).sort();
+    throw new Error(
+      `Unknown relay "${relayName}". Available relays: ${available.length > 0 ? available.join(", ") : "(none)"}`
+    );
+  }
   return {
-    ...config,
-    [field]: path,
-    [historyField]: history
+    relayName,
+    relayNameSource: requestedRelayName?.trim() ? "cli" : "profile",
+    relay
   };
 }
 function loadConfig(options) {
-  let fromFile = {};
-  if (existsSync3(CONFIG_PATH)) {
-    try {
-      fromFile = readConfigFile();
-    } catch (err) {
-      serviceLogger.warn(
-        { path: CONFIG_PATH, err: err instanceof Error ? err.message : String(err) },
-        "Failed to parse config file, falling back to env-only"
-      );
-    }
-  } else {
-    serviceLogger.debug({ path: CONFIG_PATH }, "Config file not found, using env-only");
-  }
-  const resolved = resolveFileConfig(fromFile, options?.envName);
-  const hookPortFromFile = resolved.config.hookPort ?? fromFile.hookPort;
-  const claudeBinFromFile = resolved.config.claudeBin ?? fromFile.claudeBin;
-  const codexBinFromFile = resolved.config.codexBin ?? fromFile.codexBin;
-  const claudeBinHistory = [
-    ...resolved.config.claudeBinHistory ?? [],
-    ...fromFile.claudeBinHistory ?? []
-  ];
-  const codexBinHistory = [
-    ...resolved.config.codexBinHistory ?? [],
-    ...fromFile.codexBinHistory ?? []
-  ];
-  const claudeBin = process.env.CLAUDE_BIN ?? claudeBinFromFile;
-  const codexBin = process.env.CODEX_BIN ?? codexBinFromFile;
+  const fromFile = readConfigFile();
+  const agentCli = fromFile.agentCli ?? {};
+  const resolved = resolveRelayConfig(fromFile, options?.relayName);
+  const claudeBin = process.env.CLAUDE_BIN ?? agentCli.claudeBin;
+  const codexBin = process.env.CODEX_BIN ?? agentCli.codexBin;
   const config = {
-    envName: resolved.envName,
-    relayUrl: process.env.RELAY_URL ?? resolved.config.relayUrl,
-    relayToken: process.env.RELAY_PROXY_TOKEN ?? resolved.config.relayToken,
-    hookPort: parsePort(process.env.DEV_ANYWHERE_HOOK_PORT, "DEV_ANYWHERE_HOOK_PORT") ?? hookPortFromFile ?? 17654,
+    profileName: PROFILE_NAME,
+    relayName: resolved.relayName,
+    relayUrl: process.env.RELAY_URL ?? resolved.relay.url,
+    relayToken: process.env.RELAY_PROXY_TOKEN ?? resolved.relay.proxyToken,
+    hookPort: parsePort(process.env.DEV_ANYWHERE_HOOK_PORT, "DEV_ANYWHERE_HOOK_PORT") ?? defaultHookPortForProfile(PROFILE_NAME),
     claudeBin,
     codexBin,
     agentCliSuggestions: {
-      claude: uniqueAbsolutePaths([process.env.CLAUDE_BIN, claudeBinFromFile, ...claudeBinHistory]),
-      codex: uniqueAbsolutePaths([process.env.CODEX_BIN, codexBinFromFile, ...codexBinHistory])
+      claude: uniqueAbsolutePaths([
+        process.env.CLAUDE_BIN,
+        agentCli.claudeBin,
+        ...agentCli.claudeBinHistory ?? []
+      ]),
+      codex: uniqueAbsolutePaths([
+        process.env.CODEX_BIN,
+        agentCli.codexBin,
+        ...agentCli.codexBinHistory ?? []
+      ])
     },
     sources: {
-      envName: resolved.envNameSource,
-      relayUrl: process.env.RELAY_URL ? "env" : resolved.config.relayUrl ? "file" : "none",
-      relayToken: process.env.RELAY_PROXY_TOKEN ? "env" : resolved.config.relayToken ? "file" : "none",
-      hookPort: process.env.DEV_ANYWHERE_HOOK_PORT ? "env" : hookPortFromFile ? "file" : "default",
-      claudeBin: process.env.CLAUDE_BIN ? "env" : claudeBinFromFile ? "file" : "none",
-      codexBin: process.env.CODEX_BIN ? "env" : codexBinFromFile ? "file" : "none"
+      relayName: resolved.relayNameSource,
+      relayUrl: process.env.RELAY_URL ? "env" : resolved.relay.url ? "file" : "none",
+      relayToken: process.env.RELAY_PROXY_TOKEN ? "env" : resolved.relay.proxyToken ? "file" : "none",
+      hookPort: process.env.DEV_ANYWHERE_HOOK_PORT ? "env" : "default",
+      claudeBin: process.env.CLAUDE_BIN ? "env" : agentCli.claudeBin ? "file" : "none",
+      codexBin: process.env.CODEX_BIN ? "env" : agentCli.codexBin ? "file" : "none"
     }
   };
   serviceLogger.info(
     {
-      envName: config.envName ?? "(single)",
-      envNameSource: config.sources.envName,
+      profile: config.profileName,
+      relayName: config.relayName,
+      relayNameSource: config.sources.relayName,
       relayUrl: config.relayUrl ?? "(unset)",
       relayUrlSource: config.sources.relayUrl,
       relayTokenSource: config.sources.relayToken,
@@ -750,20 +747,20 @@ function buildProviderEnv(config, baseEnv = process.env) {
     ...config.codexBin ? { CODEX_BIN: config.codexBin } : {}
   };
 }
-function saveAgentCliPath(provider, path, options) {
+function updateAgentCliConfig(config, provider, path) {
+  const field = agentCliField(provider);
+  const historyField = agentCliHistoryField(provider);
+  const history = uniqueAbsolutePaths([path, ...config[historyField] ?? []]).slice(0, 8);
+  return {
+    ...config,
+    [field]: path,
+    [historyField]: history
+  };
+}
+function saveAgentCliPath(provider, path) {
   const normalized = validateAgentCliPath(path);
   const fromFile = readConfigFile();
-  const resolved = resolveFileConfig(fromFile, options?.envName);
-  if (fromFile.envs) {
-    const envName = resolved.envName ?? options?.envName ?? fromFile.defaultEnv ?? "local";
-    fromFile.envs[envName] = updateAgentCliPathInEnvConfig(
-      fromFile.envs[envName] ?? {},
-      provider,
-      normalized
-    );
-  } else {
-    Object.assign(fromFile, updateAgentCliPathInEnvConfig(fromFile, provider, normalized));
-  }
+  fromFile.agentCli = updateAgentCliConfig(fromFile.agentCli ?? {}, provider, normalized);
   mkdirSync3(dirname3(CONFIG_PATH), { recursive: true });
   writeFileSync3(CONFIG_PATH, `${JSON.stringify(fromFile, null, 2)}
 `, "utf-8");
@@ -2063,7 +2060,7 @@ function terminateSessionByOwnership(deps, sessionId) {
 }
 
 // src/serve/clipboard-image-upload.ts
-import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync5, statSync, writeFileSync as writeFileSync4 } from "fs";
 import { isAbsolute as isAbsolute3, join as join5, relative, resolve } from "path";
 import { nanoid as nanoid3 } from "nanoid";
 var MAX_CLIPBOARD_IMAGE_BYTES = 10 * 1024 * 1024;
@@ -2096,15 +2093,50 @@ function decodeBase64Image(dataBase64) {
   }
   return buffer;
 }
-function resolveSessionClipboardDir(dataDir, sessionId) {
-  const root = resolve(dataDir);
-  const uploadDir = resolve(root, sessionId, "clipboard");
+function resolveChildDir(rootPath, ...segments) {
+  const root = resolve(rootPath);
+  const uploadDir = resolve(root, ...segments);
   const relativePath = relative(root, uploadDir);
   if (!relativePath || relativePath.startsWith("..") || isAbsolute3(relativePath)) {
     throw new Error("\u4F1A\u8BDD\u8DEF\u5F84\u65E0\u6548");
   }
   return uploadDir;
 }
+function resolveSessionClipboardDir(dataDir, sessionId) {
+  return resolveChildDir(dataDir, sessionId, "clipboard");
+}
+function normalizeGitignoreLine(line) {
+  return line.trim().replace(/^\/+/, "").replace(/\/+$/, "");
+}
+function ensureProjectClipboardIgnored(cwd) {
+  const gitignorePath = join5(cwd, ".gitignore");
+  if (!existsSync5(gitignorePath)) return;
+  try {
+    const current = readFileSync5(gitignorePath, "utf-8");
+    const alreadyIgnored = current.split(/\r?\n/).some((line) => normalizeGitignoreLine(line) === ".dev-anywhere");
+    if (alreadyIgnored) return;
+    const separator = current.length > 0 && !current.endsWith("\n") ? "\n" : "";
+    writeFileSync4(gitignorePath, `${current}${separator}.dev-anywhere/
+`);
+  } catch {
+  }
+}
+function trySaveProjectClipboardImage(options) {
+  if (!options.cwd) return null;
+  try {
+    const cwd = resolve(options.cwd);
+    if (!statSync(cwd).isDirectory()) return null;
+    const clipboardRoot = resolve(cwd, ".dev-anywhere", "clipboard");
+    const uploadDir = resolveChildDir(clipboardRoot, options.sessionId);
+    const path = join5(uploadDir, options.fileName);
+    mkdirSync4(uploadDir, { recursive: true });
+    writeFileSync4(path, options.buffer, { mode: 384 });
+    ensureProjectClipboardIgnored(cwd);
+    return { success: true, path: relative(cwd, path) };
+  } catch {
+    return null;
+  }
+}
 function saveClipboardImageUpload(request, options = {}) {
   const extension = IMAGE_EXTENSIONS.get(request.mimeType);
   if (!extension) {
@@ -2116,12 +2148,19 @@ function saveClipboardImageUpload(request, options = {}) {
     };
   }
   try {
-    const dataDir = options.dataDir ?? DATA_DIR;
-    const uploadDir = resolveSessionClipboardDir(dataDir, request.sessionId);
     const buffer = decodeBase64Image(request.dataBase64);
     const now = options.now ?? Date.now;
     const suffix = options.randomSuffix?.() ?? nanoid3(6);
     const fileName = `pasted-${formatTimestamp(now())}-${suffix}.${extension}`;
+    const projectResult = trySaveProjectClipboardImage({
+      cwd: options.cwd,
+      sessionId: request.sessionId,
+      fileName,
+      buffer
+    });
+    if (projectResult) return projectResult;
+    const dataDir = options.dataDir ?? DATA_DIR;
+    const uploadDir = resolveSessionClipboardDir(dataDir, request.sessionId);
     const path = join5(uploadDir, fileName);
     mkdirSync4(uploadDir, { recursive: true });
     writeFileSync4(path, buffer, { mode: 384 });
@@ -2229,12 +2268,17 @@ var RelayInputHandlers = class {
       serviceLogger.warn({ sessionId }, "Clipboard image upload rejected: session not found");
       return;
     }
-    const result = saveClipboardImageUpload({
-      sessionId,
-      mimeType: typeof msg.mimeType === "string" ? msg.mimeType : "",
-      dataBase64: typeof msg.dataBase64 === "string" ? msg.dataBase64 : "",
-      fileName: typeof msg.fileName === "string" ? msg.fileName : void 0
-    });
+    const result = saveClipboardImageUpload(
+      {
+        sessionId,
+        mimeType: typeof msg.mimeType === "string" ? msg.mimeType : "",
+        dataBase64: typeof msg.dataBase64 === "string" ? msg.dataBase64 : "",
+        fileName: typeof msg.fileName === "string" ? msg.fileName : void 0
+      },
+      {
+        cwd: session.cwd
+      }
+    );
     this.deps.relayConnection.sendRaw(
       JSON.stringify({
         type: "clipboard_image_upload_response",
@@ -2444,14 +2488,14 @@ var RelayPermissionHandlers = class {
 
 // src/serve/relay-resource-handlers.ts
 import { homedir as homedir4 } from "os";
-import { accessSync, constants, statSync } from "fs";
+import { accessSync, constants, statSync as statSync2 } from "fs";
 function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
 function validateExecutablePath(path) {
   const normalized = path.trim();
   if (!normalized.startsWith("/")) throw new Error("CLI \u8DEF\u5F84\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
-  const stat2 = statSync(normalized);
+  const stat2 = statSync2(normalized);
   if (!stat2.isFile()) throw new Error("CLI \u8DEF\u5F84\u4E0D\u662F\u53EF\u6267\u884C\u6587\u4EF6");
   accessSync(normalized, constants.X_OK);
   return normalized;
@@ -2491,7 +2535,7 @@ var RelayResourceHandlers = class {
     }
     try {
       const path = validateExecutablePath(rawPath ?? "");
-      saveAgentCliPath(provider, path, { envName: this.deps.envName });
+      saveAgentCliPath(provider, path);
       this.deps.setAgentCliPath(provider, path);
       const agentCli = detectAgentCliStatus(this.deps.getProviderEnv(), {
         suggestions: this.deps.getAgentCliSuggestions()
@@ -2560,7 +2604,7 @@ var RelayResourceHandlers = class {
 };
 
 // src/serve/relay-session-create-handler.ts
-import { rmSync, statSync as statSync2 } from "fs";
+import { rmSync, statSync as statSync3 } from "fs";
 import { isAbsolute as isAbsolute4 } from "path";
 import { nanoid as nanoid4 } from "nanoid";
 
@@ -2855,7 +2899,7 @@ function validateSessionCwd(cwd) {
     return { message: "\u5DE5\u4F5C\u76EE\u5F55\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84", code: ControlErrorCode.INVALID_PATH };
   }
   try {
-    const stat2 = statSync2(trimmed);
+    const stat2 = statSync3(trimmed);
     return stat2.isDirectory() ? null : { message: "\u5DE5\u4F5C\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55", code: ControlErrorCode.PATH_NOT_DIRECTORY };
   } catch (err) {
     return {
@@ -3110,7 +3154,6 @@ var RelayRouter = class {
       relaySend: deps.relaySend,
       controlHandlers: deps.controlHandlers,
       sessionManager: deps.sessionManager,
-      envName: deps.envName,
       getProviderEnv: deps.getProviderEnv,
       getAgentCliSuggestions: deps.getAgentCliSuggestions,
       setAgentCliPath: deps.setAgentCliPath
@@ -3652,7 +3695,7 @@ function touchSessionActivity(sessionManager, relay, sessionId, now = Date.now()
 
 // src/serve/service-files.ts
 import { execSync } from "child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync5, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6, unlinkSync as unlinkSync2 } from "fs";
 import { hostname } from "os";
 import { connect as connect2 } from "net";
 function tryConnectSocket(sockPath) {
@@ -3671,7 +3714,7 @@ function isProcessAlive(pid) {
   }
 }
 async function cleanupStaleResources() {
-  if (existsSync5(SOCK_PATH)) {
+  if (existsSync6(SOCK_PATH)) {
     const existing = await tryConnectSocket(SOCK_PATH);
     if (existing) {
       existing.destroy();
@@ -3683,8 +3726,8 @@ async function cleanupStaleResources() {
     unlinkSync2(SOCK_PATH);
     serviceLogger.info("Removed stale socket file");
   }
-  if (existsSync5(PID_PATH)) {
-    const pidStr = readFileSync5(PID_PATH, "utf-8").trim();
+  if (existsSync6(PID_PATH)) {
+    const pidStr = readFileSync6(PID_PATH, "utf-8").trim();
     const pid = parseInt(pidStr, 10);
     if (!isNaN(pid) && isProcessAlive(pid)) {
       const msg = `Another service is already running with PID ${pid}`;
@@ -3696,8 +3739,13 @@ async function cleanupStaleResources() {
     serviceLogger.info("Removed stale PID file");
   }
 }
+function formatProxyNameForProfile(baseName, profileName = PROFILE_NAME) {
+  return profileName === DEFAULT_PROXY_PROFILE ? baseName : `${baseName} (${profileName})`;
+}
 function getProxyName() {
-  return process.env.DEV_ANYWHERE_PROXY_NAME || getComputerName() || hostname();
+  const explicitName = process.env.DEV_ANYWHERE_PROXY_NAME?.trim();
+  if (explicitName) return explicitName;
+  return formatProxyNameForProfile(getComputerName() || hostname());
 }
 function getComputerName() {
   try {
@@ -4054,7 +4102,7 @@ function handleTerminalConnection(socket, deps) {
 
 // src/serve/hook-registry.ts
 import { createHash, randomBytes } from "crypto";
-import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync6, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
 import { dirname as dirname4 } from "path";
 import { z } from "zod";
 var PersistedHookSessionBindingSchema = z.object({
@@ -4115,10 +4163,10 @@ var HookRegistry = class {
     }
   }
   load() {
-    if (!this.persistPath || !existsSync6(this.persistPath)) return;
+    if (!this.persistPath || !existsSync7(this.persistPath)) return;
     try {
       const parsed = PersistedHookRegistrySchema.parse(
-        JSON.parse(readFileSync6(this.persistPath, "utf8"))
+        JSON.parse(readFileSync7(this.persistPath, "utf8"))
       );
       this.bindingsBySession.clear();
       for (const binding of parsed.bindings) {
@@ -4434,24 +4482,25 @@ function parseServiceOptions(argv) {
   const options = {};
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
-    if (arg === "--env") {
-      const envName = argv[i + 1];
-      if (!envName || envName.startsWith("-")) {
-        throw new Error("Missing value for --env");
+    if (arg === "--relay") {
+      const relayName = argv[i + 1];
+      if (!relayName || relayName.startsWith("-")) {
+        throw new Error("Missing value for --relay");
       }
-      options.envName = envName;
+      options.relayName = relayName;
       i++;
       continue;
     }
-    if (arg.startsWith("--env=")) {
-      const envName = arg.slice("--env=".length);
-      if (!envName) throw new Error("Missing value for --env");
-      options.envName = envName;
+    if (arg.startsWith("--relay=")) {
+      const relayName = arg.slice("--relay=".length);
+      if (!relayName) throw new Error("Missing value for --relay");
+      options.relayName = relayName;
     }
   }
   return options;
 }
 async function startService(options) {
+  ensureProfileWorkspace();
   await cleanupStaleResources();
   try {
     unlinkSync3(STOPPED_PATH);
@@ -4479,7 +4528,7 @@ async function startService(options) {
   sessionManager.startReaper();
   const terminalSockets = /* @__PURE__ */ new Map();
   const proxyName = getProxyName();
-  let proxyConfig = loadConfig({ envName: options?.envName });
+  let proxyConfig = loadConfig({ relayName: options?.relayName });
   const getProviderEnv = () => buildProviderEnv(proxyConfig, process.env);
   const getAgentCliSuggestions = () => proxyConfig.agentCliSuggestions;
   const setAgentCliPath = (provider, path) => {
@@ -4501,8 +4550,9 @@ async function startService(options) {
   const relayUrl = options?.relayUrl ?? proxyConfig.relayUrl;
   const relayToken = proxyConfig.relayToken;
   const statusConfig = {
-    envName: proxyConfig.envName,
-    envNameSource: proxyConfig.sources.envName,
+    profile: PROFILE_NAME,
+    relayName: proxyConfig.relayName,
+    relayNameSource: proxyConfig.sources.relayName,
     relayUrl,
     relayUrlSource: proxyConfig.sources.relayUrl,
     relayTokenSource: proxyConfig.sources.relayToken,
@@ -4510,12 +4560,16 @@ async function startService(options) {
     hookPortSource: proxyConfig.sources.hookPort
   };
   if (!relayUrl) {
-    const msg = 'Relay URL is required. Set it via RELAY_URL or ~/.dev-anywhere/config.json {"defaultEnv":"local","envs":{"local":{"relayUrl":"ws://..."}}}.';
+    const msg = `Relay URL is required. Set relays.${proxyConfig.relayName}.url in ~/.dev-anywhere/config.json or pass --relay <name>.`;
     serviceLogger.error(msg);
     console.error(msg);
     process.exit(1);
   }
-  const relayConnection = new RelayConnection(relayUrl, { name: proxyName, token: relayToken });
+  const relayConnection = new RelayConnection(relayUrl, {
+    name: proxyName,
+    token: relayToken,
+    proxyIdPath: PROXY_ID_PATH
+  });
   const relaySend = (data) => relayConnection.sendRaw(data);
   const controlHandlers = createControlMessageHandlers(relaySend, sessionManager);
   const observerChangeState = (sessionId, next) => changeSessionState(sessionManager, relayConnection, sessionId, next);
@@ -4577,7 +4631,8 @@ async function startService(options) {
   relayConnection.connect();
   serviceLogger.info(
     {
-      envName: proxyConfig.envName ?? "(single)",
+      relayName: proxyConfig.relayName,
+      profile: PROFILE_NAME,
       relayUrl,
       proxyName,
       tokenSet: !!relayToken,
@@ -4601,7 +4656,6 @@ async function startService(options) {
     permissionBroker,
     hookEventRouter: hookRuntime.hookEventRouter,
     agentStatusRegistry,
-    envName: proxyConfig.envName,
     getProviderEnv,
     getAgentCliSuggestions,
     setAgentCliPath