@dev-anywhere/proxy 0.0.6 → 0.1.1

package/dist/serve.js

@@ -5,7 +5,7 @@ import {
   KnownContentBlockSchema,
   SeqCounter,
   StreamJsonEventSchema
-} from "./chunk-2XDZRLST.js";
+} from "./chunk-QXOARRC2.js";
 import {
   createFSM,
   defineFSM,
@@ -14,7 +14,7 @@ import {
   serviceLogger,
   shouldReleaseApprovalWait,
   stateAfterApprovalRelease
-} from "./chunk-XRTTHTM2.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,15 +40,17 @@ import {
   buildMessage,
   createIpcReader,
   createWorkerReader,
+  defaultHookPortForProfile,
+  ensureProfileWorkspace,
   serializeIpc,
   serializeWorkerMsg,
   sessionPaths,
   tildify
-} from "./chunk-VHCL7NVJ.js";
+} from "./chunk-DFLQ3TFT.js";
 
 // src/serve.ts
 import { createServer as createServer2 } from "net";
-import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync5, chmodSync, rmSync as rmSync2 } from "fs";
+import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync6, chmodSync, rmSync as rmSync2 } from "fs";
 
 // src/serve/session-manager.ts
 import { mkdirSync, readFileSync, renameSync, writeFileSync, existsSync } from "fs";
@@ -183,6 +188,14 @@ var SessionManager = class {
     serviceLogger.info({ sessionId: id, from: oldState, to: newState }, "Session state changed");
     return true;
   }
+  touchSession(id, now = Date.now(), minIntervalMs = 0) {
+    const session = this.sessions.get(id);
+    if (!session) return false;
+    if (now - session.updatedAt < minIntervalMs) return false;
+    session.updatedAt = now;
+    this.save();
+    return true;
+  }
   terminateSession(id, context) {
     const session = this.sessions.get(id);
     if (!session) {
@@ -612,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";
@@ -661,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,
@@ -742,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");
@@ -1078,7 +1083,7 @@ function extractConversationText(msg) {
   return null;
 }
 async function extractTitleAndCwd(filePath) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const rl = createInterface({
       input: createReadStream(filePath, { encoding: "utf-8" }),
       crlfDelay: Infinity
@@ -1106,10 +1111,10 @@ async function extractTitleAndCwd(filePath) {
       }
     });
     rl.on("close", () => {
-      if (!resolved) resolve({ title, cwd });
-      else resolve({ title, cwd });
+      if (!resolved) resolve2({ title, cwd });
+      else resolve2({ title, cwd });
     });
-    rl.on("error", () => resolve({ title, cwd }));
+    rl.on("error", () => resolve2({ title, cwd }));
   });
 }
 async function collectJsonlFiles(root) {
@@ -1131,7 +1136,7 @@ async function collectJsonlFiles(root) {
   return files;
 }
 async function extractCodexTitleAndCwd(filePath) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const rl = createInterface({
       input: createReadStream(filePath, { encoding: "utf-8" }),
       crlfDelay: Infinity
@@ -1155,8 +1160,8 @@ async function extractCodexTitleAndCwd(filePath) {
       } catch {
       }
     });
-    rl.on("close", () => resolve({ id, title, cwd }));
-    rl.on("error", () => resolve({ id, title, cwd }));
+    rl.on("close", () => resolve2({ id, title, cwd }));
+    rl.on("error", () => resolve2({ id, title, cwd }));
   });
 }
 function extractCodexUserText(payload) {
@@ -1721,16 +1726,16 @@ var WorkerRegistry = class {
     return workerPid;
   }
   connect(sessionId, sockPath) {
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       const sock = connect(sockPath);
       sock.on("connect", () => {
         this.sockets.set(sessionId, sock);
         createWorkerReader(sock, (msg) => this.handleWorkerMessage(sessionId, msg));
         sock.on("close", () => this.onDisconnect(sessionId));
         sock.on("error", () => this.onDisconnect(sessionId));
-        resolve(sock);
+        resolve2(sock);
       });
-      sock.on("error", () => resolve(null));
+      sock.on("error", () => resolve2(null));
     });
   }
   // 枚举 DATA_DIR 下所有 session 目录，尝试连接存活的 worker.sock；失败则清理 stale socket。
@@ -1856,6 +1861,7 @@ var WorkerRegistry = class {
       return;
     }
     const ev = parsed.data;
