weaver-work-cli 0.1.23 → 0.1.24

package/README.md

@@ -211,7 +211,7 @@ weaver-work-cli auth login --base-url "https://weapp.xxx.cn"
 weaver-work-cli auth oidc --base-url "https://weapp.xxx.cn"
 ```
 
-在 XiaoE 宿主环境中，`auth login` / `auth oidc` / `auth xiaoe` 会优先使用平台注入的
+只有当前智能体身份明确为 XiaoE 时，`auth xiaoe` 和未显式指定认证来源的业务命令才会优先使用平台注入的
 `XIAOE_USER_TOKEN` + `XIAOE_DOMAIN` 换取 ETEAMSID：其中 `XIAOE_DOMAIN` 是
 XiaoE/erpa 换票服务地址，不是 E10 登录地址。CLI 的 Node 实现会直接调用与
 `xiaoe_env.py` / `tokens.py` 相同的换票接口，并校验业务码和 `data.eteamId`；它保留
@@ -226,7 +226,7 @@ Agent；Skill 只负责调用 `weaver-work-cli auth xiaoe`。CLI 自带脚本仅
 E10 目标地址按“显式 `--base-url` → 专用 `WEAVER_XIAOE_*` E10 配置/映射 →
 当前 profile → `https://www.e-cology.com.cn`”解析，绝不会把 `XIAOE_DOMAIN`
 当作 E10 地址。匹配成功时直接保存登录态，并固定使用 `agentType=XiaoE`。业务命令
-在未显式指定 `--auth` / `--profile` 时，也会自动优先尝试 XiaoE 统一登录。
+在已确认的 XiaoE 智能体环境中且未显式指定 `--auth` / `--profile` 时，也会自动优先尝试 XiaoE 统一登录。
 `auth xiaoe` 失败后仅在 macOS/Windows 桌面宿主自动降级浏览器 OAuth；Web/Linux
 环境会返回结构化的 `authentication/xiaoe_web_credential_unavailable` 错误，不再
 启动无法回调的 localhost 浏览器登录。确需浏览器授权时，应在可接收本地回调的宿主
@@ -236,6 +236,8 @@ E10 目标地址按“显式 `--base-url` → 专用 `WEAVER_XIAOE_*` E10 配置
 weaver-work-cli auth xiaoe
 ```
 
+`auth login` / `auth oidc` 始终是纯浏览器 OAuth 入口。本机存在 `xiaoeUserData/tokens.py`、XiaoE 客户端目录、`XIAOE_SKILL_*` 或 `WEAVER_XIAOE_*` 配置，都不能单独证明当前智能体是 XiaoE，也不会让 WorkBuddy、Codex 或其他智能体切换到 XiaoE 登录。
+
 默认本地回调地址为 `http://127.0.0.1:19800/callback`。如果端口被占用：
 
 ```text
@@ -252,6 +254,25 @@ weaver-work-cli auth login --base-url "https://weapp.xxx.cn" --port 19801
 weaver-work-cli auth login --base-url "https://weapp.xxx.cn" --agent_type workbuddy
 ```
 
