@dreamor/atlas-cli 0.7.15 → 0.7.17

package/dist/adapters/atlas/cli.js

@@ -16,7 +16,7 @@ import { schemaCommandsCmd } from './commands/schema.js';
 import { execCmd } from './commands/exec.js';
 import { suggestCmd } from './commands/suggest.js';
 import { updateCmd } from './commands/update.js';
-import { BanmaApiError, ConfigError, NotImplementedError, OutputTooLargeError, SessionExpiredError, isAtlasError, } from './util/errors.js';
+import { BanmaApiError, ConfigError, OutputTooLargeError, SessionExpiredError, isAtlasError, } from './util/errors.js';
 import { isJsonMode, printError } from './util/output.js';
 import { getOutputSchema } from './commands/_output_schema.js';
 export function handleError(err) {
@@ -36,10 +36,6 @@ export function handleError(err) {
         console.error(`Banma API error [${err.errCode}] ${err.errorMsg}`);
         process.exit(3);
     }
-    if (err instanceof NotImplementedError) {
-        console.error(err.message);
-        process.exit(64);
-    }
     if (err instanceof OutputTooLargeError) {
         const debug = process.env.DEBUG === '1';
         console.error(debug ? err.stack ?? err.message : err.message);
@@ -56,8 +52,6 @@ export function exitCodeFor(err) {
         return 3;
     if (err instanceof OutputTooLargeError)
         return 65;
-    if (err instanceof NotImplementedError)
-        return 64;
     if (isAtlasError(err)) {
         switch (err.code) {
             case 'AMBIGUOUS_PROJECT': return 4;
@@ -476,7 +470,7 @@ export function buildProgram() {
    6  API 限流（RateLimited）
    7  网络错误（NetworkError）
    8  版本更新异常（UpdateError）
-  64  配置错误 / 未实现（ConfigError / NotImplementedError）
+  64  配置错误（ConfigError）
   65  输出超限（OutputTooLargeError）
 `)
         .showHelpAfterError()

package/dist/adapters/atlas/commands/actual/_logic.js

@@ -39,3 +39,43 @@ export function aggregateByAxis(rows, axis) {
 export function filterByStaff(entries, staffId) {
     return entries.filter((p) => p.staffId === staffId || p.staffName?.includes(staffId));
 }
+/**
+ * 走查 summaryByTeam 返回的树结构，提取指定项目的实际工时条目。
+ *
+ * 树中同一员工可能出现在 manager 层（汇总下属）和 leaf 层（个人），
+ * 采取走最深层的策略：越深的节点 detail 越精确。
+ */
+export function flattenTree(nodes, targetPid) {
+    const byStaffId = new Map();
+    function walk(items, depth) {
+        for (const raw of items ?? []) {
+            const node = raw;
+            const details = (node.detail ?? []);
+            let projectManpower = 0;
+            for (const d of details) {
+                if (String(d.projectId) === targetPid) {
+                    projectManpower += Number(d.manpower ?? 0);
+                }
+            }
+            if (projectManpower > 0) {
+                const sid = String(node.staffId ?? '');
+                const existing = byStaffId.get(sid);
+                if (!existing || depth > existing.depth) {
+                    byStaffId.set(sid, {
+                        depth,
+                        entry: {
+                            staffId: sid,
+                            staffName: String(node.realname ?? ''),
+                            manpower: Math.round(projectManpower * 100) / 100,
+                            departmentName: String(node.department ?? ''),
+                            role: String(node.role ?? ''),
+                        },
+                    });
+                }
+            }
+            walk(node.children, depth + 1);
+        }
+    }
+    walk(nodes, 0);
+    return [...byStaffId.values()].map((v) => v.entry);
+}

package/dist/adapters/atlas/commands/actual/index.js

@@ -4,15 +4,25 @@ import { enforceOutputLimit } from '../../util/output-limit.js';
 import { SessionExpiredError } from '../../util/errors.js';
 import { expandMonths, expandMonthsDefault } from '../../util/months.js';
 import { resolveSecureExportPath, secureWriteFile } from '../../util/secure-fs.js';
-import { annotateWithMonth, aggregateByAxis, filterByStaff, } from './_logic.js';
+import { annotateWithMonth, aggregateByAxis, filterByStaff, flattenTree, } from './_logic.js';
 import { resolveProjectId } from '../../util/env.js';
+import { readBanmaIdentity } from '../../auth/session.js';
 function getProjectId(opts) {
     return resolveProjectId(opts.projectId);
 }
 async function fetchActual(pid, month) {
     const client = createClient();
-    const data = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', { projectId: pid, month });
-    return data ?? [];
+    const identity = await readBanmaIdentity();
+    const loginStaffId = identity?.staffId ?? '';
+    // B4: summaryByTeam 请求体需用 projectIds 数组 + 额外字段
+    // 使用 projectIds 时 detail 只返回该项目的数据
+    const raw = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', { month, staffIds: [], projectIds: [pid], isConfirm: false, loginStaffId });
+    const tree = (Array.isArray(raw) ? raw : []);
+    // 根节点为当前用户，children 为团队成员
+    if (tree.length > 0 && tree[0].children) {
+        return flattenTree(tree[0].children, pid);
+    }
+    return [];
 }
 export async function showCmd(staffId, opts) {
     const pid = getProjectId(opts);

package/dist/adapters/atlas/commands/compare/index.js

@@ -5,6 +5,8 @@ import { expandMonths, expandMonthsDefault } from '../../util/months.js';
 import { monthTsToKey } from '../../util/time.js';
 import { groupByAxis, mergeBaselineActual, } from './_logic.js';
 import { resolveProjectId, resolveProjectInfo } from '../../util/env.js';
+import { readBanmaIdentity } from '../../auth/session.js';
+import { flattenTree as flattenActualTree } from '../actual/_logic.js';
 function getProjectId(opts) {
     return resolveProjectId(opts.projectId);
 }
@@ -38,9 +40,21 @@ export async function compareCmd(opts) {
         }
         // 指数退避：避免连续触发限流（B2）
         try {
-            const acData = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', { projectId: pid, month: m });
-            for (const p of acData ?? []) {
-                allAc.push({ month: m, manpower: p.manpower ?? 0, role: p.role, departmentName: p.departmentName });
+            const identity = await readBanmaIdentity();
+            const loginStaffId = identity?.staffId ?? '';
+            const raw = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', {
+                month: m, staffIds: [], projectIds: [pid], isConfirm: false, loginStaffId,
+            });
+            const tree = (Array.isArray(raw) ? raw : []);
+            const results = [];
+            if (tree.length > 0 && tree[0].children) {
+                const entries = flattenActualTree(tree[0].children, pid);
+                for (const p of entries) {
+                    results.push({ month: m, manpower: p.manpower ?? 0, role: p.role, departmentName: p.departmentName });
+                }
+            }
+            for (const ac of results) {
+                allAc.push(ac);
             }
         }
         catch (e) {

package/dist/adapters/atlas/commands/project/index.js

@@ -71,6 +71,36 @@ export async function findCmd(kind, query, opts) {
         results = projects
             .filter((p) => getProjectId(p).includes(query) || getProjectName(p).includes(query))
             .map((p) => ({ id: getProjectId(p), name: getProjectName(p), kind: 'project' }));
+        // B4 兜底：权限列表搜不到时尝试按 ID 或名称直接查项目
+        // 部分项目（如 status=2）不会出现在 selectHasPermisValidProject 中，
+        // 但 queryProjById / queryProjList 可返回完整信息
+        if (results.length === 0) {
+            // 兜底一：按 ID 查项目详情
+            try {
+                const detail = await client.get('/yuntu-service/projApi/queryProjById.json', { projId: query });
+                if (detail?.projInfo?.id && detail?.projInfo?.projName) {
+                    results = [{ id: String(detail.projInfo.id), name: detail.projInfo.projName, kind: 'project' }];
+                }
+            }
+            catch {
+                // 静默忽略
+            }
+            // 兜底二：按名称模糊搜索项目列表
+            if (results.length === 0) {
+                try {
+                    const list = await client.get('/yuntu-service/projApi/queryProjList.json', { projName: query, staffId: '' });
+                    if (Array.isArray(list)) {
+                        results = list
+                            .filter((p) => p.id && p.projName)
+                            .slice(0, parseInt(opts.limit ?? '20', 10))
+                            .map((p) => ({ id: String(p.id), name: p.projName, kind: 'project' }));
+                    }
+                }
+                catch {
+                    // 静默忽略
+                }
+            }
+        }
     }
     else if (kind === 'department') {
         const data = await client.post('/yuntu-service/department/tree/select.json', {});

package/dist/adapters/atlas/http/client.js

@@ -63,6 +63,31 @@ export class HttpClient {
         }
         return headers;
     }
+    /**
+     * GET 请求。
+     *
+     * query 参数以键值对形式传入，自动拼接到 URL 查询字符串。
+     * 可传可选 schema（ZodSchema），在 API 返回后对 json.data 做运行时校验。
+     */
+    async get(path, query, schema) {
+        // A4: 校验 path 必须以 / 开头，防止 http://evil.example/x 绕过 baseUrl
+        if (!path.startsWith('/'))
+            throw new AtlasError('path must be relative (start with /)', 'CONFIG_ERROR');
+        const url = new URL(path, this.baseUrl + '/');
+        if (query) {
+            Object.entries(query).forEach(([k, v]) => url.searchParams.set(k, v));
+        }
+        if (url.origin !== this.baseOrigin)
+            throw new AtlasError('origin mismatch — possible SSRF', 'CONFIG_ERROR');
+        const headers = await this.buildHeaders();
+        const response = await request(url.toString(), {
+            method: 'GET',
+            headers,
+            headersTimeout: this.timeout,
+            bodyTimeout: this.timeout,
+        });
+        return this.parseResponse(response, schema);
+    }
     /**
      * POST 请求。
      *

package/dist/adapters/atlas/util/errors.js

@@ -23,12 +23,6 @@ export class SessionExpiredError extends Error {
         this.name = 'SessionExpiredError';
     }
 }
-export class NotImplementedError extends Error {
-    constructor(message = '该功能尚未实现') {
-        super(message);
-        this.name = 'NotImplementedError';
-    }
-}
 export class OutputTooLargeError extends Error {
     bytes;
     limit;

package/dist/adapters/atlas/util/output.js

@@ -1,4 +1,4 @@
-import { BanmaApiError, AtlasError, ConfigError, NotImplementedError, OutputTooLargeError, SessionExpiredError } from './errors.js';
+import { BanmaApiError, AtlasError, ConfigError, OutputTooLargeError, SessionExpiredError } from './errors.js';
 export function isJsonMode() {
     return process.env.ATLAS_OUTPUT === 'json';
 }
@@ -44,9 +44,6 @@ export function printError(err, opts) {
     else if (err instanceof ConfigError) {
         console.error(`Config error: ${err.message}`);
     }
-    else if (err instanceof NotImplementedError) {
-        console.error(err.message);
-    }
     else if (err instanceof OutputTooLargeError) {
         console.error(err.message);
     }

package/dist/adapters/atlas/util/version.js

@@ -1 +1 @@
-export const ATLAS_VERSION = '0.7.15';
+export const ATLAS_VERSION = '0.7.17';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamor/atlas-cli",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "description": "Atlas CLI - 斑马云图人力基线管理工具",
   "type": "module",
   "bin": {
@@ -31,7 +31,8 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "verify": "node ./dist/adapters/atlas/cli.js --help",
-    "auth:login": "node --import tsx ./adapters/atlas/cli.ts auth login"
+    "auth:login": "node --import tsx ./adapters/atlas/cli.ts auth login",
+    "generate-skill-docs": "node scripts/generate-skill-docs.mjs"
   },
   "dependencies": {
     "commander": "^14.0.3",