@larktask/aamp-feishu-task-agent 0.1.0-dev.171 → 0.1.0-dev.173

package/bin/feishu-task-agent-controller.mjs

@@ -10,6 +10,7 @@ import { spawn } from 'node:child_process';
 import { EventEmitter } from 'node:events';
 import {
   agentStartRetryError,
+  bridgeAuthenticationRetryError,
   classifyNetworkError,
   createSerializedLineWriter,
   describeNetworkError,
@@ -236,7 +237,11 @@ async function runNetworkStage(operation, {
     shouldRetry,
     onRetry: async (event) => {
       await appendDiagnostic(logFile, { type: 'network.retry', stage, label, host: safeDiagnosticUrl(host), ...event });
-      console.log(`[aamp-one-click] ${label}遇到网络波动，正在重试（${event.attempt + 1}/${event.maxAttempts}）...`);
+      if (event.category === 'mail_auth') {
+        console.log(`[aamp-one-click] ${label}检测到 AAMP 邮箱凭据失效，正在重新注册并重试（${event.attempt + 1}/${event.maxAttempts}）...`);
+      } else {
+        console.log(`[aamp-one-click] ${label}遇到网络波动，正在重试（${event.attempt + 1}/${event.maxAttempts}）...`);
+      }
       launchDetachedDiagnostic(() => probeFailureEndpoints(host, logFile, environment, `${stage}-retry-probe`));
     },
   });
@@ -867,6 +872,7 @@ async function startManagedProcess({ label, packageSpec, executable, args, env,
     const safeLine = redact(line);
     record.outputTail.push(`[${streamName}] ${safeLine}`);
     if (record.outputTail.length > 30) record.outputTail.shift();
+    record.emitter.emit('output', safeLine);
     if (streamName === 'stdout' && line.trim()) {
       try {
         const event = JSON.parse(line.trim());
@@ -948,6 +954,8 @@ async function stopManagedProcess(record) {
 }
 
 async function waitForEvent(record, predicate, timeoutMs = READY_TIMEOUT_MS) {
+  const authenticationError = bridgeAuthenticationRetryError(record.outputTail);
+  if (authenticationError) throw authenticationError;
   const existing = record.events.find(predicate);
   if (existing) return existing;
   if (record.exited) {
@@ -970,13 +978,21 @@ async function waitForEvent(record, predicate, timeoutMs = READY_TIMEOUT_MS) {
       const tail = record.outputTail.slice(-10).join('\n');
       reject(new Error(`${record.label} exited before ready (${exit.signal || exit.code})${tail ? `:\n${tail}` : ''}\n日志：${record.logFile}`));
     };
+    const onOutput = () => {
+      const error = bridgeAuthenticationRetryError(record.outputTail);
+      if (!error) return;
+      cleanup();
+      reject(error);
+    };
     const cleanup = () => {
       clearTimeout(timeout);
       record.emitter.off('event', onEvent);
       record.emitter.off('exit', onExit);
+      record.emitter.off('output', onOutput);
     };
     record.emitter.on('event', onEvent);
     record.emitter.on('exit', onExit);
+    record.emitter.on('output', onOutput);
   });
 }
 
@@ -1333,6 +1349,8 @@ async function pairingConsumed(pairingFile) {
 async function waitForInitialBinding(record, pairingFile) {
   const deadline = Date.now() + READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
+    const authenticationError = bridgeAuthenticationRetryError(record.outputTail);
+    if (authenticationError) throw authenticationError;
     if (record.exited) {
       const tail = record.outputTail.slice(-10).join('\n');
       throw new Error(`${record.label} exited before binding completed${tail ? `:\n${tail}` : ''}\n日志：${record.logFile}`);

package/bin/runtime-network.mjs

@@ -24,6 +24,7 @@ const TLS_CODES = new Set([
   'UNABLE_TO_GET_ISSUER_CERT_LOCALLY',
   'UNABLE_TO_VERIFY_LEAF_SIGNATURE',
 ]);
+const MAIL_AUTH_CODES = new Set(['EAAMPMAILAUTH']);
 
 function asErrorDetails(error) {
   return error && typeof error === 'object' ? error : {};
@@ -95,6 +96,7 @@ export function classifyNetworkError(error) {
   if (status !== undefined) return status >= 500 ? 'http_5xx' : 'http_4xx';
 
   const codes = errorCodes(error);
+  if (codes.some((code) => MAIL_AUTH_CODES.has(code))) return 'mail_auth';
   if (codes.some((code) => DNS_CODES.has(code))) return 'dns';
   if (codes.some((code) => CONNECT_TIMEOUT_CODES.has(code))) return 'connect_timeout';
   if (codes.some((code) => TIMEOUT_CODES.has(code))) return 'timeout';
@@ -121,10 +123,18 @@ export function isRetryableHttpStatus(status) {
 export function isRetryableNetworkError(error) {
   const status = errorStatus(error);
   if (status !== undefined) return isRetryableHttpStatus(status);
-  return ['dns', 'connect_timeout', 'timeout', 'connection_reset', 'unreachable', 'network']
+  return ['mail_auth', 'dns', 'connect_timeout', 'timeout', 'connection_reset', 'unreachable', 'network']
     .includes(classifyNetworkError(error));
 }
 
+export function bridgeAuthenticationRetryError(outputLines) {
+  const output = (outputLines || []).slice(-30).join('\n');
+  if (!/\b535(?:\s+5\.7\.8)?\b[^\n]*authentication credentials invalid/i.test(output)) return undefined;
+  const error = new Error('AAMP 邮箱认证凭据已失效');
+  error.code = 'EAAMPMAILAUTH';
+  return error;
+}
+
 function defaultSleep(ms) {
   if (ms <= 0) return Promise.resolve();
   return new Promise((resolve) => setTimeout(resolve, ms));

package/bootstrap/aamp-feishu-task-agent-bootstrap.sh

@@ -64,7 +64,8 @@ ACP_BRIDGE_PKG="${ACP_BRIDGE_PKG:-@zengxingyuan/aamp-acp-bridge@0.1.28-dev.20}"
 CLI_BRIDGE_PKG="${CLI_BRIDGE_PKG:-@zengxingyuan/aamp-cli-bridge@0.1.7-dev.14}"
 FEISHU_BRIDGE_PKG="${FEISHU_BRIDGE_PKG:-@zengxingyuan/aamp-feishu-bridge@0.1.51}"
 AAMP_TASK_AGENT_NAME="${AAMP_TASK_AGENT_NAME:-@larktask/aamp-feishu-task-agent}"
-AAMP_TASK_AGENT_VERSION="0.1.0-dev.171"
+AAMP_TASK_AGENT_LEGACY_NAME="${AAMP_TASK_AGENT_LEGACY_NAME:-@zengxingyuan/aamp-feishu-task-agent}"
+AAMP_TASK_AGENT_VERSION="0.1.0-dev.173"
 AAMP_TASK_AGENT_CHANNEL="${AAMP_TASK_AGENT_CHANNEL:-dev}"
 AAMP_STALE_PROCESS_CLEANUP="${AAMP_STALE_PROCESS_CLEANUP:-false}"
 AAMP_STALE_PROCESS_SECONDS="${AAMP_STALE_PROCESS_SECONDS:-86400}"
@@ -740,10 +741,34 @@ script_file_task_agent_version() {
   sed -n 's/^AAMP_TASK_AGENT_VERSION="\([^"]*\)".*/\1/p' "$file" | head -n 1
 }
 
+script_file_task_agent_name() {
+  local file="$1"
+  [ -f "$file" ] || return 1
+  sed -n 's/^AAMP_TASK_AGENT_NAME="${AAMP_TASK_AGENT_NAME:-\([^}]*\)}"$/\1/p' "$file" | head -n 1
+}
+
 task_agent_global_package_dir() {
   printf '%s/lib/node_modules/%s' "$NPM_GLOBAL_PREFIX" "$AAMP_TASK_AGENT_NAME"
 }
 
+legacy_task_agent_global_package_dir() {
+  printf '%s/lib/node_modules/%s' "$NPM_GLOBAL_PREFIX" "$AAMP_TASK_AGENT_LEGACY_NAME"
+}
+
+remove_legacy_task_agent_global_install() {
+  [ "$AAMP_TASK_AGENT_NAME" != "$AAMP_TASK_AGENT_LEGACY_NAME" ] || return 0
+  [ -d "$(legacy_task_agent_global_package_dir)" ] || return 0
+
+  agent_detail "removing legacy task-agent npm package: $AAMP_TASK_AGENT_LEGACY_NAME"
+  sanitize_inherited_npm_exec_env
+  "$NPM_BIN" uninstall -g \
+    --registry "$NPM_REGISTRY" \
+    --cache "$NPM_CACHE_DIR" \
+    --prefix "$NPM_GLOBAL_PREFIX" \
+    "$AAMP_TASK_AGENT_LEGACY_NAME" >>"$ONE_CLICK_LOG" 2>&1
+  hash -r 2>/dev/null || true
+}
+
 task_agent_global_package_version() {
   local package_json
   package_json="$(task_agent_global_package_dir)/package.json"
@@ -788,6 +813,7 @@ ensure_task_agent_global_install_locked() {
     agent_detail "keeping newer task-agent npm package: installed=$installed_version requested=$expected_version"
     return 0
   fi
+  remove_legacy_task_agent_global_install || return 1
   agent_detail "synchronizing task-agent npm package: current=${installed_version:-missing} expected=$expected_version"
   npm_install_global "$AAMP_TASK_AGENT_NAME@$expected_version" >>"$ONE_CLICK_LOG" 2>&1 || return 1
   task_agent_global_install_is_current "$expected_version"
@@ -803,9 +829,11 @@ ensure_task_agent_global_install() {
 
 short_command_is_current() {
   local target="$1"
-  local installed_version
+  local installed_name installed_version
   [ -x "$target" ] || return 1
+  installed_name="$(script_file_task_agent_name "$target" || true)"
   installed_version="$(script_file_task_agent_version "$target" || true)"
+  [ "$installed_name" = "$AAMP_TASK_AGENT_NAME" ] || return 1
   [ "$installed_version" = "$AAMP_TASK_AGENT_VERSION" ]
 }
 

package/package.json

@@ -6,7 +6,7 @@
     "README.md"
   ],
   "license": "MIT",
-  "version": "0.1.0-dev.171",
+  "version": "0.1.0-dev.173",
   "description": "One-click manager for local Agent and Feishu Bot bindings.",
   "type": "module",
   "bin": {