+浏览器授权成功后，本地回调页会为已识别的桌面智能体显示应用打开弹层。CLI 内置
+WorkBuddy（`workbuddy://`）、智能小 E（`xiaoe-client://`）和 Codex（`codex://`）映射；
+其他智能体在 `agent_type` 本身是合法协议名时，默认按 `<agent_type>://` 唤起。弹层显示
+“打开客户端 / 始终打开客户端 / 取消”。用户确认后，页面通过一次性令牌请求本地 CLI，
+由 CLI 调用系统注册的桌面协议；浏览器不直接访问自定义
+协议，因此不会再出现 Chrome/Edge 无法定制的外部协议确认框。Windows/macOS 安装包都
+需要注册该协议。如果宿主要返回当前会话等更精确的位置，可传入宿主
+注册的深链（仅接受桌面应用自定义协议，不接受网页、脚本或本地文件 URL）：
+
+```text
+weaver-work-cli auth login --base-url "https://weapp.xxx.cn" --agent_type workbuddy --agent-return-url "workbuddy://<宿主提供的路径>"
+```
+
+宿主也可以注入 `WEAVER_AGENT_RETURN_URL`，命令行参数优先于环境变量；客户端协议名与
+`agent_type` 不一致时也应使用该覆盖。“始终打开”偏好
+保存在当前本地回调地址的浏览器存储中；未识别到可用返回协议时，回调页保持原有提示，
+不显示应用打开弹层。本地 CLI 打开通道默认保留 15 分钟；超过时间再点击时会自动退回
+浏览器自定义协议打开方式，仍可打开应用，但浏览器可能重新显示原生协议确认框。
+
 方式二：手动写入浏览器中的 `ETEAMSID`。
 
 ```text

package/dist/internal/e10/auth/commands.js

@@ -1,4 +1,5 @@
 import { execFile } from 'node:child_process';
+import { randomBytes } from 'node:crypto';
 import { createServer } from 'node:http';
 import { CliError, ExitCode } from '../../../core/errors.js';
 import { clearInvoiceTokenForSession } from '../../../shortcuts/invoice/host.js';
@@ -8,9 +9,46 @@ import { XIAOE_AGENT_TYPE, createXiaoEUnifiedLoginUnavailableError, hasXiaoEEnv,
 export { DEFAULT_E10_BASE_URL, XIAOE_AGENT_TYPE, hasXiaoEEnv, hasXiaoETokenScript, resolveXiaoEDefaultBaseUrl, resolveXiaoEPreferredBaseUrl, resolveXiaoEUnifiedLoginCredential, shouldUseXiaoEBrowserFallback, } from './xiaoe.js';
 const DEFAULT_AGENT_TYPE = 'weaver-work-cli';
 const EXPLICIT_AGENT_TYPE_ENV_KEYS = [
-    'WEAVER_AGENT_TYPE',
     'WORKBUDDY_AGENT_TYPE',
     'CODEX_AGENT_TYPE',
+    'WEAVER_AGENT_TYPE',
+];
+const AGENT_RETURN_URL_ENV_KEY = 'WEAVER_AGENT_RETURN_URL';
+const AGENT_RETURN_PATH = '/agent-return';
+const AGENT_RETURN_TOKEN_HEADER = 'x-weaver-agent-return-token';
+const AGENT_RETURN_TIMEOUT_MS = 900_000;
+const UNSAFE_AGENT_RETURN_PROTOCOLS = new Set([
+    'about:',
+    'blob:',
+    'data:',
+    'file:',
+    'ftp:',
+    'http:',
+    'https:',
+    'javascript:',
+    'mailto:',
+    'sms:',
+    'tel:',
+    'vbscript:',
+    'ws:',
+    'wss:',
+]);
+const BUILT_IN_AGENT_RETURN_TARGETS = [
+    {
+        aliases: ['workbuddy'],
+        label: 'WorkBuddy',
+        url: 'workbuddy://',
+    },
+    {
+        aliases: ['xiaoe', 'xiaoeclient', '小e', '智能小e'],
+        label: '智能小 E',
+        url: 'xiaoe-client://',
+    },
+    {
+        aliases: ['codex', 'openaicodex'],
+        label: 'Codex',
+        url: 'codex://',
+    },
 ];
 function asOptions(value) {
     return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
@@ -49,6 +87,59 @@ export function resolveAgentType(options = {}, env = process.env) {
         || inferAgentTypeFromEnv(env)
         || DEFAULT_AGENT_TYPE;
 }
+function normalizeAgentKey(value) {
+    return value.toLowerCase().replace(/[^a-z0-9]+/gu, '');
+}
+function normalizeAgentAlias(value) {
+    return value.trim().toLowerCase().replace(/[^\p{Letter}\p{Number}]+/gu, '');
+}
+function builtInAgentReturnTarget(agentType) {
+    const alias = normalizeAgentAlias(agentType);
+    const target = BUILT_IN_AGENT_RETURN_TARGETS.find((candidate) => candidate.aliases.includes(alias));
+    return target ? { label: target.label, url: target.url } : null;
+}
+function conventionalAgentReturnUrl(agentType) {
+    const scheme = agentType.trim().toLowerCase();
+    if (normalizeAgentAlias(agentType) === normalizeAgentAlias(DEFAULT_AGENT_TYPE)
+        || scheme.length > 64
+        || !/^[a-z][a-z0-9+.-]*$/u.test(scheme)
+        || UNSAFE_AGENT_RETURN_PROTOCOLS.has(`${scheme}:`)) {
+        return '';
+    }
+    return `${scheme}://`;
+}
+function validateAgentReturnUrl(value) {
+    if (value.length > 2048
+        || /[\u0000-\u001f\u007f\s]/u.test(value)
+        || !/^[a-z][a-z0-9+.-]*:\/\//iu.test(value)) {
+        throw new CliError('Invalid --agent-return-url value', ExitCode.UsageError);
+    }
+    let url;
+    try {
+        url = new URL(value);
+    }
+    catch {
+        throw new CliError('Invalid --agent-return-url value', ExitCode.UsageError);
+    }
+    if (UNSAFE_AGENT_RETURN_PROTOCOLS.has(url.protocol)) {
+        throw new CliError('--agent-return-url must use a registered desktop application URL scheme.', ExitCode.UsageError);
+    }
+    return value;
+}
+export function resolveAgentReturnTarget(options = {}, env = process.env, agentType = resolveAgentType(options, env)) {
+    const builtInTarget = builtInAgentReturnTarget(agentType);
+    const explicitUrl = optionString(options, 'agentReturnUrl') || envString(env, AGENT_RETURN_URL_ENV_KEY);
+    if (explicitUrl) {
+        return {
+            label: builtInTarget?.label || agentType,
+            url: validateAgentReturnUrl(explicitUrl),
+        };
+    }
+    if (builtInTarget)
+        return builtInTarget;
+    const conventionalUrl = conventionalAgentReturnUrl(agentType);
+    return conventionalUrl ? { label: agentType, url: conventionalUrl } : null;
+}
 function normalizeUrl(value) {
     return value.replace(/\/+$/, '');
 }
