weaver-work-cli 0.1.5 → 0.1.7

package/README.md

@@ -154,8 +154,9 @@ weaver-work-cli skills install yepiaotong --target-dir "$HOME/.workbuddy/skills"
 ```
 
 如果要让 Agent 根据用户提供的新业务模块文档或代码同步生成/更新业务 CLI 和
-weaver 风格的业务 Skill，在生成后按泛微技能检测工具做静态质检，并在检测
-通过后询问是否安装到当前智能体，可安装 Skill Maker：
+weaver 风格的业务 Skill，每次创建或更新 Skill 后先询问是否现在进行 Skill
+质检，用户确认后通过随包 `weaver-skill-detector-1.0.13` 做静态质检，并在
+检测通过后询问是否安装到当前智能体，可安装 Skill Maker：
 
 ```text
 weaver-work-cli skills install skill-maker
@@ -211,13 +212,17 @@ weaver-work-cli auth login --base-url "https://weapp.xxx.cn"
 weaver-work-cli auth oidc --base-url "https://weapp.xxx.cn"
 ```
 
-在小 E 宿主环境中，`auth login` / `auth oidc` / `auth xiaoe` 会先读取宿主注入的
-`XIAOE_*` 环境变量，匹配当前登录域名对应的统一登录凭证。匹配成功时直接保存登录态，
-并固定使用 `agentType=Xiao.E`；未显式传域名时，会优先使用小 E 环境变量里的首个
-支持域名，其次才使用当前 profile 配置，仍没有支持域名时保留资料包默认域名
-`https://www.e-cology.com.cn`。小 E 凭证校验失败、当前域名不在支持范围内，
-或客户切换了访问域名时，会自动降级到原浏览器 OAuth2.0 登录。业务命令在未显式
-指定 `--auth` / `--profile` 时，也会自动优先尝试小 E 统一登录。也可以显式使用：
+在 XiaoE 宿主环境中，`auth login` / `auth oidc` / `auth xiaoe` 会优先读取宿主
+`xiaoeUserData/tokens.py`；脚本不可用（不存在、执行失败，或所用 Python 缺少
+`requests` 等依赖）时，CLI 会改用内置的原生等价实现读取 XiaoE 客户端本地会话
+（`XiaoE/Robots/*/user_settings.json` 或 `XIAOE_USER_TOKEN`）换取 `eteamId`，
+不依赖本机 Python 环境；仍没有可用凭证时，再读取宿主注入的 `XIAOE_*`
+环境变量，匹配当前登录域名对应的统一登录凭证。匹配成功时直接保存登录态，
+并固定使用 `agentType=XiaoE`；凭证只返回 `eteamId` 时，会使用凭证中的
+域名或资料包默认域名 `https://www.e-cology.com.cn`；仍没有可用凭证时才考虑当前
+profile 配置。XiaoE 凭证校验失败、当前域名不在支持范围内，
+或客户切换了访问域名时，`auth xiaoe` 会先反馈未拿到登录信息的原因，再自动降级到原浏览器 OAuth2.0 登录。业务命令在未显式
+指定 `--auth` / `--profile` 时，也会自动优先尝试 XiaoE 统一登录。也可以显式使用：
 
 ```text
 weaver-work-cli auth xiaoe

package/dist/cmd/skills/index.js

@@ -1,6 +1,8 @@
 import { existsSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { CliError } from '../../core/errors.js';
+import { resolveDetectorInfo } from '../../internal/skills/detector.js';
 import { defaultCodexSkillsRoot, installPackagedSkills } from '../../internal/skills/install.js';
 import { SkillReader } from '../../internal/skills/reader.js';
 const SKILLS_DIR = fileURLToPath(new URL('../../../skills/', import.meta.url));
@@ -16,6 +18,31 @@ function commandOptions(value) {
     const opts = value.opts();
     return opts && typeof opts === 'object' ? opts : {};
 }
+function pythonInvocation(opts) {
+    if (opts.python)
+        return { command: opts.python, args: [] };
+    if (process.platform === 'win32')
+        return { command: 'py', args: ['-3'] };
+    return { command: 'python3', args: [] };
+}
+function detectorArgs(target, opts, globalJson) {
+    const args = [target];
+    if (opts.json || globalJson)
+        args.push('--json');
+    if (opts.noHtml || opts.html === false)
+        args.push('--no-html');
+    if (opts.out)
+        args.push('--out', opts.out);
+    if (typeof opts.html === 'string')
+        args.push('--html', opts.html);
+    if (opts.platform)
+        args.push('--platform', opts.platform);
+    if (opts.marketCatalog)
+        args.push('--market-catalog', opts.marketCatalog);
+    if (opts.marketLive)
+        args.push('--market-live');
+    return args;
+}
 export const skillsCommand = {
     name: 'skills',
     description: 'Read packaged agent skill content',
@@ -68,5 +95,38 @@ export const skillsCommand = {
                 ].join('\n'),
             });
         }));
+        skills.command('validate')
+            .description('Validate a generated skill using the packaged Weaver skill detector')
+            .argument('<target>', 'skill directory, SKILL.md, or skill zip')
+            .option('--detector-dir <path>', 'override detector directory; defaults to the packaged detector')
+            .option('--python <path>', 'Python executable; defaults to python3, or py -3 on Windows')
+            .option('--json', 'ask the detector to print JSON')
+            .option('--no-html', 'disable detector HTML report output')
+            .option('--out <path>', 'write detector markdown report')
+            .option('--html <path>', 'write detector HTML report')
+            .option('--platform <platform>', 'detector platform: weaver or qwenwork')
+            .option('--market-catalog <path>', 'detector market catalog JSON')
+            .option('--market-live', 'enable detector live market checks')
+            .action(action((ctx, target, options) => {
+            if (typeof target !== 'string')
+                throw new CliError('target must be a string');
+            const opts = options && typeof options === 'object' ? options : {};
+            const detector = resolveDetectorInfo(opts.detectorDir);
+            const python = pythonInvocation(opts);
+            const child = spawnSync(python.command, [
+                ...python.args,
+                detector.scriptPath,
+                ...detectorArgs(target, opts, Boolean(ctx.getGlobalOptions().json)),
+            ], { stdio: 'inherit' });
+            if (child.error)
+                throw new CliError(`failed to run Python detector: ${child.error.message}`);
+            if (typeof child.status === 'number') {
+                process.exitCode = child.status;
+                return;
+            }
+            if (child.signal)
+                throw new CliError(`detector terminated by signal: ${child.signal}`);
+            throw new CliError('detector exited without a status code');
+        }));
     },
 };

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

@@ -4,8 +4,8 @@ import { CliError, ExitCode } from '../../../core/errors.js';
 import { clearInvoiceTokenForSession } from '../../../shortcuts/invoice/host.js';
 import { buildE10CookieHeader, E10AuthSession, clearProfileAuthFile, extractRawSetCookie, findAuthFile, getActiveProfile, getProfileAuthPath, getProfileDir, listProfiles, profileNameFromUrl, readProfileConfig, readTeamsCheckUserInfo, saveAuthFile, saveProfileConfig, setActiveProfile, } from './session.js';
 import { getE10AuthRoot } from './paths.js';
-import { XIAOE_AGENT_TYPE, hasXiaoEEnv, resolveXiaoEPreferredBaseUrl, resolveXiaoEUnifiedLoginCredential, } from './xiaoe.js';
-export { DEFAULT_E10_BASE_URL, XIAOE_AGENT_TYPE, hasXiaoEEnv, resolveXiaoEDefaultBaseUrl, resolveXiaoEPreferredBaseUrl, resolveXiaoEUnifiedLoginCredential, } from './xiaoe.js';
+import { XIAOE_AGENT_TYPE, hasXiaoEEnv, resolveXiaoEPreferredBaseUrl, tryXiaoEUnifiedLogin as tryXiaoEUnifiedSessionLogin, } from './xiaoe.js';
+export { DEFAULT_E10_BASE_URL, XIAOE_AGENT_TYPE, hasXiaoEEnv, hasXiaoETokenScript, resolveXiaoEDefaultBaseUrl, resolveXiaoEPreferredBaseUrl, resolveXiaoEUnifiedLoginCredential, } from './xiaoe.js';
 const DEFAULT_AGENT_TYPE = 'weaver-work-cli';
 const EXPLICIT_AGENT_TYPE_ENV_KEYS = [
     'WEAVER_AGENT_TYPE',
@@ -83,8 +83,9 @@ function formatAuthStatus(status) {
     if (!status.loggedIn) {
         return [
             'Not logged in.',
-            'Run: weaver-work-cli auth login --base-url <url> --agent_type <agent_type>',
-            'Or:  weaver-work-cli auth set --eteamsid <id> --base-url <url> --agent_type <agent_type>',
+            'In the XiaoE host, run: weaver-work-cli auth xiaoe',
+            'Otherwise: weaver-work-cli auth login --base-url <url> --agent_type <agent_type>',
+            'Or:        weaver-work-cli auth set --eteamsid <id> --base-url <url> --agent_type <agent_type>',
         ].join('\n');
     }
     const lines = [
@@ -115,6 +116,10 @@ function formatLoginResult(result) {
         'baseUrl: ' + result.baseUrl,
         'profile: ' + result.profile,
         'authFile: ' + result.authFile,
+        ...(result.loginSource ? ['loginSource: ' + result.loginSource] : []),
+        ...(result.credentialSourceStep ? ['credentialSourceStep: ' + result.credentialSourceStep] : []),
+        ...(result.credentialSourceType ? ['credentialSourceType: ' + result.credentialSourceType] : []),
+        ...(result.credentialSourceLabel ? ['credentialSourceLabel: ' + result.credentialSourceLabel] : []),
     ].join('\n');
 }
 async function clearInvoiceTokenCache(profile, authData) {
@@ -155,6 +160,9 @@ function esc(value) {
         .replace(/"/g, '&quot;')
         .replace(/'/g, '&#39;');
 }
+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 resolveBrowserOpenCommand(url, platform = process.platform) {
     if (platform === 'win32') {
         return { file: 'rundll32.exe', args: ['url.dll,FileProtocolHandler', url] };
@@ -243,26 +251,16 @@ async function saveEteamsIdLogin(input) {
         version: input.version || '',
     };
 }
-async function tryXiaoEUnifiedLogin(ctx, baseUrl, tenantKeyFallback, profileHint) {
-    const credential = resolveXiaoEUnifiedLoginCredential(baseUrl, ctx.env);
-    if (!credential)
-        return null;
-    ctx.logger.info('Detected XiaoE unified login for this E10 domain. Trying XiaoE auth...');
-    try {
-        return await saveEteamsIdLogin({
-            baseUrl,
-            passportUrl: baseUrl,
-            eteamsId: credential.eteamsId,
-            tenantKeyFallback,
-            agentType: XIAOE_AGENT_TYPE,
-            profileHint,
-        });
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        ctx.logger.warn('XiaoE unified login failed; falling back to browser OAuth. ' + message);
-        return null;
-    }
+async function tryXiaoEUnifiedLogin(ctx, baseUrl, tenantKeyFallback, profileHint, allowTokenScript = false) {
+    const login = await tryXiaoEUnifiedSessionLogin({
+        env: ctx.env,
+        baseUrl,
+        tenantKeyFallback,
+        profileHint,
+        allowTokenScript,
+        logger: ctx.logger,
+    });
+    return login?.result || null;
 }
 async function oidcExchange(code, redirectUri, baseUrl, tenantKeyFallback, agentTypeFallback, profileHint) {
     const base = normalizeUrl(baseUrl);
@@ -358,7 +356,15 @@ async function oidcExchange(code, redirectUri, baseUrl, tenantKeyFallback, agent
         version,
     };
 }
-async function runBrowserLogin(ctx, options) {
+function xiaoEUnifiedLoginUnavailableMessage(baseUrl) {
+    return [
+        '未获取到可用的 XiaoE 统一登录信息，准备降级打开网页登录。',
+        baseUrl ? `当前 E10 baseUrl: ${baseUrl}。` : '未从 XiaoE 凭证中解析到 E10 baseUrl。',
+        'CLI 已依次尝试宿主 xiaoeUserData/tokens.py、内置 XiaoE 客户端凭证（XiaoE/Robots/*/user_settings.json）和 XIAOE_* 环境变量。',
+        "若脚本存在但报 No module named 'requests'，请为脚本使用的 Python 安装 requests，或用 XIAOE_TOKEN_SCRIPT_PYTHON 指定一个自带 requests 的解释器。",
+    ].join(' ');
+}
+async function runBrowserLogin(ctx, options, behavior = {}) {
     const commandOpts = asOptions(options);
     const globalOptions = ctx.getGlobalOptions();
     const profileFromGlobal = globalOptions.profile;
@@ -374,14 +380,17 @@ async function runBrowserLogin(ctx, options) {
     const port = Number.parseInt(portText, 10);
     const explicitAgentType = optionString(commandOpts, 'agentType', 'agent_type');
     const agentType = resolveAgentType(commandOpts, ctx.env);
-    if (!baseUrl)
-        throw new CliError('Missing --base-url', ExitCode.UsageError);
     if (!Number.isInteger(port) || port <= 0 || port > 65535) {
         throw new CliError('Invalid --port value', ExitCode.UsageError);
     }
-    const xiaoEResult = await tryXiaoEUnifiedLogin(ctx, baseUrl, tenantKey, profileFromGlobal);
+    const xiaoEResult = await tryXiaoEUnifiedLogin(ctx, explicitBaseUrl, tenantKey, profileFromGlobal, behavior.allowXiaoETokenScript === true);
     if (xiaoEResult)
         return xiaoEResult;
+    if (behavior.explainXiaoEFallback) {
+        ctx.logger.warn(xiaoEUnifiedLoginUnavailableMessage(baseUrl));
+    }
+    if (!baseUrl)
+        throw new CliError('Missing --base-url', ExitCode.UsageError);
     const redirectUri = `http://127.0.0.1:${port}/callback`;
     const loginUrl = buildE10AuthorizeUrl(baseUrl, redirectUri, agentType);
     ctx.logger.info('Open browser login: ' + loginUrl);
