npm - @dev-anywhere/relay - Versions diffs - 0.6.3 → 0.8.0 - Mend

@dev-anywhere/relay 0.6.3 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (273) hide show

package/assets/web/index.html CHANGED Viewed

@@ -44,8 +44,8 @@
     <link rel="icon" type="image/svg+xml" href="/brand-icon.svg" />
     <link rel="icon" type="image/png" sizes="64x64" href="/pwa-64x64.png" />
     <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" />
-    <script type="module" crossorigin src="/assets/index-BwXMl6yi.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DaV7Gwjf.css">
+    <script type="module" crossorigin src="/assets/index-D5T-5Hl5.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-08tfJppO.css">
   <link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
   <body class="bg-background text-foreground">
     <div id="root"></div>

package/assets/web/sw.js CHANGED Viewed

	@@ -1 +1 @@
1	- if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]\|\|new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const t=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(s[t])return;let o={};const f=e=>i(e,t),l={module:{uri:t},exports:o,require:f};s[t]=Promise.all(n.map(e=>l[e]\|\|f(e))).then(e=>(r(...e),o))}}define(["./workbox-10a3128e"],function(e){"use strict";importScripts("notification-sw.js"),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"registerSW.js",revision:"1872c500de691dce40960bb85481de07"},{url:"notification-sw.js",revision:"ee0be62f4c1f36625b92680b3060becb"},{url:"index.html",revision:"~~18bc98b5e0ee053b75bd46f8233b4f36~~"},{url:"assets/index-~~DaV7Gwjf~~.~~css~~",revision:null},{url:"assets/index-~~BwXMl6yi~~.js",revision:null},{url:"assets/fvad-~~DYxbW2my~~.~~wasm~~",revision:null},{url:"assets/fvad-~~BQ0eMlem~~.js",revision:null},{url:"assets/__vite-browser-external-BIHI7g3E.js",revision:null},{url:"brand-icon.svg",revision:"efe8505a7b7ef12cbb3a4bcd286254bd"},{url:"maskable-icon-512x512.png",revision:"e762ff07cdedcd78f8650f59c6881727"},{url:"pwa-192x192.png",revision:"4e4603ce0f22528eded553ba7f2ffbc5"},{url:"pwa-512x512.png",revision:"e762ff07cdedcd78f8650f59c6881727"},{url:"pwa-64x64.png",revision:"d322160ad1dc08ba9e133cb3d296ae63"},{url:"manifest.webmanifest",revision:"4daa295c44052f4ce59a1fcfd6f06ab8"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/proxy(\/\|$\|\?)/,/^\/client(\/\|$\|\?)/,/^\/voice(\/\|$\|\?)/,/^\/fonts\//,/^\/health/,/^\/status/,/^\/api\//]})),e.registerRoute(/^\/fonts\/.*\.(woff2\|woff\|ttf\|otf\|css)$/,new e.CacheFirst({cacheName:"dev-anywhere-fonts",plugins:[new e.ExpirationPlugin({maxEntries:40,maxAgeSeconds:15552e3})]}),"GET")});
1	+ if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]\|\|new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const t=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(s[t])return;let o={};const f=e=>i(e,t),c={module:{uri:t},exports:o,require:f};s[t]=Promise.all(n.map(e=>c[e]\|\|f(e))).then(e=>(r(...e),o))}}define(["./workbox-10a3128e"],function(e){"use strict";importScripts("notification-sw.js"),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"registerSW.js",revision:"1872c500de691dce40960bb85481de07"},{url:"notification-sw.js",revision:"ee0be62f4c1f36625b92680b3060becb"},{url:"index.html",revision:"d15a03ec76d177ec0dd0655aaf59f5f8"},{url:"assets/index-D5T-5Hl5.js",revision:null},{url:"assets/index-08tfJppO.css",revision:null},{url:"assets/fvad-_D7IP4iB.js",revision:null},{url:"assets/fvad-DYxbW2my.wasm",revision:null},{url:"assets/__vite-browser-external-BIHI7g3E.js",revision:null},{url:"brand-icon.svg",revision:"efe8505a7b7ef12cbb3a4bcd286254bd"},{url:"maskable-icon-512x512.png",revision:"e762ff07cdedcd78f8650f59c6881727"},{url:"pwa-192x192.png",revision:"4e4603ce0f22528eded553ba7f2ffbc5"},{url:"pwa-512x512.png",revision:"e762ff07cdedcd78f8650f59c6881727"},{url:"pwa-64x64.png",revision:"d322160ad1dc08ba9e133cb3d296ae63"},{url:"manifest.webmanifest",revision:"4daa295c44052f4ce59a1fcfd6f06ab8"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/proxy(\/\|$\|\?)/,/^\/client(\/\|$\|\?)/,/^\/voice(\/\|$\|\?)/,/^\/fonts\//,/^\/health/,/^\/status/,/^\/api\//]})),e.registerRoute(/^\/fonts\/.*\.(woff2\|woff\|ttf\|otf\|css)$/,new e.CacheFirst({cacheName:"dev-anywhere-fonts",plugins:[new e.ExpirationPlugin({maxEntries:40,maxAgeSeconds:15552e3})]}),"GET")});

package/dist/{chunk-SDL4V2RE.js → chunk-XPCFNRZO.js} RENAMED Viewed

@@ -38,18 +38,32 @@ var ThinkingPayloadSchema = z2.object({
 // ../../packages/shared/dist/schemas/tool.js
 import { z as z3 } from "zod";
+var ApprovalOptionKindSchema = z3.enum([
+  "allow_once",
+  "allow_always",
+  "reject_once",
+  "reject_always"
+]);
+var ApprovalOptionSchema = z3.object({
+  optionId: IdSchema,
+  name: z3.string().min(1),
+  kind: ApprovalOptionKindSchema
+});
 var ToolUseRequestPayloadSchema = z3.object({
   toolName: z3.string(),
   toolId: IdSchema,
-  parameters: z3.record(z3.string(), z3.unknown())
+  parameters: z3.record(z3.string(), z3.unknown()),
+  options: z3.array(ApprovalOptionSchema).optional()
 });
 var ToolApprovePayloadSchema = z3.object({
   toolId: IdSchema,
-  whitelistTool: z3.boolean().optional()
+  whitelistTool: z3.boolean().optional(),
+  optionId: IdSchema.optional()
 });
 var ToolDenyPayloadSchema = z3.object({
   toolId: IdSchema,
-  reason: z3.string().optional()
+  reason: z3.string().optional(),
+  optionId: IdSchema.optional()
 });
 var ToolResultPayloadSchema = z3.object({
   toolId: IdSchema,
@@ -61,7 +75,7 @@ var ToolResultPayloadSchema = z3.object({
 import { z as z4 } from "zod";
 // ../../packages/shared/dist/constants/enums.js
-var providerValues = ["claude", "codex"];
+var providerValues = ["claude", "codex", "kimi"];
 var ptyOwnerValues = ["local-terminal", "proxy-hosted"];
 var sessionModeValues = ["pty", "json"];
 var sessionKindValues = ["agent", "terminal"];
@@ -541,6 +555,8 @@ var ControlErrorCode = {
   PATH_NOT_DIRECTORY: "PATH_NOT_DIRECTORY",
   PATH_ACCESS_DENIED: "PATH_ACCESS_DENIED",
   PROXY_OFFLINE: "PROXY_OFFLINE",
+  PROXY_NOT_FOUND: "PROXY_NOT_FOUND",
+  PROXY_ONLINE: "PROXY_ONLINE",
   SESSION_NOT_FOUND: "SESSION_NOT_FOUND",
   SESSION_ALREADY_ACTIVE: "SESSION_ALREADY_ACTIVE",
   PROVIDER_UNSUPPORTED: "PROVIDER_UNSUPPORTED",
@@ -554,6 +570,7 @@ var ControlErrorCode = {
 var ProxyInfoSchema = z9.object({
   proxyId: IdSchema,
   name: z9.string().optional(),
+  version: z9.string().optional(),
   online: z9.boolean(),
   sessions: z9.array(z9.string()).optional()
 });
@@ -578,7 +595,9 @@ var AgentCliAvailabilitySchema = z9.object({
 });
 var AgentCliStatusSchema = z9.object({
   claude: AgentCliAvailabilitySchema,
-  codex: AgentCliAvailabilitySchema
+  codex: AgentCliAvailabilitySchema,
+  // 滚动升级兼容：旧 Proxy 不会上报 Kimi，新 Proxy 的探测结果始终包含它。
+  kimi: AgentCliAvailabilitySchema.optional()
 });
 var DirEntrySchema = z9.object({ name: z9.string(), isDir: z9.boolean() });
 var FileTreeGroupSchema = z9.object({
@@ -641,16 +660,29 @@ function control(type, shape, directions) {
 var relayControlDefinitions = [
   control("proxy_register", {
     proxyId: IdSchema,
-    name: z9.string().optional()
+    name: z9.string().optional(),
+    proxyVersion: z9.string().min(1).max(64).optional()
   }),
   control("proxy_register_response", {
-    status: z9.enum(["new", "reconnected"])
+    status: z9.enum(["new", "reconnected"]),
+    // optional 只用于滚动升级：新 Proxy 连接旧 Relay 时继续工作，但不会自动更新。
+    relayVersion: z9.string().min(1).max(64).optional()
   }),
   control("proxy_list_request", RequestIdShape),
   control("proxy_list_response", {
     ...RequestIdShape,
     proxies: z9.array(ProxyInfoSchema)
   }),
+  control("proxy_remove", {
+    ...RequiredRequestIdShape,
+    proxyId: IdSchema
+  }),
+  control("proxy_remove_response", {
+    ...RequiredRequestIdShape,
+    proxyId: IdSchema,
+    success: z9.boolean(),
+    ...RequestErrorShape
+  }),
   control("relay_client_list_request", RequestIdShape),
   control("relay_client_list_response", {
     ...RequestIdShape,
@@ -852,6 +884,10 @@ var relayControlDefinitions = [
   control("proxy_offline", {
     proxyId: IdSchema
   }),
+  // 用户明确删除了离线 Proxy。与列表暂时缺项分开建模，客户端据此永久清理选择态。
+  control("proxy_removed", {
+    proxyId: IdSchema
+  }),
   // Proxy 主动断开，relay 立即清理资源
   control("proxy_disconnect", {
     proxyId: IdSchema
@@ -876,7 +912,12 @@ var relayControlDefinitions = [
     success: z9.boolean()
   }, "proxy_to_client"),
   // 命令列表推送，proxy 将可用命令列表推给 client
-  control("command_list_push", { commands: z9.array(CommandEntrySchema) }, "proxy_to_client"),
+  control("command_list_push", {
+    // New proxies scope command snapshots to their owning session. Keep this optional so
+    // rolling upgrades can still consume the legacy, proxy-wide snapshot.
+    sessionId: IdSchema.optional(),
+    commands: z9.array(CommandEntrySchema)
+  }, "proxy_to_client"),
   // 文件树推送: 按目录分组, 首组 path 即为 session cwd
   // 前端直接把每组写入 tree[path], 与 dir_list_response 共享 cache slot
   control("file_tree_push", {
@@ -1019,7 +1060,8 @@ var relayControlDefinitions = [
     approvals: z9.array(z9.object({
       requestId: IdSchema,
       toolName: z9.string(),
-      input: z9.record(z9.string(), z9.unknown())
+      input: z9.record(z9.string(), z9.unknown()),
+      options: z9.array(ApprovalOptionSchema).optional()
     }))
   }, "proxy_to_client"),
   // Voice Pilot speech summaries are produced by proxy-side Claude Code so it can read project context.
@@ -1199,7 +1241,7 @@ var RelayRegistry = class {
   proxyStates = /* @__PURE__ */ new Map();
   clientBindings = /* @__PURE__ */ new Map();
   connectedClients = /* @__PURE__ */ new Map();
-  registerProxy(proxyId, ws, name) {
+  registerProxy(proxyId, ws, name, version) {
     const existing = this.proxyStates.get(proxyId);
     if (existing) {
       if (existing.ws && existing.ws.readyState === WebSocket.OPEN) {
@@ -1209,6 +1251,7 @@ var RelayRegistry = class {
       existing.connectionState = "online";
       existing.disconnectedAt = null;
       if (name !== void 0) existing.name = name;
+      existing.version = version;
       return "reconnected";
     }
     this.proxyStates.set(proxyId, {
@@ -1216,7 +1259,8 @@ var RelayRegistry = class {
       connectionState: "online",
       sessions: /* @__PURE__ */ new Set(),
       disconnectedAt: null,
-      name
+      name,
+      version
     });
     return "new";
   }
@@ -1255,11 +1299,26 @@ var RelayRegistry = class {
         this.clientBindings.delete(clientId);
       }
     }
+    for (const ws of this.connectedClients.keys()) {
+      const clientWs = ws;
+      if (clientWs.boundProxyId === proxyId) {
+        delete clientWs.boundProxyId;
+      }
+    }
     this.proxyStates.delete(proxyId);
   }
   unregisterProxy(proxyId) {
     this.cleanupProxy(proxyId);
   }
+  // 检查状态与删除必须保持在同一个同步操作内，避免调用方先检查、稍后删除时误删
+  // 已经重连上线的开发机。只有显式进入 offline 状态的记录才允许被用户移除。
+  removeOfflineProxy(proxyId) {
+    const state = this.proxyStates.get(proxyId);
+    if (!state) return "not_found";
+    if (state.connectionState !== "offline") return "online";
+    this.cleanupProxy(proxyId);
+    return "removed";
+  }
   getProxy(proxyId) {
     const state = this.proxyStates.get(proxyId);
     return state?.ws ?? void 0;
@@ -1282,6 +1341,7 @@ var RelayRegistry = class {
     return Array.from(this.proxyStates.entries()).map(([proxyId, state]) => ({
       proxyId,
       ...state.name !== void 0 ? { name: state.name } : {},
+      ...state.version !== void 0 ? { version: state.version } : {},
       online: state.connectionState === "online"
     }));
   }
@@ -1839,18 +1899,19 @@ function handleProxyConnection(ws, registry, logger, ptySnapshotRoutes, sessionH
     const raw = data.toString();
     const result = parseMessage(raw);
     if (result.kind === "control" && result.message.type === "proxy_register") {
-      const { proxyId, name } = result.message;
-      const status = registry.registerProxy(proxyId, proxyWs, name);
+      const { proxyId, name, proxyVersion } = result.message;
+      const status = registry.registerProxy(proxyId, proxyWs, name, proxyVersion);
       proxyWs.proxyId = proxyId;
       if (status === "reconnected") {
         ptySnapshotRoutes.clearProxy(proxyId);
         sessionHistoryRoutes.clearProxy(proxyId);
       }
-      logger.info({ proxyId, status }, "Proxy registered");
+      logger.info({ proxyId, proxyVersion, status }, "Proxy registered");
       proxyWs.send(
         serializeControl({
           type: "proxy_register_response",
-          status
+          status,
+          relayVersion: RELAY_VERSION
         })
       );
       if (status === "reconnected") {
@@ -2848,6 +2909,92 @@ function handleRelayClientListRequest(clientWs, registry, requestId) {
     })
   );
 }
+function proxyListResponse(registry) {
+  const proxies = registry.listProxiesWithName().map((proxy) => ({
+    ...proxy,
+    sessions: registry.getSessionsForProxy(proxy.proxyId)
+  }));
+  return serializeControl({ type: "proxy_list_response", proxies });
+}
+function broadcastProxyList2(registry, chaos) {
+  const response = proxyListResponse(registry);
+  for (const target of registry.getAllClientWs()) {
+    if (chaos) {
+      chaos.send(target, response, {
+        direction: "proxy_to_client",
+        type: "proxy_list_response"
+      });
+    } else {
+      target.send(response);
+    }
+  }
+}
+function broadcastProxyRemoved(proxyId, registry, chaos) {
+  const notification = serializeControl({ type: "proxy_removed", proxyId });
+  for (const target of registry.getAllClientWs()) {
+    if (chaos) {
+      chaos.send(target, notification, {
+        direction: "proxy_to_client",
+        type: "proxy_removed"
+      });
+    } else {
+      target.send(notification);
+    }
+  }
+}
+function sendProxyRemoveResponse(clientWs, response, chaos) {
+  const raw = serializeControl({ type: "proxy_remove_response", ...response });
+  if (chaos) {
+    chaos.send(clientWs, raw, {
+      direction: "proxy_to_client",
+      type: "proxy_remove_response"
+    });
+  } else {
+    clientWs.send(raw);
+  }
+}
+function handleProxyRemove(clientWs, registry, logger, ptySnapshotRoutes, sessionHistoryRoutes, remoteFileBridge, requestId, proxyId, chaos) {
+  const result = registry.removeOfflineProxy(proxyId);
+  if (result === "not_found") {
+    sendProxyRemoveResponse(
+      clientWs,
+      {
+        requestId,
+        proxyId,
+        success: false,
+        errorCode: ControlErrorCode.PROXY_NOT_FOUND,
+        error: `\u5F00\u53D1\u673A ${proxyId} \u4E0D\u5B58\u5728`
+      },
+      chaos
+    );
+    return;
+  }
+  if (result === "online") {
+    sendProxyRemoveResponse(
+      clientWs,
+      {
+        requestId,
+        proxyId,
+        success: false,
+        errorCode: ControlErrorCode.PROXY_ONLINE,
+        error: `\u5F00\u53D1\u673A ${proxyId} \u4ECD\u5728\u7EBF\uFF0C\u65E0\u6CD5\u5220\u9664`
+      },
+      chaos
+    );
+    return;
+  }
+  ptySnapshotRoutes.clearProxy(proxyId);
+  sessionHistoryRoutes.clearProxy(proxyId);
+  try {
+    remoteFileBridge?.revokeProxy(proxyId);
+  } catch (err) {
+    logger.error({ err, proxyId }, "Failed to finish remote file cleanup for removed proxy");
+  }
+  sendProxyRemoveResponse(clientWs, { requestId, proxyId, success: true }, chaos);
+  broadcastProxyRemoved(proxyId, registry, chaos);
+  broadcastProxyList2(registry, chaos);
+  logger.info({ proxyId, clientId: clientWs.clientId }, "Offline proxy removed by client");
+}
 function handleRelayClientKick(clientWs, registry, logger, requestId, targetClientId) {
   if (targetClientId === clientWs.clientId) {
     clientWs.send(
@@ -2920,7 +3067,7 @@ function rejectNotRegistered2(ws, requestId) {
       type: "relay_error",
       requestId,
       code: RelayErrorCode.NOT_REGISTERED,
-      message: "Client must register before selecting a proxy"
+      message: "Client must register first"
     })
   );
 }
@@ -3016,6 +3163,25 @@ function handleClientConnection(ws, registry, logger, ptySnapshotRoutes, session
         handleRelayClientKick(clientWs, registry, logger, msg.requestId, msg.clientId);
         return;
       }
+      if (msg.type === "proxy_remove") {
+        if (!clientWs.clientId) {
+          rejectNotRegistered2(clientWs, msg.requestId);
+          closeRejectedClientProtocol(clientWs);
+          return;
+        }
+        handleProxyRemove(
+          clientWs,
+          registry,
+          logger,
+          ptySnapshotRoutes,
+          sessionHistoryRoutes,
+          remoteFileBridge,
+          msg.requestId,
+          msg.proxyId,
+          chaos
+        );
+        return;
+      }
       if (msg.type === "remote_file_url_request") {
         if (!remoteFileBridge) {
           sendRemoteFileUrlFailure(clientWs, msg.requestId, msg.sessionId, "\u6587\u4EF6\u6D41\u670D\u52A1\u4E0D\u53EF\u7528");
@@ -3146,13 +3312,13 @@ function handleClientConnection(ws, registry, logger, ptySnapshotRoutes, session
         return;
       }
       if (msg.type === "proxy_list_request") {
-        const proxies = registry.listProxiesWithName().map((p) => ({
-          ...p,
-          sessions: registry.getSessionsForProxy(p.proxyId)
+        const proxies = registry.listProxiesWithName().map((proxy) => ({
+          ...proxy,
+          sessions: registry.getSessionsForProxy(proxy.proxyId)
         }));
-        const response = JSON.stringify({
+        const response = serializeControl({
           type: "proxy_list_response",
-          requestId: msg.requestId,
+          ...msg.requestId !== void 0 ? { requestId: msg.requestId } : {},
           proxies
         });
         if (chaos) {
@@ -4147,6 +4313,48 @@ var RemoteFileBridge = class {
   pendingUrlMetadata = /* @__PURE__ */ new Map();
   pendingStreams = /* @__PURE__ */ new Map();
   pendingUploads = /* @__PURE__ */ new Map();
+  revokeProxy(proxyId) {
+    let revokedTokens = 0;
+    let rejectedMetadata = 0;
+    let failedStreams = 0;
+    let failedUploads = 0;
+    for (const [token, metadata] of this.tokens) {
+      if (metadata.proxyId !== proxyId) continue;
+      this.tokens.delete(token);
+      revokedTokens += 1;
+    }
+    for (const [token, metadata] of this.uploadTokens) {
+      if (metadata.proxyId !== proxyId) continue;
+      this.uploadTokens.delete(token);
+      revokedTokens += 1;
+    }
+    for (const [requestId, pending] of this.pendingUrlMetadata) {
+      if (pending.proxyId !== proxyId) continue;
+      this.pendingUrlMetadata.delete(requestId);
+      clearTimeout(pending.timer);
+      pending.resolve({
+        success: false,
+        path: pending.path,
+        error: "\u5F00\u53D1\u673A\u5DF2\u5220\u9664",
+        errorCode: ControlErrorCode.PROXY_NOT_FOUND
+      });
+      rejectedMetadata += 1;
+    }
+    for (const [streamId, pending] of this.pendingStreams) {
+      if (pending.token.proxyId !== proxyId) continue;
+      this.failStream(streamId, 410, "\u5F00\u53D1\u673A\u5DF2\u5220\u9664", ControlErrorCode.PROXY_NOT_FOUND);
+      failedStreams += 1;
+    }
+    for (const [uploadId, pending] of this.pendingUploads) {
+      if (pending.token.proxyId !== proxyId) continue;
+      this.failUpload(uploadId, 410, "\u5F00\u53D1\u673A\u5DF2\u5220\u9664", ControlErrorCode.PROXY_NOT_FOUND);
+      failedUploads += 1;
+    }
+    this.deps.logger.info(
+      { proxyId, revokedTokens, rejectedMetadata, failedStreams, failedUploads },
+      "Remote file access revoked for removed proxy"
+    );
+  }
   createUrl(input) {
     this.cleanupExpiredTokens();
     const proxyWs = this.deps.registry.getProxy(input.proxyId);
@@ -5243,4 +5451,4 @@ export {
   parseRelayChaosFromEnv,
   createRelayServer
 };
-//# sourceMappingURL=chunk-SDL4V2RE.js.map
+//# sourceMappingURL=chunk-XPCFNRZO.js.map