weaver-work-cli 0.1.39 → 0.1.40

package/README.md

@@ -224,6 +224,8 @@ weaver-work-cli auth xiaoe
 桌面 XiaoE 客户端会话和 `WEAVER_XIAOE_*` 映射。`XIAOE_DOMAIN` 是 XiaoE/erpa 换票
 服务地址，不是 E10 地址。E10 目标按“显式 `--base-url` → 专用 `WEAVER_XIAOE_*`
 E10 配置/映射 → 当前 profile → `https://www.e-cology.com.cn`”解析。
+换票结果会保存 Unix 毫秒时间戳 `expiryTimes`；响应未携带时，CLI 按小E `tokens.py`
+的规则使用换票成功时间加 2 小时。
 
 统一登录失败时，所有操作系统都返回结构化的
 `authentication/xiaoe_credential_unavailable`，不会自动打开浏览器或降级到
@@ -232,7 +234,7 @@ E10 配置/映射 → 当前 profile → `https://www.e-cology.com.cn`”解析
 业务命令缺少可读取的本地会话时，若当前环境已通过 `XIAOE_*`、`--runtime-agent xiaoe`
 等运行时标记识别为 XiaoE，CLI 会先静默尝试统一登录，再继续原业务操作；失败时返回
 `authentication/xiaoe_credential_unavailable`，提示已尝试自动获取。未识别到 XiaoE 的首次认证仍需显式选择登录方式。
-`auth status --no-check` 等本地状态查询不会触发登录。已有 XiaoE 会话在接口层被明确判定为失效（HTTP 401/302、业务码 `-2` 或登录页）时，
+`auth status --no-check` 等本地状态查询不会触发登录。已有 XiaoE 会话达到 `expiryTimes` 时，CLI 会在业务请求发出前静默换取新会话；接口层明确判定失效（HTTP 401/302、业务码 `-2` 或登录页）时，
 公共 E10 请求运行时会根据持久化会话的 `agentType` / `loginSource` 静默换取一次新会话并把被拒绝的请求重放一次；该恢复不依赖 shared Skill、Agent、`XIAOE_*` 或 `--runtime-agent xiaoe`。这个过程不向
 stdout/stderr 输出中间“登录”步骤，并会合并同一 profile 的并发换票。流式请求、网络错误、
 `partial` / `write_uncertain` 不会重放；恢复后的地址或用户身份变化时也会停止。
@@ -251,7 +253,7 @@ weaver-work-cli --runtime-agent xiaoe workflow ...
 `credentialSourceDetected`、`attempted` 及各凭据源检测结果；命中 `tokens.py` 或内置
 Node 客户端会话路径时还会输出明确的尝试日志。统一登录成功后，登录结果以及后续
 `auth status` 会显示 `credentialSourceStep`、`credentialSourceType`、
-`credentialSourceLabel`，可据此确认实际凭证来源；`3 / xiaoe_client / XiaoE client settings`
+`credentialSourceLabel`、`expiryTimes`，可据此确认实际凭证来源；`3 / xiaoe_client / XiaoE client settings`
 表示未依赖 `tokens.py`，由 Node 直接换票。
 
 默认本地回调地址为 `http://127.0.0.1:19800/callback`。如果端口被占用：

package/dist/chunks/{archive-ENZYBBME.js → archive-JHTONRST.js}

@@ -5,11 +5,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{archive-oa-YWLEC5V4.js → archive-oa-FCHLCPHC.js}

@@ -5,11 +5,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{asset-OOV6DWPA.js → asset-RLIHC7DB.js}

@@ -4,11 +4,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{asset-idle-RE632MY5.js → asset-idle-KVOFTLCP.js}

@@ -5,11 +5,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{attachment-content-RWN2FCLL.js → attachment-content-RZYDB3MB.js}

@@ -8,9 +8,9 @@ import {
   looksLikeFileId,
   meetingAttachmentContentOperations,
   parseFileIdList
-} from "./chunk-KTCB5R5H.js";
-import "./chunk-YS5DPN4T.js";
-import "./chunk-CQHGNCK2.js";
+} from "./chunk-7E6MUOEK.js";
+import "./chunk-NJKREDA3.js";
+import "./chunk-7BRU4EFH.js";
 import "./chunk-LUSPKZKY.js";
 import "./chunk-BUSC6UAE.js";
 export {

package/dist/chunks/{blog-PEPOJAL7.js → blog-42OZTJNP.js}

@@ -4,11 +4,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{caizhilian-WYIQDVPJ.js → caizhilian-KRK547K5.js}

@@ -5,11 +5,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{calendar-CIARBAOX.js → calendar-RTWAMKHD.js}

@@ -5,11 +5,11 @@ import {
   createE10RequestRuntime,
   isE10SessionExpiredResponse,
   requireE10Session
-} from "./chunk-EZGFHJFW.js";
+} from "./chunk-WFFNM65B.js";
 import {
   E10_SESSION_EXPIRED_MESSAGE,
   getActiveProfile
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-4TEDNCON.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{chunk-L4N7B7ZD.js → chunk-4CTESSKI.js}

@@ -3,13 +3,13 @@ const require = __esbuildCreateRequire(import.meta.url);
 import {
   readCache,
   writeCache
-} from "./chunk-P2DAISYW.js";
+} from "./chunk-I566ZYNF.js";
 import {
   SCHEMA_DATETIME_MINUTE,
   meetingSuccess,
   meetingValidationError,
   schemaOf
-} from "./chunk-CQHGNCK2.js";
+} from "./chunk-7BRU4EFH.js";
 
 // src/shortcuts/meeting/operations/eb/schedule.ts
 var SCHEDULE_TYPE_PATH = "/api/ebuilder/form/formdata/v2/getFormDataList/queryAgendaType";
