@larktask/aamp-feishu-task-agent 0.1.0-dev.172 → 0.1.0-dev.174

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

@@ -47,6 +47,7 @@ CODEM_INSTALLER_URL="${CODEM_INSTALLER_URL:-https://sf-unpkg-src.bytedance.net/@
 CODEM_INSTALLER_CONFIRM="${CODEM_INSTALLER_CONFIRM:-}"
 CODEM_PROVIDER_PREFLIGHT="${CODEM_PROVIDER_PREFLIGHT:-true}"
 CODEM_PROVIDER_PREFLIGHT_TIMEOUT_SECONDS="${CODEM_PROVIDER_PREFLIGHT_TIMEOUT_SECONDS:-60}"
+CODEX_CHATGPT_APP_CLI="/Applications/ChatGPT.app/Contents/Resources/codex"
 CODEX_APP_CLI="/Applications/Codex.app/Contents/Resources/codex"
 CODEX_AUTO_UPDATE="${CODEX_AUTO_UPDATE:-true}"
 CODEX_NPM_PACKAGE="${CODEX_NPM_PACKAGE:-@openai/codex}"
@@ -65,7 +66,7 @@ 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_LEGACY_NAME="${AAMP_TASK_AGENT_LEGACY_NAME:-@zengxingyuan/aamp-feishu-task-agent}"
-AAMP_TASK_AGENT_VERSION="0.1.0-dev.172"
+AAMP_TASK_AGENT_VERSION="0.1.0-dev.174"
 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}"
@@ -3453,6 +3454,11 @@ resolve_codex_cli_for_acp() {
     return 0
   fi
 
+  if is_macos && [ -x "$CODEX_CHATGPT_APP_CLI" ]; then
+    printf '%s\n' "$CODEX_CHATGPT_APP_CLI"
+    return 0
+  fi
+
   if is_macos && [ -x "$CODEX_APP_CLI" ]; then
     printf '%s\n' "$CODEX_APP_CLI"
     return 0
@@ -3484,7 +3490,7 @@ validate_codex_acp_command() {
   if [ "$status" -ne 0 ]; then
     agent_log "Codex ACP command validation failed:"
     printf '%s\n' "$output" >&2
-    agent_fail "codex ACP command is unavailable; check Codex.app or reinstall codex CLI"
+    agent_fail "codex ACP command is unavailable; check ChatGPT.app, Codex.app, or reinstall codex CLI"
   fi
 }
 

package/package.json

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