@@ -160,8 +251,18 @@ function esc(value) {
         .replace(/"/g, '"')
         .replace(/'/g, ''');
 }
-export function renderE10LoginSuccessPage(userId) {
-    return `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>weaver-work-cli 登录成功</title><style>body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Arial,sans-serif;background:#f6f7f9;color:#20242a;display:grid;place-items:center;min-height:100vh;margin:0}.card{background:#fff;border:1px solid #e6e8ec;border-radius:8px;padding:28px 32px;box-shadow:0 8px 32px rgba(18,24,40,.08);min-width:320px;text-align:center}.title{font-size:20px;font-weight:600;margin-bottom:8px}.desc{color:#667085;font-size:14px;line-height:22px}.user{color:#98a2b3;font-size:12px;margin-top:12px}</style></head><body><main class="card"><div class="title">登录授权成功</div><div class="desc">你可以关闭此页面，返回智能体或终端继续使用。</div><div class="user">${esc(userId)}</div></main></body></html>`;
+export function renderE10LoginSuccessPage(userId, returnTarget = null, launchToken = '') {
+    const safeReturnTarget = returnTarget
+        ? { ...returnTarget, url: validateAgentReturnUrl(returnTarget.url) }
+        : null;
+    const agentKey = safeReturnTarget ? normalizeAgentKey(safeReturnTarget.label) || 'agent' : '';
+    const returnAction = safeReturnTarget && launchToken
+        ? `<div class="overlay" data-agent-return data-token="${esc(launchToken)}" data-agent-key="${esc(agentKey)}" data-agent-label="${esc(safeReturnTarget.label)}" data-fallback-url="${esc(safeReturnTarget.url)}"><section class="prompt" role="dialog" aria-modal="true" aria-labelledby="agent-return-title"><div class="app-icon" aria-hidden="true"><svg viewBox="0 0 64 64"><defs><linearGradient id="app-gradient" x1="8" y1="4" x2="56" y2="60" gradientUnits="userSpaceOnUse"><stop stop-color="#24d3b5"/><stop offset="1" stop-color="#08aa82"/></linearGradient></defs><rect width="64" height="64" rx="16" fill="url(#app-gradient)"/><path d="M18 21.5 32 13l14 8.5v17L32 47 18 38.5v-17Z" fill="#fff" fill-opacity=".96"/><rect x="23" y="25" width="18" height="15" rx="6" fill="#12b991"/><circle cx="28.5" cy="32.5" r="1.8" fill="#fff"/><circle cx="35.5" cy="32.5" r="1.8" fill="#fff"/></svg></div><h1 id="agent-return-title">是否打开“${esc(safeReturnTarget.label)}”？</h1><p>登录授权已完成，返回 ${esc(safeReturnTarget.label)} 继续使用。</p><button class="primary" type="button" data-action="open">打开“${esc(safeReturnTarget.label)}”</button><button class="secondary" type="button" data-action="always">始终打开“${esc(safeReturnTarget.label)}”</button><button class="secondary" type="button" data-action="cancel">取消</button><div class="status" role="status" aria-live="polite"></div></section></div>`
+        : '';
+    const returnScript = safeReturnTarget && launchToken
+        ? `<script nonce="${esc(launchToken)}">(()=>{const root=document.querySelector('[data-agent-return]');if(!root)return;const status=root.querySelector('.status');const buttons=[...root.querySelectorAll('button')];const agentLabel=root.dataset.agentLabel||'应用';const fallbackUrl=root.dataset.fallbackUrl||'';const storageKey='weaver-work-cli.agent-return.'+root.dataset.agentKey;let busy=false;const setBusy=value=>{busy=value;buttons.forEach(button=>{button.disabled=value;});};const closePrompt=()=>{root.hidden=true;};const savePreference=()=>{try{localStorage.setItem(storageKey,'1');}catch{}};const clearPreference=()=>{try{localStorage.removeItem(storageKey);}catch{}};const hasPreference=()=>{try{return localStorage.getItem(storageKey)==='1';}catch{return false;}};const post=async action=>{let response;try{response=await fetch('${AGENT_RETURN_PATH}?action='+encodeURIComponent(action),{method:'POST',headers:{'${AGENT_RETURN_TOKEN_HEADER}':root.dataset.token}});}catch{return false;}if(!response.ok)throw new Error(await response.text()||'请求失败');return true;};const openAgent=async persist=>{if(busy)return;setBusy(true);status.textContent='正在打开 '+agentLabel+'…';try{const openedLocally=await post('open');if(persist)savePreference();if(!openedLocally){closePrompt();window.location.href=fallbackUrl;return;}closePrompt();}catch(error){if(persist)clearPreference();status.textContent=error instanceof Error?error.message:'无法打开应用，请稍后重试。';setBusy(false);}};root.querySelector('[data-action="open"]').addEventListener('click',()=>openAgent(false));root.querySelector('[data-action="always"]').addEventListener('click',()=>openAgent(true));root.querySelector('[data-action="cancel"]').addEventListener('click',()=>{if(busy)return;clearPreference();closePrompt();post('cancel').catch(()=>{});});if(hasPreference())openAgent(false);})();</script>`
+        : '';
+    return `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>weaver-work-cli 登录成功</title><style>:root{color-scheme:light}*{box-sizing:border-box}body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Arial,sans-serif;background:radial-gradient(circle at 50% 18%,#eefbf8 0,#f6f7f9 42%,#eef1f5 100%);color:#20242a;display:grid;place-items:center;min-height:100vh;margin:0}.card{background:rgba(255,255,255,.88);border:1px solid #e6e8ec;border-radius:18px;padding:34px 38px;box-shadow:0 18px 55px rgba(18,24,40,.09);width:min(560px,calc(100vw - 40px));text-align:center}.title{font-size:24px;font-weight:700;margin-bottom:10px}.desc{color:#667085;font-size:15px;line-height:24px}.user{color:#98a2b3;font-size:12px;margin-top:18px}.overlay{position:fixed;inset:0;z-index:10;display:grid;place-items:center;padding:20px;background:rgba(28,34,41,.36);backdrop-filter:blur(5px)}.overlay[hidden]{display:none}.prompt{width:min(410px,calc(100vw - 32px));padding:32px 28px 26px;border:1px solid rgba(255,255,255,.75);border-radius:24px;background:rgba(250,250,251,.97);box-shadow:0 24px 70px rgba(15,23,42,.28);text-align:center}.app-icon{width:74px;height:74px;margin:0 auto 24px;filter:drop-shadow(0 8px 14px rgba(8,170,130,.22))}.app-icon svg{display:block;width:100%;height:100%}.prompt h1{margin:0;font-size:20px;line-height:30px;font-weight:700;letter-spacing:-.2px}.prompt p{margin:10px 0 24px;color:#667085;font-size:14px;line-height:22px}.prompt button{display:block;width:100%;min-height:40px;border:0;border-radius:12px;font:600 16px/22px inherit;cursor:pointer;transition:transform .12s ease,filter .12s ease}.prompt button+button{margin-top:10px}.prompt button:hover{filter:brightness(.98)}.prompt button:active{transform:scale(.99)}.prompt button:disabled{cursor:wait;opacity:.62}.primary{background:linear-gradient(180deg,#2f91ff,#0b74e5);color:#fff;box-shadow:0 8px 18px rgba(11,116,229,.2)}.secondary{background:#e9eaec;color:#22252a}.status{min-height:18px;margin-top:14px;color:#667085;font-size:12px;line-height:18px}</style></head><body><main class="card"><div class="title">登录授权成功</div><div class="desc">你可以关闭此页面，返回智能体或终端继续使用。</div><div class="user">${esc(userId)}</div></main>${returnAction}${returnScript}</body></html>`;
 }
 export function resolveBrowserOpenCommand(url, platform = process.platform) {
     if (platform === 'win32') {
@@ -179,6 +280,17 @@ function openUrlInBrowser(url, ctx) {
         }
     });
 }
+function openUrlWithSystemHandler(url) {
+    const command = resolveBrowserOpenCommand(url);
+    return new Promise((resolve, reject) => {
+        execFile(command.file, command.args, (error) => {
+            if (error)
+                reject(error);
+            else
+                resolve();
+        });
+    });
+}
 export function buildE10AuthorizeUrl(baseUrl, redirectUri, agentType) {
     const authorizeParams = new URLSearchParams({
         redirect_uri: redirectUri,
@@ -380,11 +492,14 @@ async function runBrowserLogin(ctx, options, behavior = {}) {
     const profileFromGlobal = globalOptions.profile;
     const cfg = readProfileConfig(profileFromGlobal || getActiveProfile());
     const explicitBaseUrl = optionString(commandOpts, 'baseUrl') || globalOptions.baseUrl || '';
-    const baseUrl = resolveXiaoEPreferredBaseUrl({
-        explicitBaseUrl,
-        profileBaseUrl: cfg.baseUrl,
-        env: ctx.env,
-    });
+    const useXiaoELogin = behavior.tryXiaoEUnifiedLogin === true && hasXiaoEEnv(ctx.env);
+    const baseUrl = useXiaoELogin
+        ? resolveXiaoEPreferredBaseUrl({
+            explicitBaseUrl,
+            profileBaseUrl: cfg.baseUrl,
+            env: ctx.env,
+        })
+        : normalizeUrl(explicitBaseUrl || cfg.baseUrl || '');
     const tenantKey = optionString(commandOpts, 'tenantKey');
     const portText = optionString(commandOpts, 'port') || '19800';
     const port = Number.parseInt(portText, 10);
@@ -393,11 +508,15 @@ async function runBrowserLogin(ctx, options, behavior = {}) {
     if (!Number.isInteger(port) || port <= 0 || port > 65535) {
         throw new CliError('Invalid --port value', ExitCode.UsageError);
     }
-    const xiaoEResult = await tryXiaoEUnifiedLogin(ctx, baseUrl, tenantKey, profileFromGlobal, behavior.allowXiaoETokenScript === true);
-    if (xiaoEResult)
-        return xiaoEResult;
-    const willOpenBrowser = behavior.browserFallback !== 'desktop-only' || shouldUseXiaoEBrowserFallback();
-    if (behavior.explainXiaoEFallback) {
+    if (useXiaoELogin) {
+        const xiaoEResult = await tryXiaoEUnifiedLogin(ctx, baseUrl, tenantKey, profileFromGlobal, behavior.allowXiaoETokenScript === true);
+        if (xiaoEResult)
+            return xiaoEResult;
+    }
+    const willOpenBrowser = !useXiaoELogin
+        || behavior.browserFallback !== 'desktop-only'
+        || shouldUseXiaoEBrowserFallback();
+    if (useXiaoELogin && behavior.explainXiaoEFallback) {
         ctx.logger.warn(xiaoEUnifiedLoginUnavailableMessage(baseUrl, willOpenBrowser));
     }
     if (!willOpenBrowser) {
@@ -405,6 +524,8 @@ async function runBrowserLogin(ctx, options, behavior = {}) {
     }
     if (!baseUrl)
         throw new CliError('Missing --base-url', ExitCode.UsageError);
+    const agentReturnTarget = resolveAgentReturnTarget(commandOpts, ctx.env, agentType);
+    const agentReturnToken = agentReturnTarget ? randomBytes(24).toString('base64url') : '';
     const redirectUri = `http://127.0.0.1:${port}/callback`;
     const loginUrl = buildE10AuthorizeUrl(baseUrl, redirectUri, agentType);
     ctx.logger.info('Open browser login: ' + loginUrl);
@@ -412,6 +533,7 @@ async function runBrowserLogin(ctx, options, behavior = {}) {
     return await new Promise((resolve, reject) => {
         let settled = false;
         let timer = null;
+        let pendingLoginResult = null;
         const finish = (error, result) => {
             if (settled)
                 return;
@@ -433,6 +555,43 @@ async function runBrowserLogin(ctx, options, behavior = {}) {
         };
         const server = createServer(async (req, res) => {
             const callbackUrl = new URL(req.url || '/', `http://127.0.0.1:${port}`);
+            if (callbackUrl.pathname === AGENT_RETURN_PATH) {
+                const requestToken = req.headers[AGENT_RETURN_TOKEN_HEADER];
+                if (req.method !== 'POST'
+                    || !agentReturnTarget
+                    || !pendingLoginResult
+                    || requestToken !== agentReturnToken) {
+                    res.writeHead(403, { 'cache-control': 'no-store', 'content-type': 'text/plain; charset=utf-8' });
+                    res.end('Forbidden');
+                    return;
+                }
+                const action = callbackUrl.searchParams.get('action');
+                if (action === 'cancel') {
+                    const result = pendingLoginResult;
+                    res.writeHead(204, { 'cache-control': 'no-store' });
+                    res.end();
+                    finish(null, result);
+                    return;
+                }
+                if (action !== 'open') {
+                    res.writeHead(400, { 'cache-control': 'no-store', 'content-type': 'text/plain; charset=utf-8' });
+                    res.end('Invalid action');
+                    return;
+                }
+                try {
+                    await openUrlWithSystemHandler(agentReturnTarget.url);
+                    const result = pendingLoginResult;
+                    res.writeHead(200, { 'cache-control': 'no-store', 'content-type': 'application/json; charset=utf-8' });
+                    res.end('{"ok":true}');
+                    finish(null, result);
+                }
+                catch {
+                    ctx.logger.warn(`Could not open ${agentReturnTarget.label} automatically.`);
+                    res.writeHead(500, { 'cache-control': 'no-store', 'content-type': 'text/plain; charset=utf-8' });
+                    res.end(`无法打开 ${agentReturnTarget.label}，请确认应用已安装。`);
+                }
+                return;
+            }
             if (callbackUrl.pathname !== '/callback') {
                 res.writeHead(404, { 'content-type': 'text/plain; charset=utf-8' });
                 res.end('Not found');
@@ -460,9 +619,26 @@ async function runBrowserLogin(ctx, options, behavior = {}) {
             }
             try {
                 const result = await oidcExchange(code, redirectUri, baseUrl, tenantKey, redirectAgentType, profileFromGlobal);
-                res.writeHead(200, { 'content-type': 'text/html; charset=utf-8' });
-                res.end(renderE10LoginSuccessPage(result.userId));
-                finish(null, result);
+                const responseHeaders = {
+                    'cache-control': 'no-store',
+                    'content-security-policy': agentReturnTarget
+                        ? `default-src 'none'; style-src 'unsafe-inline'; script-src 'nonce-${agentReturnToken}'; connect-src 'self'`
+                        : `default-src 'none'; style-src 'unsafe-inline'`,
+                    'content-type': 'text/html; charset=utf-8',
+                    'referrer-policy': 'no-referrer',
+                    'x-content-type-options': 'nosniff',
+                    'x-frame-options': 'DENY',
+                };
+                res.writeHead(200, responseHeaders);
+                res.end(renderE10LoginSuccessPage(result.userId, agentReturnTarget, agentReturnToken));
+                if (!agentReturnTarget) {
+                    finish(null, result);
+                    return;
+                }
+                pendingLoginResult = result;
+                if (timer)
+                    clearTimeout(timer);
+                timer = setTimeout(() => finish(null, result), AGENT_RETURN_TIMEOUT_MS);
             }
             catch (exchangeError) {
                 const message = exchangeError instanceof Error ? exchangeError.message : String(exchangeError);
@@ -530,6 +706,7 @@ function registerBrowserLoginCommand(auth, action, name, description, behavior =
         .option('--port <n>', 'Local OAuth callback port', '19800')
         .option('--agent_type <value>', 'Agent type sent to E10 authorize endpoint')
         .option('--agent-type <value>', 'Alias of --agent_type')
+        .option('--agent-return-url <url>', 'Desktop application URL linked by the login success page')
         .action(action(async (ctx, options) => {
         const result = await runBrowserLogin(ctx, options, behavior);
         ctx.output.write(result, { text: formatLoginResult(result) });
@@ -617,6 +794,7 @@ export function registerE10AuthCommands(parent, action) {
     registerBrowserLoginCommand(auth, action, 'login', 'Open browser OAuth2.0 login and save E10 auth');
     registerBrowserLoginCommand(auth, action, 'oidc', 'Alias of auth login for OAuth2.0 browser login');
     registerBrowserLoginCommand(auth, action, 'xiaoe', 'Try XiaoE unified login and explain before browser OAuth fallback', {
+        tryXiaoEUnifiedLogin: true,
         allowXiaoETokenScript: true,
         explainXiaoEFallback: true,
         browserFallback: 'desktop-only',

package/dist/internal/e10/auth/xiaoe.js

@@ -59,13 +59,22 @@ function envString(env, ...keys) {
     }
     return '';
 }
-function hasEnvPrefix(env, prefix) {
-    return Object.keys(env).some((key) => key === prefix || key.startsWith(`${prefix}_`));
-}
 export function hasXiaoEEnv(env = process.env) {
-    // `XIAOE_*` are the platform-injected variables; `WEAVER_XIAOE_*` are this
-    // CLI's own host-integration variables. Either one marks a XiaoE host.
-    return hasEnvPrefix(env, 'XIAOE') || hasEnvPrefix(env, 'WEAVER_XIAOE');
+    // Current-host markers win over WEAVER_AGENT_TYPE, which can be inherited
+    // from a previously saved E10 profile by `weaver-work-cli run`.
+    if (Object.keys(env).some((key) => key.startsWith('WORKBUDDY_') || key.startsWith('CODEX_'))) {
+        return false;
+    }
+    const explicitAgentType = envString(env, 'WORKBUDDY_AGENT_TYPE', 'CODEX_AGENT_TYPE', 'WEAVER_AGENT_TYPE');
+    if (explicitAgentType) {
+        const normalized = explicitAgentType.toLowerCase().replace(/[^a-z0-9\p{Script=Han}]+/gu, '');
+        return ['xiaoe', 'xiaoeclient', '小e', '智能小e'].includes(normalized);
+    }
+    // XiaoE injects this pair into the command process for the current run. A
+    // tokens.py path, client installation, XIAOE_SKILL_* variable, or
+    // WEAVER_XIAOE_* configuration alone is credential availability, not proof
+    // that the current agent is XiaoE.
+    return hasXiaoEPlatformCredential(env);
 }
 export function describeXiaoECredentialSource(source) {
     // Step 1 is the platform-injected credential (XIAOE_USER_TOKEN + XIAOE_DOMAIN):

package/dist/internal/e10/context.js

@@ -1,9 +1,9 @@
 import { CliError, ExitCode } from '../../core/errors.js';
 import { E10AuthSession, getActiveProfile, readProfileConfig } from './auth/session.js';
-import { createXiaoEUnifiedLoginUnavailableError, hasXiaoEEnv, hasXiaoETokenScript, resolveXiaoEPreferredBaseUrl, shouldUseXiaoEBrowserFallback, tryXiaoEUnifiedLogin, } from './auth/xiaoe.js';
+import { createXiaoEUnifiedLoginUnavailableError, hasXiaoEEnv, resolveXiaoEPreferredBaseUrl, shouldUseXiaoEBrowserFallback, tryXiaoEUnifiedLogin, } from './auth/xiaoe.js';
 import { E10ApiClient } from './client.js';
 function shouldPreferXiaoEUnifiedLogin(options, env) {
-    return !options.auth && !options.profile && (hasXiaoEEnv(env) || hasXiaoETokenScript(env));
+    return !options.auth && !options.profile && hasXiaoEEnv(env);
 }
 export async function getE10Session(ctx, load = {}) {
     const options = ctx.getGlobalOptions();
@@ -27,7 +27,7 @@ export async function requireE10Session(ctx, load = {}) {
     const session = await getE10Session(ctx, load);
     if (!session) {
         const options = ctx.getGlobalOptions();
-        if ((hasXiaoEEnv(ctx.env) || hasXiaoETokenScript(ctx.env)) && !shouldUseXiaoEBrowserFallback()) {
+        if (hasXiaoEEnv(ctx.env) && !shouldUseXiaoEBrowserFallback()) {
             const baseUrl = resolveXiaoEPreferredBaseUrl({
                 explicitBaseUrl: options.baseUrl,
                 profileBaseUrl: readProfileConfig(getActiveProfile()).baseUrl,

package/dist/internal/e10/request-runtime.js

@@ -62,7 +62,7 @@ export class E10RequestRuntime {
             const headers = this.composeHeaders(mutable, request.trustedHeaders);
             const init = this.buildFetchInit(mutable, headers);
             const response = await this.fetchWithTimeout(url, init, mutable.timeoutMs);
-            const parsed = await this.readResponse(response, mutable.responseType, mutable.bigIntStrings);
+            const parsed = await this.readResponse(response, mutable.responseType, mutable.bigIntStrings, mutable.maxResponseBytes, mutable.timeoutMs);
             await this.runAfterResponse(mutable, sessionContext, parsed);
             return parsed;
         }
@@ -82,6 +82,8 @@ export class E10RequestRuntime {
             body: request.body,
             form: request.form,
             formData: request.formData,
+            streamBody: request.streamBody,
+            maxResponseBytes: request.maxResponseBytes,
             timeoutMs: request.timeoutMs || DEFAULT_TIMEOUT_MS,
             responseType: request.responseType || 'json',
             bigIntStrings: request.bigIntStrings ?? DEFAULT_BIG_INT_STRINGS,
@@ -156,7 +158,11 @@ export class E10RequestRuntime {
             headers,
             redirect: 'manual',
         };
-        if (request.formData) {
+        if (request.streamBody) {
+            init.body = request.streamBody;
+            init.duplex = 'half';
+        }
+        else if (request.formData) {
             init.body = request.formData;
         }
         else if (request.form !== undefined) {
@@ -192,7 +198,7 @@ export class E10RequestRuntime {
             clearTimeout(timer);
         }
     }
-    async readResponse(response, responseType, bigIntStrings = DEFAULT_BIG_INT_STRINGS) {
+    async readResponse(response, responseType, bigIntStrings = DEFAULT_BIG_INT_STRINGS, maxResponseBytes, timeoutMs = DEFAULT_TIMEOUT_MS) {
         if (responseType === 'binary') {
             return {
                 status: response.status,
@@ -201,7 +207,8 @@ export class E10RequestRuntime {
                 contentType: response.headers.get('content-type') || 'application/octet-stream',
             };
         }
-        const text = await response.text();
+        const text = maxResponseBytes === undefined ? await response.text()
+            : await readBoundedText(response, maxResponseBytes, timeoutMs);
         let value = {};
         let parseError;
         try {
@@ -304,6 +311,40 @@ function withQuery(baseUrl, requestPath, query = {}) {
     }
     return url;
 }
+async function readBoundedText(response, limit, timeoutMs) {
+    if (!response.body)
+        return '';
+    const reader = response.body.getReader();
+    const chunks = [];
+    let size = 0;
+    let expired = false;
+    const timer = setTimeout(() => { expired = true; void reader.cancel().catch(() => undefined); }, timeoutMs);
+    try {
+        while (true) {
+            const next = await reader.read();
+            if (expired)
+                throw new E10ApiError('network', 'timeout', '文件服务响应读取超时', { retryable: false });
+            if (next.done)
+                break;
+            size += next.value.byteLength;
+            if (size > limit) {
+                await reader.cancel().catch(() => undefined);
+                throw new E10ApiError('network', 'response_too_large', '文件服务响应超过大小上限', { retryable: false });
+            }
+            chunks.push(next.value);
+        }
+        return Buffer.concat(chunks, size).toString('utf8');
+    }
+    catch (error) {
+        if (error instanceof E10ApiError)
+            throw error;
+        throw new E10ApiError('network', 'response_read_failed', '文件服务响应读取失败', { retryable: false });
+    }
+    finally {
+        clearTimeout(timer);
+        reader.releaseLock();
+    }
+}
 function sanitizePublicHeaders(headers) {
     const next = { ...headers };
     stripReservedHeaders(next);
@@ -338,6 +379,7 @@ function requestForHook(request) {
         query: { ...request.query },
         headers: { ...request.headers },
         body: cloneForHook(request.body),
+        streamBody: undefined,
     };
 }
 function cloneForHook(value) {

package/dist/shortcuts/caizhilian/file-upload/metadata.js

@@ -0,0 +1,124 @@
+/** Port of weaver-file-upload's local inspection/context contract. Never buffer a complete upload file. */
+import { createHash } from 'node:crypto';
+import { constants } from 'node:fs';
+import { lstat, open, readFile } from 'node:fs/promises';
+import { basename, extname, isAbsolute } from 'node:path';
+import { caizhilianValidationError } from '../errors.js';
+import { assertNoLossyIntegers } from '../operations/shared.js';
+export const RESERVED_CONTEXT_FIELDS = ['sf_request_type', 'compressImg', 'module', 'name', 'size', 'MD5',
+    'lastModified', 'lastModifiedDate', 'preUploadId', 'uploadType', 'uploadShardSize', 'chunk', 'chunks', 'file'];
+const RESERVED = new Set(RESERVED_CONTEXT_FIELDS.map((key) => key.toLowerCase()));
+const PRIVATE_KEYS = /^(cookie|eteamsid|eteams_id|authorization|token|access_token|password|ticket|__proto__|prototype|constructor)$/i;
+const MIME = { txt: 'text/plain', pdf: 'application/pdf', png: 'image/png',
+    jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp',
+    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation' };
+export const READ_FLAGS = constants.O_RDONLY | (process.platform === 'win32' ? 0 : constants.O_NOFOLLOW);
+async function regularFile(value, label) {
+    if (typeof value !== 'string' || !isAbsolute(value) || value.includes('\0')) {
+        throw caizhilianValidationError('file_path_invalid', `${label} 必须是本地文件绝对路径`);
+    }
+    const info = await lstat(value).catch(() => {
+        throw caizhilianValidationError('file_not_found', `${label} 不存在或不可访问`);
+    });
+    if (!info.isFile() || info.isSymbolicLink()) {
+        throw caizhilianValidationError('file_not_regular', `${label} 必须是非符号链接的普通文件`);
+    }
+    if (!Number.isSafeInteger(info.size))
+        throw caizhilianValidationError('file_size_invalid', '文件大小超出支持范围');
+    return { path: value, info };
+}
+export async function inspectUploadFile(value) {
+    const { path, info } = await regularFile(value, 'file_path');
+    const md5 = createHash('md5');
+    const sha256 = createHash('sha256');
+    try {
+        const handle = await open(path, READ_FLAGS);
+        try {
+            for await (const bytes of handle.createReadStream({ autoClose: false })) {
+                md5.update(bytes);
+                sha256.update(bytes);
+            }
+        }
+        finally {
+            await handle.close();
+        }
+    }
+    catch {
+        throw caizhilianValidationError('file_unreadable', '上传文件不可读取');
+    }
+    const after = await lstat(path);
+    if (info.size !== after.size || info.mtimeMs !== after.mtimeMs || info.ctimeMs !== after.ctimeMs
+        || info.ino !== after.ino || after.isSymbolicLink()) {
+        throw caizhilianValidationError('file_changed', '文件在校验过程中发生变化，请重新准备上传');
+    }
+    const extension = extname(path).slice(1).toLowerCase();
+    const mimeType = MIME[extension] ?? 'application/octet-stream';
+    return { path, name: basename(path), extension, mime_type: mimeType, is_image: mimeType.startsWith('image/'),
+        size: info.size, mtime_ms: info.mtimeMs, ctime_ms: info.ctimeMs, inode: info.ino,
+        md5: md5.digest('hex'), sha256: sha256.digest('hex') };
+}
+export function assertUploadSnapshot(file, info) {
+    if (!info.isFile() || info.size !== file.size || info.mtimeMs !== file.mtime_ms
+        || info.ctimeMs !== file.ctime_ms || info.ino !== file.inode) {
+        throw caizhilianValidationError('file_changed', '文件在上传过程中发生变化，请停止并重新准备上传');
+    }
+}
+function validateContext(value, depth = 0) {
+    if (depth > 12)
+        throw caizhilianValidationError('context_invalid', '业务上下文嵌套不能超过 12 层');
+    if (value === null || typeof value !== 'object')
+        return;
+    for (const [key, item] of Object.entries(value)) {
+        if (PRIVATE_KEYS.test(key) || /[\r\n\0]/.test(key) || (depth === 0 && RESERVED.has(key.toLowerCase()))) {
+            throw caizhilianValidationError('context_forbidden_field', '业务上下文包含凭证、危险字段或协议保留字段');
+        }
+        validateContext(item, depth + 1);
+    }
+}
+export async function readUploadContext(value) {
+    let fields = {};
+    if (value !== undefined && value !== '') {
+        const { path, info } = await regularFile(value, 'context_file');
+        if (info.size > 64 * 1024)
+            throw caizhilianValidationError('context_too_large', '业务上下文不能超过 64 KiB');
+        const content = await readFile(path, { flag: READ_FLAGS });
+        if (content.length > 64 * 1024)
+            throw caizhilianValidationError('context_too_large', '业务上下文不能超过 64 KiB');
+        try {
+            fields = JSON.parse(content.toString('utf8'));
+        }
+        catch {
+            throw caizhilianValidationError('context_invalid', 'context_file 必须是合法 JSON 对象');
+        }
+        if (!fields || typeof fields !== 'object' || Array.isArray(fields)) {
+            throw caizhilianValidationError('context_invalid', 'context_file 必须是 JSON 对象');
+        }
+        validateContext(fields);
+        assertNoLossyIntegers(fields, 'context_file');
+    }
+    const keys = Object.keys(fields).sort();
+    const ordered = Object.fromEntries(keys.map((key) => [key, fields[key]]));
+    return { fields: ordered, keys, sha256: createHash('sha256').update(JSON.stringify(ordered)).digest('hex') };
+}
+export function uploadModule(value) {
+    if (typeof value !== 'string' || !/^[A-Za-z0-9_.-]{1,64}$/.test(value)) {
+        throw caizhilianValidationError('module_invalid', 'module 必须来自真实业务上下文，且为 1–64 个字母、数字或 ._-');
+    }
+    return value;
+}
+export function uploadChatId(value) {
+    const id = value ?? 'cli';
+    if (typeof id !== 'string' || !/^[A-Za-z0-9_.-]{1,128}$/.test(id) || id === '.' || id === '..') {
+        throw caizhilianValidationError('chat_id_invalid', 'chat_id 必须为 1–128 个字母、数字或 ._-');
+    }
+    return id;
+}
+export function uploadTimeout(value) {
+    const seconds = value ?? 300;
+    if (typeof seconds !== 'number' || !Number.isInteger(seconds) || seconds < 1 || seconds > 3600) {
+        throw caizhilianValidationError('timeout_invalid', 'timeout_seconds 必须为 1–3600 的整数');
+    }
+    return seconds * 1000;
+}