@dev-anywhere/proxy 0.1.6 → 0.1.8

package/dist/serve.js

@@ -5,16 +5,15 @@ import {
   KnownContentBlockSchema,
   SeqCounter,
   StreamJsonEventSchema
-} from "./chunk-ODK6N2NP.js";
+} from "./chunk-PDX6QFJ7.js";
 import {
   createFSM,
   defineFSM,
   extractOscSequences,
   extractOscSignals,
-  serviceLogger,
   shouldReleaseApprovalWait,
   stateAfterApprovalRelease
-} from "./chunk-JGGDVMY5.js";
+} from "./chunk-ORZTFYXR.js";
 import {
   spawnScript
 } from "./chunk-ZUWAB67J.js";
@@ -24,7 +23,20 @@ import {
   detectAgentCliStatus
 } from "./chunk-6O6JTF24.js";
 import {
-  CONFIG_PATH,
+  createIpcReader,
+  createWorkerReader,
+  serializeIpc,
+  serializeWorkerMsg
+} from "./chunk-BLWDLNT6.js";
+import {
+  buildProviderEnv,
+  loadConfig,
+  saveAgentCliPath
+} from "./chunk-R4S6OFIZ.js";
+import {
+  serviceLogger
+} from "./chunk-GTTLWHIG.js";
+import {
   ControlErrorCode,
   DATA_DIR,
   DEFAULT_PROXY_PROFILE,
@@ -38,19 +50,14 @@ import {
   STOPPED_PATH,
   SessionState,
   buildMessage,
-  createIpcReader,
-  createWorkerReader,
-  defaultHookPortForProfile,
   ensureProfileWorkspace,
-  serializeIpc,
-  serializeWorkerMsg,
   sessionPaths,
   tildify
-} from "./chunk-RFBTVZ2X.js";
+} from "./chunk-2XO3KLWW.js";
 
 // src/serve.ts
 import { createServer as createServer2 } from "net";
-import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync6, chmodSync, rmSync as rmSync2 } from "fs";
+import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync5, chmodSync, rmSync as rmSync2 } from "fs";
 
 // src/serve/session-manager.ts
 import { mkdirSync, readFileSync, renameSync, writeFileSync, existsSync } from "fs";
@@ -614,162 +621,9 @@ var RelayConnection = class extends EventEmitter {
   }
 };
 