+    this.deps.touchSessionActivity?.(sessionId);
     const isStreamDeltaSession = this.streamDeltaSessions.has(sessionId);
     if (ev.type === "stream_event") {
       const delta = ContentBlockDeltaSchema.safeParse(ev.event);
@@ -2053,6 +2059,80 @@ function terminateSessionByOwnership(deps, sessionId) {
   return { success: false, action: "not_found" };
 }
 
+// src/serve/clipboard-image-upload.ts
+import { mkdirSync as mkdirSync4, 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;
+var MAX_CLIPBOARD_IMAGE_BASE64_LENGTH = Math.ceil(MAX_CLIPBOARD_IMAGE_BYTES / 3) * 4;
+var IMAGE_EXTENSIONS = /* @__PURE__ */ new Map([
+  ["image/png", "png"],
+  ["image/jpeg", "jpg"],
+  ["image/webp", "webp"],
+  ["image/gif", "gif"]
+]);
+function formatTimestamp(ms) {
+  const [date, time = "000000"] = new Date(ms).toISOString().replace(/\.\d{3}Z$/, "").split("T");
+  return `${date.replace(/-/g, "")}-${time.replace(/:/g, "")}`;
+}
+function normalizeBase64(input) {
+  return input.replace(/^data:[^;]+;base64,/i, "").replace(/\s/g, "");
+}
+function decodeBase64Image(dataBase64) {
+  const normalized = normalizeBase64(dataBase64);
+  if (normalized.length > MAX_CLIPBOARD_IMAGE_BASE64_LENGTH) {
+    throw new Error("\u56FE\u7247\u8D85\u8FC7 10MB \u9650\u5236");
+  }
+  if (!normalized || !/^[A-Za-z0-9+/]*={0,2}$/.test(normalized)) {
+    throw new Error("\u56FE\u7247\u6570\u636E\u4E0D\u662F\u6709\u6548\u7684 base64");
+  }
+  const buffer = Buffer.from(normalized, "base64");
+  if (buffer.length === 0) throw new Error("\u56FE\u7247\u6570\u636E\u4E3A\u7A7A");
+  if (buffer.length > MAX_CLIPBOARD_IMAGE_BYTES) {
+    throw new Error("\u56FE\u7247\u8D85\u8FC7 10MB \u9650\u5236");
+  }
+  return buffer;
+}
+function resolveSessionClipboardDir(dataDir, sessionId) {
+  const root = resolve(dataDir);
+  const uploadDir = resolve(root, sessionId, "clipboard");
+  const relativePath = relative(root, uploadDir);
+  if (!relativePath || relativePath.startsWith("..") || isAbsolute3(relativePath)) {
+    throw new Error("\u4F1A\u8BDD\u8DEF\u5F84\u65E0\u6548");
+  }
+  return uploadDir;
+}
+function saveClipboardImageUpload(request, options = {}) {
+  const extension = IMAGE_EXTENSIONS.get(request.mimeType);
+  if (!extension) {
+    return {
+      success: false,
+      path: "",
+      error: "\u4E0D\u652F\u6301\u8FD9\u79CD\u56FE\u7247\u683C\u5F0F",
+      errorCode: ControlErrorCode.UNKNOWN
+    };
+  }
+  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 path = join5(uploadDir, fileName);
+    mkdirSync4(uploadDir, { recursive: true });
+    writeFileSync4(path, buffer, { mode: 384 });
+    return { success: true, path };
+  } catch (err) {
+    return {
+      success: false,
+      path: "",
+      error: err instanceof Error ? err.message : String(err),
+      errorCode: ControlErrorCode.UNKNOWN
+    };
+  }
+}
+
 // src/serve/pty-input.ts
 function serializeRawPtyInput(sessionId, data) {
   return serializeIpc({ type: "pty_input", sessionId, data });
@@ -2126,6 +2206,42 @@ var RelayInputHandlers = class {
     ts.write(serializeRawPtyInput(sessionId, data));
     serviceLogger.info({ sessionId, bytes: data.length }, "Raw PTY input forwarded");
   }
+  onClipboardImageUpload(msg) {
+    const sessionId = msg.sessionId;
+    const requestId = msg.requestId;
+    if (!sessionId) return;
+    const session = this.deps.sessionManager.getSession(sessionId);
+    if (!session) {
+      this.deps.relayConnection.sendRaw(
+        JSON.stringify({
+          type: "clipboard_image_upload_response",
+          requestId,
+          sessionId,
+          success: false,
+          path: "",
+          error: "\u4F1A\u8BDD\u4E0D\u5B58\u5728",
+          errorCode: ControlErrorCode.SESSION_NOT_FOUND
+        })
+      );
+      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
+    });
+    this.deps.relayConnection.sendRaw(
+      JSON.stringify({
+        type: "clipboard_image_upload_response",
+        requestId,
+        sessionId,
+        ...result
+      })
+    );
+    serviceLogger.info({ sessionId, success: result.success }, "Clipboard image upload handled");
+  }
 };
 
 // src/serve/relay-history-handlers.ts