@@ -438,7 +447,7 @@ async function runBrowserLogin(ctx, options) {
             try {
                 const result = await oidcExchange(code, redirectUri, baseUrl, tenantKey, redirectAgentType, profileFromGlobal);
                 res.writeHead(200, { 'content-type': 'text/html; charset=utf-8' });
-                res.end(`<!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 login</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">Login completed</div><div class="desc">You can close this page and return to the terminal.</div><div class="user">${esc(result.userId)}</div></main></body></html>`);
+                res.end(renderE10LoginSuccessPage(result.userId));
                 finish(null, result);
             }
             catch (exchangeError) {
@@ -499,7 +508,7 @@ function formatWhoami(title, data) {
         'User-Agent: ' + (data.userAgent || ''),
     ].join('\n');
 }
-function registerBrowserLoginCommand(auth, action, name, description) {
+function registerBrowserLoginCommand(auth, action, name, description, behavior = {}) {
     auth.command(name)
         .description(description)
         .option('--base-url <url>', 'E10 base URL')
@@ -508,7 +517,7 @@ function registerBrowserLoginCommand(auth, action, name, description) {
         .option('--agent_type <value>', 'Agent type sent to E10 authorize endpoint')
         .option('--agent-type <value>', 'Alias of --agent_type')
         .action(action(async (ctx, options) => {
-        const result = await runBrowserLogin(ctx, options);
+        const result = await runBrowserLogin(ctx, options, behavior);
         ctx.output.write(result, { text: formatLoginResult(result) });
     }));
 }
@@ -545,6 +554,10 @@ export function registerE10AuthCommands(parent, action) {
                 profile: opts.profile || getActiveProfile(),
                 authFile,
                 hasEteamsId: Boolean(session.eteamsId),
+                ...(session.loginSource ? { loginSource: session.loginSource } : {}),
+                ...(session.credentialSourceStep ? { credentialSourceStep: session.credentialSourceStep } : {}),
+                ...(session.credentialSourceType ? { credentialSourceType: session.credentialSourceType } : {}),
+                ...(session.credentialSourceLabel ? { credentialSourceLabel: session.credentialSourceLabel } : {}),
                 valid,
             }
             : {
@@ -589,7 +602,10 @@ 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 before browser OAuth2.0 login');
+    registerBrowserLoginCommand(auth, action, 'xiaoe', 'Try XiaoE unified login and explain before browser OAuth fallback', {
+        allowXiaoETokenScript: true,
+        explainXiaoEFallback: true,
+    });
     auth.command('logout')
         .alias('clear')
         .description('Clear saved E10 auth for the current or selected profile')

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

@@ -87,11 +87,33 @@ export function getProfileConfigPath(name) {
 export function getActiveConfigPath() {
     return getProfileConfigPath(getActiveProfile());
 }
+const MULTI_LABEL_PUBLIC_SUFFIXES = new Set([
+    'com.cn', 'net.cn', 'org.cn', 'gov.cn', 'edu.cn', 'ac.cn',
+    'com.hk', 'net.hk', 'org.hk', 'edu.hk', 'gov.hk',
+    'com.tw', 'net.tw', 'org.tw', 'edu.tw', 'gov.tw',
+    'com.mo', 'net.mo', 'org.mo', 'edu.mo', 'gov.mo',
+    'co.uk', 'org.uk', 'me.uk', 'ac.uk', 'gov.uk',
+    'co.jp', 'ne.jp', 'or.jp', 'ac.jp', 'go.jp',
+    'com.au', 'net.au', 'org.au', 'co.nz', 'net.nz',
+    'com.sg', 'com.my', 'com.br', 'com.mx', 'com.tr',
+]);
 export function profileNameFromUrl(baseUrl) {
     try {
-        const host = new URL(baseUrl).hostname;
-        const parts = host.split('.');
-        return parts.length >= 2 ? parts[parts.length - 2] : host;
+        const host = new URL(baseUrl).hostname.toLowerCase();
+        if (!host)
+            return 'default';
+        // An IPv4 host has no registrable label, so keep it intact for uniqueness.
+        if (/^(\d{1,3}\.){3}\d{1,3}$/u.test(host))
+            return host.replace(/[^0-9a-z]+/gu, '-');
+        const parts = host.split('.').filter(Boolean);
+        if (parts.length <= 1)
+            return parts[0] || 'default';
+        // `*.com.cn` style hosts must skip the two-label suffix, otherwise every
+        // such tenant collapses onto the same profile name (e.g. "com").
+        const hasMultiLabelSuffix = parts.length >= 3
+            && MULTI_LABEL_PUBLIC_SUFFIXES.has(parts.slice(-2).join('.'));
+        const index = hasMultiLabelSuffix ? parts.length - 3 : parts.length - 2;
+        return parts[index] || parts[0] || 'default';
     }
     catch {
         return 'default';
@@ -243,6 +265,18 @@ export class E10AuthSession {
     get version() {
         return this.data.version || this.data.baselineVersion || '';
     }
+    get loginSource() {
+        return this.data.loginSource || '';
+    }
+    get credentialSourceStep() {
+        return this.data.credentialSourceStep;
+    }
+    get credentialSourceType() {
+        return this.data.credentialSourceType || '';
+    }
+    get credentialSourceLabel() {
+        return this.data.credentialSourceLabel || '';
+    }
     getBaseUrl() {
         return (this.data.baseUrl || '').replace(/\/$/, '');
     }
@@ -257,6 +291,12 @@ export class E10AuthSession {
         return this.agentType ? `AgentType=${this.agentType},IsAgent=true` : 'weaver-work-cli';
     }
     toJSON() {
+        const sourceInfo = {
+            ...(this.loginSource ? { loginSource: this.loginSource } : {}),
+            ...(this.credentialSourceStep ? { credentialSourceStep: this.credentialSourceStep } : {}),
+            ...(this.credentialSourceType ? { credentialSourceType: this.credentialSourceType } : {}),
+            ...(this.credentialSourceLabel ? { credentialSourceLabel: this.credentialSourceLabel } : {}),
+        };
         return {
             userId: this.userId,
             tenantKey: this.tenantKey,
@@ -272,6 +312,7 @@ export class E10AuthSession {
             redirectUrl: this.data.redirectUrl,
             cookieSavedAt: this.data.cookieSavedAt,
             mainUrl: this.data.mainUrl,
+            ...sourceInfo,
             hasEteamsId: Boolean(this.eteamsId),
         };
     }