-// src/common/config.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname3, isAbsolute } from "path";
-function parsePort(value, source) {
-  if (!value) return void 0;
-  const port = Number(value);
-  if (!Number.isInteger(port) || port < 1 || port > 65535) {
-    throw new Error(`Invalid ${source}: expected TCP port 1-65535`);
-  }
-  return port;
-}
-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 value;
-}
-function readConfigFile() {
-  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";
-}
-function agentCliHistoryField(provider) {
-  return provider === "claude" ? "claudeBinHistory" : "codexBinHistory";
-}
-function validateAgentCliPath(path) {
-  const normalized = path.trim();
-  if (!normalized) throw new Error("\u8BF7\u8F93\u5165 CLI \u8DEF\u5F84");
-  if (!isAbsolute(normalized)) throw new Error("CLI \u8DEF\u5F84\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
-  return normalized;
-}
-function uniqueAbsolutePaths(paths) {
-  const seen = /* @__PURE__ */ new Set();
-  const result = [];
-  for (const path of paths) {
-    const normalized = path?.trim();
-    if (!normalized || !isAbsolute(normalized) || seen.has(normalized)) continue;
-    seen.add(normalized);
-    result.push(normalized);
-  }
-  return result;
-}
-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 {
-    relayName,
-    relayNameSource: requestedRelayName?.trim() ? "cli" : "profile",
-    relay
-  };
-}
-function loadConfig(options) {
-  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 = {
-    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,
-    previewRoots: uniqueAbsolutePaths(fromFile.previewRoots ?? []),
-    agentCliSuggestions: {
-      claude: uniqueAbsolutePaths([
-        process.env.CLAUDE_BIN,
-        agentCli.claudeBin,
-        ...agentCli.claudeBinHistory ?? []
-      ]),
-      codex: uniqueAbsolutePaths([
-        process.env.CODEX_BIN,
-        agentCli.codexBin,
-        ...agentCli.codexBinHistory ?? []
-      ])
-    },
-    sources: {
-      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(
-    {
-      profile: config.profileName,
-      relayName: config.relayName,
-      relayNameSource: config.sources.relayName,
-      relayUrl: config.relayUrl ?? "(unset)",
-      relayUrlSource: config.sources.relayUrl,
-      relayTokenSource: config.sources.relayToken,
-      hookPort: config.hookPort,
-      hookPortSource: config.sources.hookPort,
-      claudeBinSource: config.sources.claudeBin,
-      codexBinSource: config.sources.codexBin
-    },
-    "Config loaded"
-  );
-  return config;
-}
-function buildProviderEnv(config, baseEnv = process.env) {
-  return {
-    ...baseEnv,
-    ...config.claudeBin ? { CLAUDE_BIN: config.claudeBin } : {},
-    ...config.codexBin ? { CODEX_BIN: config.codexBin } : {}
-  };
-}
-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();
-  fromFile.agentCli = updateAgentCliConfig(fromFile.agentCli ?? {}, provider, normalized);
-  mkdirSync3(dirname3(CONFIG_PATH), { recursive: true });
-  writeFileSync3(CONFIG_PATH, `${JSON.stringify(fromFile, null, 2)}
-`, "utf-8");
-}
-
 // src/serve/handlers/control-messages.ts
 import { readdir as readdir2, mkdir } from "fs/promises";
-import { join as join4, isAbsolute as isAbsolute2, normalize } from "path";
+import { join as join4, isAbsolute, normalize } from "path";
 
 // src/serve/session-history.ts
 import { readdir, stat, access, open } from "fs/promises";
@@ -1181,7 +1035,7 @@ function extractCodexUserText(payload) {
 }
 
 // src/serve/command-discovery.ts
-import { readdirSync, readFileSync as readFileSync4 } from "fs";
+import { readdirSync, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join3 } from "path";
 var REPL_BUILTINS = [
@@ -1257,7 +1111,7 @@ function scanSkillsDir(dirPath, source) {
   for (const name of entries) {
     const skillPath = join3(dirPath, name, "SKILL.md");
     try {
-      const content = readFileSync4(skillPath, "utf-8");
+      const content = readFileSync3(skillPath, "utf-8");
       const parsed = parseSkillFrontmatter(content);
       commands.push({
         name: `/${parsed.name ?? name}`,
@@ -1281,7 +1135,7 @@ function scanCommandsDir(dirPath, source) {
   for (const filename of entries) {
     const cmdName = filename.replace(/\.md$/, "");
     try {
-      const content = readFileSync4(join3(dirPath, filename), "utf-8");
+      const content = readFileSync3(join3(dirPath, filename), "utf-8");
       const firstLine = content.split("\n")[0].trim();
       commands.push({
         name: `/${cmdName}`,
@@ -1360,7 +1214,7 @@ function classifyPathError(err) {
 // src/serve/handlers/control-messages.ts
 var COMMAND_REFRESH_MS = 6 * 60 * 60 * 1e3;
 function isPathSafe(path) {
-  if (!isAbsolute2(path)) return false;
+  if (!isAbsolute(path)) return false;
   const normalized = normalize(path);
   if (normalized.includes("..")) return false;
   return true;
@@ -1656,7 +1510,7 @@ function createControlMessageHandlers(send, sessionManager) {
 
 // src/serve/worker-registry.ts
 import { connect } from "net";
-import { unlinkSync, existsSync as existsSync4, readdirSync as readdirSync2 } from "fs";
+import { unlinkSync, existsSync as existsSync3, readdirSync as readdirSync2 } from "fs";
 var WorkerRegistry = class {
   constructor(deps) {
     this.deps = deps;
@@ -1741,12 +1595,12 @@ var WorkerRegistry = class {
   }
   // 枚举 DATA_DIR 下所有 session 目录，尝试连接存活的 worker.sock；失败则清理 stale socket。
   async reconnectAll() {
-    if (!existsSync4(DATA_DIR)) return;
+    if (!existsSync3(DATA_DIR)) return;
     const dirs = readdirSync2(DATA_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
     for (const dir of dirs) {
       const sessionId = dir.name;
       const paths = sessionPaths(sessionId);
-      if (!existsSync4(paths.workerSock)) continue;
+      if (!existsSync3(paths.workerSock)) continue;
       const sock = await this.connect(sessionId, paths.workerSock);
       if (sock) {
         if (!this.deps.sessionManager.getSession(sessionId)) {
@@ -2061,8 +1915,8 @@ function terminateSessionByOwnership(deps, sessionId) {
 }
 
 // src/serve/clipboard-image-upload.ts
-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 { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync4, statSync, writeFileSync as writeFileSync3 } from "fs";
+import { isAbsolute as isAbsolute2, 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;
@@ -2098,7 +1952,7 @@ function resolveChildDir(rootPath, ...segments) {
   const root = resolve(rootPath);
   const uploadDir = resolve(root, ...segments);
   const relativePath = relative(root, uploadDir);
-  if (!relativePath || relativePath.startsWith("..") || isAbsolute3(relativePath)) {
+  if (!relativePath || relativePath.startsWith("..") || isAbsolute2(relativePath)) {
     throw new Error("\u4F1A\u8BDD\u8DEF\u5F84\u65E0\u6548");
   }
   return uploadDir;
@@ -2111,13 +1965,13 @@ function normalizeGitignoreLine(line) {
 }
 function ensureProjectClipboardIgnored(cwd) {
   const gitignorePath = join5(cwd, ".gitignore");
-  if (!existsSync5(gitignorePath)) return;
+  if (!existsSync4(gitignorePath)) return;
   try {
-    const current = readFileSync5(gitignorePath, "utf-8");
+    const current = readFileSync4(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/
+    writeFileSync3(gitignorePath, `${current}${separator}.dev-anywhere/
 `);
   } catch {
   }
@@ -2130,8 +1984,8 @@ function trySaveProjectClipboardImage(options) {
     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 });
+    mkdirSync3(uploadDir, { recursive: true });
+    writeFileSync3(path, options.buffer, { mode: 384 });
     ensureProjectClipboardIgnored(cwd);
     return { success: true, path: relative(cwd, path) };
   } catch {
@@ -2163,8 +2017,8 @@ function saveClipboardImageUpload(request, options = {}) {
     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 });
+    mkdirSync3(uploadDir, { recursive: true });
+    writeFileSync3(path, buffer, { mode: 384 });
     return { success: true, path };
   } catch (err) {
     return {
@@ -2177,13 +2031,13 @@ function saveClipboardImageUpload(request, options = {}) {
 }
 
 // src/serve/image-preview.ts
-import { readFileSync as readFileSync6, realpathSync, statSync as statSync2 } from "fs";
+import { readFileSync as readFileSync5, realpathSync, statSync as statSync2 } from "fs";
 import { tmpdir } from "os";
-import { isAbsolute as isAbsolute4, relative as relative2, resolve as resolve2 } from "path";
+import { isAbsolute as isAbsolute3, relative as relative2, resolve as resolve2 } from "path";
 var MAX_IMAGE_PREVIEW_BYTES = 10 * 1024 * 1024;
 function isInsideRoot(realFilePath, realRootPath) {
   const rel = relative2(realRootPath, realFilePath);
-  return rel === "" || !rel.startsWith("..") && !isAbsolute4(rel);
+  return rel === "" || !rel.startsWith("..") && !isAbsolute3(rel);
 }
 function allowedRoots(options) {
   return [options.cwd, options.tmpDir ?? tmpdir(), ...options.previewRoots ?? []].map((root) => root.trim()).filter(Boolean).flatMap((root) => {
@@ -2195,7 +2049,7 @@ function allowedRoots(options) {
   });
 }
 function resolvePreviewPath(rawPath, options) {
-  const candidate = isAbsolute4(rawPath) ? resolve2(rawPath) : resolve2(options.cwd, rawPath);
+  const candidate = isAbsolute3(rawPath) ? resolve2(rawPath) : resolve2(options.cwd, rawPath);
   const realCandidate = realpathSync(candidate);
   if (!allowedRoots(options).some((root) => isInsideRoot(realCandidate, root))) {
     throw Object.assign(new Error("\u56FE\u7247\u8DEF\u5F84\u4E0D\u5728\u5141\u8BB8\u9884\u89C8\u7684\u76EE\u5F55\u5185"), {
@@ -2248,7 +2102,7 @@ function loadImagePreview(request, options) {
         errorCode: ControlErrorCode.UNKNOWN
       };
     }
-    const buffer = readFileSync6(resolvedPath);
+    const buffer = readFileSync5(resolvedPath);
     const mimeType = detectImageMime(buffer);
     if (!mimeType) {
       return {
@@ -2745,7 +2599,7 @@ var RelayResourceHandlers = class {
 
 // src/serve/relay-session-create-handler.ts
 import { rmSync, statSync as statSync4 } from "fs";
-import { isAbsolute as isAbsolute5 } from "path";
+import { isAbsolute as isAbsolute4 } from "path";
 import { nanoid as nanoid4 } from "nanoid";
 
 // src/serve/hosted-pty-registry.ts
@@ -3035,7 +2889,7 @@ function validateSessionCwd(cwd) {
     return { message: "\u8BF7\u8F93\u5165\u5DE5\u4F5C\u76EE\u5F55", code: ControlErrorCode.INVALID_PATH };
   }
   const trimmed = cwd.trim();
-  if (!isAbsolute5(trimmed)) {
+  if (!isAbsolute4(trimmed)) {
     return { message: "\u5DE5\u4F5C\u76EE\u5F55\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84", code: ControlErrorCode.INVALID_PATH };
   }
   try {
@@ -3837,7 +3691,7 @@ function touchSessionActivity(sessionManager, relay, sessionId, now = Date.now()
 
 // src/serve/service-files.ts
 import { execSync } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync7, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync6, unlinkSync as unlinkSync2 } from "fs";
 import { hostname } from "os";
 import { connect as connect2 } from "net";
 function tryConnectSocket(sockPath) {
@@ -3856,7 +3710,7 @@ function isProcessAlive(pid) {
   }
 }
 async function cleanupStaleResources() {
-  if (existsSync6(SOCK_PATH)) {
+  if (existsSync5(SOCK_PATH)) {
     const existing = await tryConnectSocket(SOCK_PATH);
     if (existing) {
       existing.destroy();
@@ -3868,8 +3722,8 @@ async function cleanupStaleResources() {
     unlinkSync2(SOCK_PATH);
     serviceLogger.info("Removed stale socket file");
   }
-  if (existsSync6(PID_PATH)) {
-    const pidStr = readFileSync7(PID_PATH, "utf-8").trim();
+  if (existsSync5(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}`;
@@ -4244,8 +4098,8 @@ function handleTerminalConnection(socket, deps) {
 
 // src/serve/hook-registry.ts
 import { createHash, randomBytes } from "crypto";
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync8, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname4 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync7, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
+import { dirname as dirname3 } from "path";
 import { z } from "zod";
 var PersistedHookSessionBindingSchema = z.object({
   sessionId: z.string(),
@@ -4305,10 +4159,10 @@ var HookRegistry = class {
     }
   }
   load() {
-    if (!this.persistPath || !existsSync7(this.persistPath)) return;
+    if (!this.persistPath || !existsSync6(this.persistPath)) return;
     try {
       const parsed = PersistedHookRegistrySchema.parse(
-        JSON.parse(readFileSync8(this.persistPath, "utf8"))
+        JSON.parse(readFileSync7(this.persistPath, "utf8"))
       );
       this.bindingsBySession.clear();
       for (const binding of parsed.bindings) {
@@ -4324,9 +4178,9 @@ var HookRegistry = class {
   save() {
     if (!this.persistPath) return;
     try {
-      mkdirSync5(dirname4(this.persistPath), { recursive: true });
+      mkdirSync4(dirname3(this.persistPath), { recursive: true });
       const tmpPath = `${this.persistPath}.${process.pid}.${Date.now()}.tmp`;
-      writeFileSync5(
+      writeFileSync4(
         tmpPath,
         JSON.stringify(
           {
@@ -4842,7 +4696,7 @@ async function startService(options) {
     });
   });
   server.listen(SOCK_PATH, () => {
-    writeFileSync6(PID_PATH, String(process.pid));
+    writeFileSync5(PID_PATH, String(process.pid));
     chmodSync(SOCK_PATH, 384);
     serviceLogger.info({ pid: process.pid, sock: SOCK_PATH }, "Service started");
   });