@@ -2372,7 +2488,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()
@@ -2442,8 +2558,8 @@ var RelayResourceHandlers = class {
 
 // src/serve/relay-session-create-handler.ts
 import { rmSync, statSync as statSync2 } from "fs";
-import { isAbsolute as isAbsolute3 } from "path";
-import { nanoid as nanoid3 } from "nanoid";
+import { isAbsolute as isAbsolute4 } from "path";
+import { nanoid as nanoid4 } from "nanoid";
 
 // src/serve/hosted-pty-registry.ts
 import * as pty from "node-pty";
@@ -2595,6 +2711,7 @@ var HostedPtyRegistry = class {
     hosted.lastOutputTime = Date.now();
     hosted.outputSeq += 1;
     hosted.terminal.write(data);
+    this.deps.touchSessionActivity(sessionId);
     this.sendBinary(sessionId, Buffer.from(data, "utf-8"), hosted.outputSeq);
     const oscSequences = extractOscSequences(data);
     const session = this.deps.sessionManager.getSession(sessionId);
@@ -2731,7 +2848,7 @@ function validateSessionCwd(cwd) {
     return { message: "\u8BF7\u8F93\u5165\u5DE5\u4F5C\u76EE\u5F55", code: ControlErrorCode.INVALID_PATH };
   }
   const trimmed = cwd.trim();
-  if (!isAbsolute3(trimmed)) {
+  if (!isAbsolute4(trimmed)) {
     return { message: "\u5DE5\u4F5C\u76EE\u5F55\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84", code: ControlErrorCode.INVALID_PATH };
   }
   try {
@@ -2790,7 +2907,7 @@ var RelaySessionCreateHandler = class {
     const resumeSessionId = msg.resumeSessionId;
     const streamDelta = msg.streamDelta === true;
     const name = tildify(sessionCwd);
-    const pendingId = nanoid3();
+    const pendingId = nanoid4();
     const hook = this.deps.createHookContext(pendingId, provider);
     const workerPid = this.deps.workerRegistry.spawn(pendingId, {
       cwd: sessionCwd,
@@ -2875,7 +2992,7 @@ var RelaySessionCreateHandler = class {
       return;
     }
     const resumeSessionId = msg.resumeSessionId;
-    const pendingId = nanoid3();
+    const pendingId = nanoid4();
     const name = tildify(cwd);
     const hook = this.deps.createHookContext(pendingId, provider);
     try {
@@ -2990,7 +3107,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
@@ -3042,6 +3158,7 @@ var RelayRouter = class {
   handlers = {
     user_input: (msg) => this.inputHandlers.onUserInput(msg),
     remote_input_raw: (msg) => this.inputHandlers.onRemoteInputRaw(msg),
+    clipboard_image_upload: (msg) => this.inputHandlers.onClipboardImageUpload(msg),
     tool_approve: (msg) => this.permissionHandlers.onToolApprove(msg),
     tool_deny: (msg) => this.permissionHandlers.onToolDeny(msg),
     proxy_info_request: (msg) => this.resourceHandlers.onProxyInfoRequest(msg),
@@ -3232,11 +3349,11 @@ var PermissionBroker = class {
         message: "Duplicate permission request id."
       });
     }
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       this.pending.set(request.requestId, {
         ...request,
         source: "hook",
-        resolve,
+        resolve: resolve2,
         createdAt: Date.now()
       });
     });
@@ -3460,6 +3577,7 @@ var AgentStatusRegistry = class {
 };
 
 // src/serve/session-broadcast.ts
+var ACTIVITY_STATUS_PUSH_INTERVAL_MS = 15e3;
 function toSessionListPayload(s) {
   return {
     sessionId: s.id,
@@ -3522,6 +3640,11 @@ function changeSessionState(sessionManager, relay, sessionId, next) {
   if (changed) pushSessionStatus(relay, sessionManager, sessionId);
   return changed;
 }
+function touchSessionActivity(sessionManager, relay, sessionId, now = Date.now()) {
+  const touched = sessionManager.touchSession(sessionId, now, ACTIVITY_STATUS_PUSH_INTERVAL_MS);
+  if (touched) pushSessionStatus(relay, sessionManager, sessionId);
+  return touched;
+}
 
 // src/serve/service-files.ts
 import { execSync } from "child_process";
@@ -3529,10 +3652,10 @@ import { existsSync as existsSync5, readFileSync as readFileSync5, unlinkSync as
 import { hostname } from "os";
 import { connect as connect2 } from "net";
 function tryConnectSocket(sockPath) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     const s = connect2(sockPath);
-    s.on("connect", () => resolve(s));
-    s.on("error", () => resolve(null));
+    s.on("connect", () => resolve2(s));
+    s.on("error", () => resolve2(null));
   });
 }
 function isProcessAlive(pid) {
@@ -3569,8 +3692,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 {
@@ -3876,6 +4004,7 @@ function handleTerminalConnection(socket, deps) {
     },
     (sessionId, data, outputSeq) => {
       if (!sessionManager.getSession(sessionId)) return;
+      touchSessionActivity(sessionManager, relayConnection, sessionId);
       const sessionIdBuf = Buffer.from(sessionId, "utf-8");
       const wsFrame = Buffer.alloc(1 + sessionIdBuf.length + 4 + data.length);
       wsFrame[0] = sessionIdBuf.length;
@@ -3926,7 +4055,7 @@ function handleTerminalConnection(socket, deps) {
 
 // src/serve/hook-registry.ts
 import { createHash, randomBytes } from "crypto";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync6, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
 import { dirname as dirname4 } from "path";
 import { z } from "zod";
 var PersistedHookSessionBindingSchema = z.object({
@@ -4006,9 +4135,9 @@ var HookRegistry = class {
   save() {
     if (!this.persistPath) return;
     try {
-      mkdirSync4(dirname4(this.persistPath), { recursive: true });
+      mkdirSync5(dirname4(this.persistPath), { recursive: true });
       const tmpPath = `${this.persistPath}.${process.pid}.${Date.now()}.tmp`;
-      writeFileSync4(
+      writeFileSync5(
         tmpPath,
         JSON.stringify(
           {
@@ -4060,7 +4189,7 @@ var HookServer = class {
         this.writeJson(res, 500, { error: "internal_error" });
       });
     });
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const onError = (err) => {
         this.server?.off("listening", onListening);
         reject(err);
@@ -4068,7 +4197,7 @@ var HookServer = class {
       const onListening = () => {
         this.server?.off("error", onError);
         serviceLogger.info({ host: this.host, port: this.options.port }, "Hook server listening");
-        resolve();
+        resolve2();
       };
       this.server.once("error", onError);
       this.server.once("listening", onListening);
@@ -4079,8 +4208,8 @@ var HookServer = class {
     if (!this.server) return Promise.resolve();
     const server = this.server;
     this.server = null;
-    return new Promise((resolve, reject) => {
-      server.close((err) => err ? reject(err) : resolve());
+    return new Promise((resolve2, reject) => {
+      server.close((err) => err ? reject(err) : resolve2());
     });
   }
   getListeningPort() {
@@ -4194,7 +4323,7 @@ var HookServer = class {
     this.writeJson(res, 200, payload);
   }
   readBody(req) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       let body = "";
       let size = 0;
       req.setEncoding("utf8");
@@ -4207,7 +4336,7 @@ var HookServer = class {
         }
         body += chunk;
       });
-      req.on("end", () => resolve(body));
+      req.on("end", () => resolve2(body));
       req.on("error", reject);
     });
   }
@@ -4306,24 +4435,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);
@@ -4351,7 +4481,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) => {
@@ -4373,8 +4503,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,
@@ -4382,15 +4513,20 @@ 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);
+  const observerTouchActivity = (sessionId) => touchSessionActivity(sessionManager, relayConnection, sessionId);
   const emitAgentStatus = (sessionId, phase) => {
     const session = sessionManager.getSession(sessionId);
     if (!session) return;
@@ -4421,6 +4557,7 @@ async function startService(options) {
     permissionBroker,
     relayConnection,
     jsonObserver,
+    touchSessionActivity: observerTouchActivity,
     getProviderEnv
   });
   const hostedPtyRegistry = new HostedPtyRegistry({
@@ -4428,6 +4565,7 @@ async function startService(options) {
     relayConnection,
     getProviderEnv,
     changeSessionState: observerChangeState,
+    touchSessionActivity: observerTouchActivity,
     onTurnComplete: (sessionId) => {
       resolveInterruptedApprovals(
         permissionBroker,
@@ -4446,7 +4584,8 @@ async function startService(options) {
   relayConnection.connect();
   serviceLogger.info(
     {
-      envName: proxyConfig.envName ?? "(single)",
+      relayName: proxyConfig.relayName,
+      profile: PROFILE_NAME,
       relayUrl,
       proxyName,
       tokenSet: !!relayToken,
@@ -4470,7 +4609,6 @@ async function startService(options) {
     permissionBroker,
     hookEventRouter: hookRuntime.hookEventRouter,
     agentStatusRegistry,
-    envName: proxyConfig.envName,
     getProviderEnv,
     getAgentCliSuggestions,
     setAgentCliPath
@@ -4513,7 +4651,7 @@ async function startService(options) {
     });
   });
   server.listen(SOCK_PATH, () => {
-    writeFileSync5(PID_PATH, String(process.pid));
+    writeFileSync6(PID_PATH, String(process.pid));
     chmodSync(SOCK_PATH, 384);
     serviceLogger.info({ pid: process.pid, sock: SOCK_PATH }, "Service started");
   });