@@ -110,9 +110,9 @@ async function runScheduleConflictFlow(env, input) {
   if (!employeeId) {
     throw meetingValidationError("schedule_employee_required", "\u53D6\u4E0D\u5230\u5F53\u524D\u767B\u5F55\u7528\u6237 id\uFF0C\u65E0\u6CD5\u89E6\u53D1 ESB \u65E5\u7A0B\u67E5\u8BE2");
   }
-  const { createEsbHost } = await import("./host-VGPVP7YF.js");
+  const { createEsbHost } = await import("./host-256GVCAH.js");
   const { createEsbContinuationSigner } = await import("./continuation-NLECEJPX.js");
-  const { getEsbOperation } = await import("./registry-VT5Y2HLA.js");
+  const { getEsbOperation } = await import("./registry-RXPN6BBT.js");
   const esbEnv = {
     ctx: env.ctx,
     host: createEsbHost(env.ctx),

package/dist/chunks/{chunk-XXJOSZTQ.js → chunk-4TEDNCON.js}

@@ -488,6 +488,15 @@ var E10AuthSession = class _E10AuthSession {
   get credentialSourceLabel() {
     return this.data.credentialSourceLabel || "";
   }
+  get expiryTimes() {
+    const value = Number(this.data.expiryTimes);
+    return Number.isFinite(value) && value > 0 ? value : void 0;
+  }
+  /** XiaoE 换取的 ETEAMSID 是否已经超过其明确的失效时间。 */
+  isExpired(now = Date.now()) {
+    const expiryTimes = this.expiryTimes;
+    return expiryTimes !== void 0 && now >= expiryTimes;
+  }
   getBaseUrl() {
     return (this.data.baseUrl || "").replace(/\/$/, "");
   }
@@ -540,6 +549,7 @@ var E10AuthSession = class _E10AuthSession {
       stTicket: this.data.stTicket,
       redirectUrl: this.data.redirectUrl,
       cookieSavedAt: this.data.cookieSavedAt,
+      expiryTimes: this.expiryTimes,
       mainUrl: this.data.mainUrl,
       ...sourceInfo,
       hasEteamsId: Boolean(this.eteamsId)
@@ -566,7 +576,7 @@ var E10AuthSession = class _E10AuthSession {
     const authPath = findAuthFile(startDir, options);
     if (!authPath) return null;
     const session = _E10AuthSession.fromFile(authPath, baseUrl, passportUrl);
-    if (session && !(load.skipProfileEnrichment && hasUsableUserId(session))) {
+    if (session && !session.isExpired() && !(load.skipProfileEnrichment && hasUsableUserId(session))) {
       await session.fetchEmployeeId();
     }
     return session;
@@ -825,6 +835,7 @@ var XIAOE_SKILL_ETEAMID_API_PATH = "/spec-apps/api/app/rpachat/skill/extend/etea
 var XIAOE_CLIENT_SETTINGS_SOURCE = "XiaoE/Robots/user_settings.json";
 var XIAOE_USER_TOKEN_SOURCE = "XIAOE_USER_TOKEN";
 var XIAOE_BUNDLED_ENV_SCRIPT_SOURCE = "bundled scripts/xiaoe_env.py";
+var XIAOE_ETEAMID_TTL_MS = 72e5;
 function envString(env, ...keys) {
   for (const key of keys) {
     const value = env[key];
@@ -882,6 +893,13 @@ function readString(data, ...keys) {
   }
   return "";
 }
+function readExpiryTimes(data) {
+  for (const key of ["expiryTimes", "expiryTime", "expiresAt", "expires_at"]) {
+    const value = Number(data[key]);
+    if (Number.isFinite(value) && value > 0) return Math.trunc(value);
+  }
+  return void 0;
+}
 function cookieString(value) {
   if (!value) return "";
   if (typeof value === "string") return value;
@@ -937,7 +955,18 @@ function readXiaoECredentialRecord(value, source, fallbackBaseUrl = "") {
   const rawCookie = candidates.map((entry) => cookieString(entry.cookies || entry.cookie || entry.rawCookie || entry.raw_cookie)).find(Boolean) || "";
   const eteamsId = candidates.map((entry) => readString(entry, "eteamsId", "eteamsid", "ETEAMSID", "eteamId", "eteam_id", "eTeamId", "eteamID", "eteam_id")).find(Boolean) || cookieValue(rawCookie, "ETEAMSID");
   if (!baseUrl || !eteamsId) return null;
-  return { baseUrl: normalizeUrl(baseUrl), eteamsId, source, rawCookie };
+  const expiryTimes = candidates.map(readExpiryTimes).find((value2) => value2 !== void 0);
+  return {
+    baseUrl: normalizeUrl(baseUrl),
+    eteamsId,
+    source,
+    rawCookie,
+    ...expiryTimes !== void 0 ? { expiryTimes } : {}
+  };
+}
+function withDefaultXiaoEExpiry(credential) {
+  if (!credential || credential.expiryTimes !== void 0) return credential;
+  return { ...credential, expiryTimes: Date.now() + XIAOE_ETEAMID_TTL_MS };
 }
 function parseXiaoEUnifiedLoginMap(raw, source) {
   const value = raw.trim();
@@ -1201,14 +1230,18 @@ async function runXiaoETokenScript(baseUrl, env = process.env) {
 async function resolveXiaoETokenScriptCredential(baseUrl, env = process.env) {
   const tokenData = await runXiaoETokenScript(baseUrl, env);
   if (!tokenData) return null;
-  return readXiaoECredentialRecord(tokenData, "xiaoeUserData/tokens.py", baseUrl);
+  return withDefaultXiaoEExpiry(
+    readXiaoECredentialRecord(tokenData, "xiaoeUserData/tokens.py", baseUrl)
+  );
 }
 async function resolveXiaoEBundledEnvScriptCredential(baseUrl, env = process.env) {
   const scriptPath = xiaoEBundledEnvScriptPath();
   if (!scriptPath) return null;
   const tokenData = await runXiaoEPythonCredentialScript(scriptPath, baseUrl, env);
   if (!tokenData) return null;
-  return readXiaoECredentialRecord(tokenData, XIAOE_BUNDLED_ENV_SCRIPT_SOURCE, baseUrl);
+  return withDefaultXiaoEExpiry(
+    readXiaoECredentialRecord(tokenData, XIAOE_BUNDLED_ENV_SCRIPT_SOURCE, baseUrl)
+  );
 }
 function xiaoEClientRobotsRoot(env = process.env) {
   if (process.platform === "win32") {
@@ -1388,7 +1421,9 @@ async function resolveXiaoETokenCredential(credential, baseUrl) {
   const targetBaseUrl = baseUrl || DEFAULT_E10_BASE_URL;
   const payload = await fetchXiaoEClientEteamId(credential, targetBaseUrl);
   const resolvedBaseUrl = payload.code === 0 ? credential.erpaUrl : targetBaseUrl;
-  return readXiaoECredentialRecord(payload, credential.source, resolvedBaseUrl);
+  return withDefaultXiaoEExpiry(
+    readXiaoECredentialRecord(payload, credential.source, resolvedBaseUrl)
+  );
 }
 async function resolveXiaoEPlatformCredential(baseUrl, env = process.env) {
   const credential = readXiaoEPlatformCredential(env);
@@ -1466,6 +1501,7 @@ async function saveXiaoEUnifiedLogin(input) {
     baseUrl,
     passportUrl: baseUrl,
     cookieSavedAt: Date.now(),
+    ...input.expiryTimes !== void 0 ? { expiryTimes: input.expiryTimes } : {},
     loginSource: "xiaoe-unified",
     credentialSourceStep: input.credentialSource.credentialSourceStep,
     credentialSourceType: input.credentialSource.credentialSourceType,
@@ -1488,6 +1524,7 @@ async function saveXiaoEUnifiedLogin(input) {
       agentType: XIAOE_AGENT_TYPE,
       version: "",
       loginSource: "xiaoe-unified",
+      ...input.expiryTimes !== void 0 ? { expiryTimes: input.expiryTimes } : {},
       ...input.credentialSource
     }
   };
@@ -1569,6 +1606,7 @@ async function tryXiaoEUnifiedLogin(options = {}) {
       baseUrl: credential.baseUrl || baseUrl || DEFAULT_E10_BASE_URL,
       eteamsId: credential.eteamsId,
       rawCookie: credential.rawCookie,
+      expiryTimes: credential.expiryTimes,
       tenantKeyFallback: options.tenantKeyFallback,
       profileHint: options.profileHint,
       credentialSource: describeXiaoECredentialSource(credential.source)