@dev-anywhere/proxy 0.0.6 → 0.1.0

package/dist/serve.js

@@ -5,7 +5,7 @@ import {
   KnownContentBlockSchema,
   SeqCounter,
   StreamJsonEventSchema
-} from "./chunk-2XDZRLST.js";
+} from "./chunk-JPJMOVQ5.js";
 import {
   createFSM,
   defineFSM,
@@ -14,7 +14,7 @@ import {
   serviceLogger,
   shouldReleaseApprovalWait,
   stateAfterApprovalRelease
-} from "./chunk-XRTTHTM2.js";
+} from "./chunk-WXWH6L7J.js";
 import {
   spawnScript
 } from "./chunk-ZUWAB67J.js";
@@ -41,11 +41,11 @@ import {
   serializeWorkerMsg,
   sessionPaths,
   tildify
-} from "./chunk-VHCL7NVJ.js";
+} from "./chunk-QWPI6YON.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 +183,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) {
@@ -1078,7 +1086,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 +1114,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 +1139,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 +1163,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 +1729,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 +1864,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 +2062,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 +2209,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
@@ -2442,8 +2561,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 +2714,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 +2851,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 +2910,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 +2995,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 {
@@ -3042,6 +3162,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 +3353,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 +3581,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 +3644,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 +3656,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) {
@@ -3876,6 +4003,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 +4054,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 +4134,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 +4188,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 +4196,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 +4207,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 +4322,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 +4335,7 @@ var HookServer = class {
         }
         body += chunk;
       });
-      req.on("end", () => resolve(body));
+      req.on("end", () => resolve2(body));
       req.on("error", reject);
     });
   }
@@ -4391,6 +4519,7 @@ async function startService(options) {
   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 +4550,7 @@ async function startService(options) {
     permissionBroker,
     relayConnection,
     jsonObserver,
+    touchSessionActivity: observerTouchActivity,
     getProviderEnv
   });
   const hostedPtyRegistry = new HostedPtyRegistry({
@@ -4428,6 +4558,7 @@ async function startService(options) {
     relayConnection,
     getProviderEnv,
     changeSessionState: observerChangeState,
+    touchSessionActivity: observerTouchActivity,
     onTurnComplete: (sessionId) => {
       resolveInterruptedApprovals(
         permissionBroker,
@@ -4513,7 +4644,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");
   });