claude-codex-wechat 0.1.15 → 0.1.16

package/dist/server/cli.js

@@ -106,16 +106,13 @@ function normalizeBridgeDefaultsConfig(raw) {
 }
 function normalizeTunnelConfig(raw) {
   const record = raw && typeof raw === "object" ? raw : {};
-  const enabled = record.enabled === true;
   const relayRecord = record.relay && typeof record.relay === "object" ? record.relay : void 0;
-  const relay = relayRecord ? {
-    ...typeof relayRecord.serverUrl === "string" && relayRecord.serverUrl.trim() ? { serverUrl: relayRecord.serverUrl } : {},
-    ...typeof relayRecord.authToken === "string" && relayRecord.authToken.trim() ? { authToken: relayRecord.authToken } : {}
-  } : void 0;
-  if (!enabled && !relay) return void 0;
+  const relay = {
+    serverUrl: typeof relayRecord?.serverUrl === "string" && relayRecord.serverUrl.trim() ? relayRecord.serverUrl : "wss://wechat.style520.com/agent",
+    ...typeof relayRecord?.authToken === "string" && relayRecord.authToken.trim() ? { authToken: relayRecord.authToken } : {}
+  };
   return {
-    enabled,
-    ...relay ? { relay } : {}
+    relay
   };
 }
 function normalizeProviderCommand(raw, envFallback) {
@@ -179,7 +176,6 @@ async function persistBridgeDefaultsToConfigFile(input) {
     },
     ...input.tunnel ? {
       tunnel: {
-        enabled: input.tunnel.enabled === true,
         ...input.tunnel.relay ? {
           relay: {
             ...input.tunnel.relay.serverUrl ? { serverUrl: input.tunnel.relay.serverUrl } : {},
@@ -1472,7 +1468,6 @@ function registerTunnelRoutes(input) {
   const getStatus = async () => await input.tunnelManager.getStatus();
   input.app.get("/api/tunnel/status", getStatus);
   const start = async () => {
-    input.defaults.tunnel.enabled = true;
     await persistBridgeDefaultsToConfigFile({
       configPath: input.configPath,
       tunnel: input.defaults.tunnel
@@ -1481,24 +1476,9 @@ function registerTunnelRoutes(input) {
   };
   input.app.post("/api/tunnel/start", start);
   const stop = async () => {
-    input.defaults.tunnel.enabled = false;
-    await persistBridgeDefaultsToConfigFile({
-      configPath: input.configPath,
-      tunnel: input.defaults.tunnel
-    });
     return await input.tunnelManager.stop();
   };
   input.app.post("/api/tunnel/stop", stop);
-  const setEnabled = async (request) => {
-    const enabled = request.body?.enabled === true;
-    input.defaults.tunnel.enabled = enabled;
-    await persistBridgeDefaultsToConfigFile({
-      configPath: input.configPath,
-      tunnel: input.defaults.tunnel
-    });
-    return await input.tunnelManager.setEnabled(enabled);
-  };
-  input.app.post("/api/tunnel/settings", setEnabled);
 }
 
 // src/admin/settingsRoutes.ts
@@ -1547,10 +1527,9 @@ function normalizeSettings(input, defaultWorkspace) {
     defaultProvider: input.defaultProvider === "codex" ? "codex" : "claude-code",
     defaultWorkspace: typeof input.defaultWorkspace === "string" && input.defaultWorkspace.trim() ? input.defaultWorkspace : defaultWorkspace,
     tunnel: {
-      enabled: tunnel.enabled === true,
-      ...typeof relay.serverUrl === "string" && relay.serverUrl.trim() || typeof relay.authToken === "string" && relay.authToken.trim() ? {
+      ...typeof relay.serverUrl === "string" && relay.serverUrl.trim() || typeof relay.authToken === "string" && relay.authToken.trim() || !("relay" in tunnel) ? {
         relay: {
-          ...typeof relay.serverUrl === "string" && relay.serverUrl.trim() ? { serverUrl: relay.serverUrl } : {},
+          serverUrl: typeof relay.serverUrl === "string" && relay.serverUrl.trim() ? relay.serverUrl : "wss://wechat.style520.com/agent",
           ...typeof relay.authToken === "string" && relay.authToken.trim() ? { authToken: relay.authToken } : {}
         }
       } : {}
@@ -3241,9 +3220,9 @@ var BRIDGE_COMMAND_HELP_GROUPS = [
     entries: [
       { command: "/help", desc: "\u663E\u793A\u672C\u5E2E\u52A9" },
       { command: "/status", desc: "\u67E5\u770B\u5F53\u524D\u4F1A\u8BDD\uFF08provider\u3001\u5DE5\u4F5C\u76EE\u5F55\u3001\u72B6\u6001\uFF09" },
-      { command: "/new", desc: "\u65B0\u5EFA\u9ED8\u8BA4 provider \u4F1A\u8BDD" },
+      { command: "/new", desc: "\u6309\u5F53\u524D provider \u65B0\u5EFA\u4F1A\u8BDD" },
       { command: "/new claude|codex", desc: "\u65B0\u5EFA\u6307\u5B9A provider \u4F1A\u8BDD" },
-      { command: "/new <\u76EE\u5F55>", desc: "\u5728\u6307\u5B9A\u76EE\u5F55\u65B0\u5EFA\u9ED8\u8BA4 provider \u4F1A\u8BDD" },
+      { command: "/new <\u76EE\u5F55>", desc: "\u5728\u6307\u5B9A\u76EE\u5F55\u6309\u5F53\u524D provider \u65B0\u5EFA\u4F1A\u8BDD" },
       { command: "/new claude:<\u76EE\u5F55>", desc: "\u65B0\u5EFA\u6307\u5B9A provider + \u6307\u5B9A\u76EE\u5F55\u4F1A\u8BDD" },
       { command: "/stop", desc: "\u4E2D\u65AD\u5F53\u524D\u6B63\u5728\u751F\u6210\u7684\u56DE\u590D\uFF08\u4F1A\u8BDD\u4FDD\u7559\uFF09" }
     ]
@@ -3673,7 +3652,7 @@ var MessageRouter = class _MessageRouter {
     }
     if (command.kind === "new_session") {
       await this.preemptActiveGeneration(chatId);
-      const providerId = command.providerId ?? this.options.defaults?.defaultProvider ?? "claude-code";
+      const providerId = command.providerId ?? this.conversation.getCurrent()?.providerId ?? this.options.defaults?.defaultProvider ?? "claude-code";
       const cwd = command.cwd ?? this.conversation.getCurrent()?.cwd ?? this.options.defaults?.defaultWorkspace ?? defaultWorkspaceDir();
       const session = this.conversation.create({
         chatId,
@@ -4008,7 +3987,6 @@ var RelayTunnelProvider = class {
   socket = null;
   status = {
     installed: true,
-    enabled: false,
     running: false,
     status: "stopped"
   };
@@ -4035,7 +4013,6 @@ var RelayTunnelProvider = class {
   async start() {
     this.status = {
       ...this.status,
-      enabled: true,
       status: "starting"
     };
     const socket = this.options.createSocket(this.options.serverUrl);
@@ -4074,10 +4051,9 @@ var RelayTunnelProvider = class {
           return;
         }
         if (payload?.type === "registered") {
-          const publicUrl = typeof payload?.token === "string" ? `${derivePublicBaseUrl(this.options.serverUrl)}/${payload.token}` : void 0;
+          const publicUrl = typeof payload?.publicUrl === "string" && payload.publicUrl ? payload.publicUrl : typeof payload?.token === "string" ? `${derivePublicBaseUrl(this.options.serverUrl)}/${payload.token}` : void 0;
           this.status = {
             installed: true,
-            enabled: true,
             running: true,
             status: "running",
             ...publicUrl ? { publicUrl } : {}
@@ -4115,15 +4091,11 @@ var RelayTunnelProvider = class {
     this.socket = null;
     this.status = {
       installed: true,
-      enabled: false,
       running: false,
       status: "stopped"
     };
     return { ...this.status };
   }
-  async setEnabled(enabled) {
-    return enabled ? await this.start() : await this.stop();
-  }
   async handleRequest(payload) {
     const fetchImpl = this.options.fetchImpl ?? fetch;
     const response = await fetchImpl(`${this.options.targetBaseUrl}${payload.path}`, {
@@ -4168,11 +4140,6 @@ var RelayTunnelRouter = class {
     if (!provider) return this.notConfiguredStatus();
     return await provider.stop();
   }
-  async setEnabled(enabled) {
-    const provider = this.getOrCreateRelayProvider();
-    if (!provider) return this.notConfiguredStatus();
-    return await provider.setEnabled(enabled);
-  }
   getOrCreateRelayProvider() {
     const relay = this.options.defaults.tunnel.relay;
     if (!relay?.serverUrl || !relay.authToken) return null;
@@ -4190,7 +4157,6 @@ var RelayTunnelRouter = class {
   notConfiguredStatus() {
     return {
       installed: false,
-      enabled: false,
       running: false,
       status: "error",
       error: "relay_not_configured"
@@ -4208,8 +4174,10 @@ function createDaemonServer(options = {}) {
     defaultProvider: options.bridgeDefaults?.defaultProvider ?? persistedConfig.bridge?.defaultProvider ?? "claude-code",
     defaultWorkspace: options.bridgeDefaults?.defaultWorkspace ?? persistedConfig.bridge?.defaultWorkspace ?? process.cwd(),
     tunnel: options.bridgeDefaults?.tunnel ?? {
-      enabled: persistedConfig.tunnel?.enabled === true,
-      ...persistedConfig.tunnel?.relay ? { relay: persistedConfig.tunnel.relay } : {}
+      relay: {
+        serverUrl: persistedConfig.tunnel?.relay?.serverUrl ?? "wss://wechat.style520.com/agent",
+        ...persistedConfig.tunnel?.relay?.authToken ? { authToken: persistedConfig.tunnel.relay.authToken } : {}
+      }
     }
   };
   const existingRelayAuthToken = bridgeDefaults.tunnel.relay?.authToken?.trim();
@@ -4427,7 +4395,7 @@ async function startDaemon(options) {
     defaultProvider: config.bridge?.defaultProvider ?? "claude-code",
     defaultWorkspace: config.bridge?.defaultWorkspace ?? process.cwd(),
     tunnel: {
-      enabled: config.tunnel?.enabled === true,
+      enabled: true,
       ...config.tunnel?.relay ? { relay: config.tunnel.relay } : {}
     }
   };
@@ -4442,7 +4410,7 @@ async function startDaemon(options) {
   await app.listen({ host, port });
   const address = app.server.address();
   const actualPort = typeof address === "object" && address ? address.port : port;
-  if (config.tunnel?.enabled === true) {
+  if (config.tunnel?.relay?.serverUrl && config.tunnel?.relay?.authToken) {
     await resolvedTunnelProvider?.start().catch(() => void 0);
   }
   console.log("claude-codex-wechat listening:");