@dreamor/atlas-cli 0.7.9 → 0.7.11

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

@@ -1,15 +1,13 @@
 import { createClient } from '../../http/client.js';
 import { isJsonMode, jsonOk, log } from '../../util/output.js';
 import { enforceOutputLimit } from '../../util/output-limit.js';
-import { ConfigError, SessionExpiredError } from '../../util/errors.js';
-import { expandMonths } from '../../util/months.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 { resolveProjectId } from '../../util/env.js';
 function getProjectId(opts) {
-    const pid = opts.projectId ?? process.env.BANMA_PROJECT_ID ?? '';
-    if (!pid)
-        throw new ConfigError('请指定 --project-id 或设置 BANMA_PROJECT_ID 环境变量');
-    return pid;
+    return resolveProjectId(opts.projectId);
 }
 async function fetchActual(pid, month) {
     const client = createClient();
@@ -18,7 +16,7 @@ async function fetchActual(pid, month) {
 }
 export async function showCmd(staffId, opts) {
     const pid = getProjectId(opts);
-    const m = opts.month ?? expandMonths()[0];
+    const m = opts.month ?? expandMonthsDefault()[0];
     const data = await fetchActual(pid, m);
     const filtered = filterByStaff(data, staffId);
     if (opts.json || isJsonMode()) {
@@ -35,7 +33,8 @@ export async function showCmd(staffId, opts) {
 }
 export async function monthCmd(opts) {
     const pid = getProjectId(opts);
-    const months = opts.month ? [opts.month] : expandMonths(opts.from, opts.to);
+    // 不传月份时默认最近 12 个月，与 baseline month 行为一致
+    const months = opts.month ? [opts.month] : (opts.from || opts.to ? expandMonths(opts.from, opts.to) : expandMonthsDefault());
     const all = [];
     const failedMonths = [];
     for (const m of months) {
@@ -64,7 +63,7 @@ export async function monthCmd(opts) {
 }
 export async function summaryCmd(opts) {
     const pid = getProjectId(opts);
-    const months = opts.month ? [opts.month] : expandMonths(opts.from, opts.to);
+    const months = opts.month ? [opts.month] : (opts.from || opts.to ? expandMonths(opts.from, opts.to) : expandMonthsDefault());
     const all = [];
     const failedMonths = [];
     for (const m of months) {

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

@@ -1,15 +1,16 @@
 import { createClient } from '../../http/client.js';
 import { isJsonMode, jsonOk, log } from '../../util/output.js';
 import { enforceOutputLimit } from '../../util/output-limit.js';
-import { ConfigError } from '../../util/errors.js';
 import { expandMonths } from '../../util/months.js';
 import { monthTsToKey } from '../../util/time.js';
 import { resolveSecureExportPath, secureWriteFile } from '../../util/secure-fs.js';
+import { resolveProjectId, resolveProjectInfo } from '../../util/env.js';
+function getProjectDisplay(opts) {
+    const info = resolveProjectInfo(opts.projectId);
+    return info.name ?? info.id;
+}
 function getProjectId(opts) {
-    const pid = opts.projectId ?? process.env.BANMA_PROJECT_ID ?? '';
-    if (!pid)
-        throw new ConfigError('请指定 --project-id 或设置 BANMA_PROJECT_ID 环境变量');
-    return pid;
+    return resolveProjectId(opts.projectId);
 }
 /**
  * 月基线 API 返回 data 为数组，每项含 linePlanMonthDetailList
@@ -57,7 +58,7 @@ export async function monthCmd(opts) {
         jsonOk({ projectId: pid, months: monthKeys, entries: allDetails, totalManpower: Math.round(total * 100) / 100 });
         return;
     }
-    log(`项目 ${pid} 基线人力:`);
+    log(`项目 ${getProjectDisplay(opts)} 基线人力:`);
     for (const m of monthKeys) {
         log(`  ${m}: ${(byMonth.get(m) ?? 0).toFixed(2)} 人月`);
     }

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

@@ -4,11 +4,9 @@ import { ConfigError, SessionExpiredError } from '../../util/errors.js';
 import { expandMonths } from '../../util/months.js';
 import { monthTsToKey } from '../../util/time.js';
 import { groupByAxis, mergeBaselineActual, } from './_logic.js';
+import { resolveProjectId, resolveProjectInfo } from '../../util/env.js';
 function getProjectId(opts) {
-    const pid = opts.projectId ?? process.env.BANMA_PROJECT_ID ?? '';
-    if (!pid)
-        throw new ConfigError('请指定 --project-id 或设置 BANMA_PROJECT_ID 环境变量');
-    return pid;
+    return resolveProjectId(opts.projectId);
 }
 export async function compareCmd(opts) {
     const pid = getProjectId(opts);
@@ -63,7 +61,8 @@ export async function compareCmd(opts) {
         jsonOk({ rows }, { failedMonths });
         return;
     }
-    log(`项目 ${pid} 对比:${axis === 'month' ? '按月份' : axis === 'department' ? '按部门' : '按角色'}`);
+    const pinfo = resolveProjectInfo(opts.projectId);
+    log(`项目 ${pinfo.name ?? pid} 对比:${axis === 'month' ? '按月份' : axis === 'department' ? '按部门' : '按角色'}`);
     for (const r of rows) {
         const flag = opts.flagOverrun && r.actualManpower > r.baselineManpower ? ' ⚠️' : '';
         log(`  ${String(r[axis])}: 基线 ${r.baselineManpower} / 实际 ${r.actualManpower} / 差异 ${r.diff > 0 ? '+' : ''}${r.diff}${flag}`);

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

@@ -1,7 +1,55 @@
+import { readFileSync, existsSync } from 'fs';
+import { getLinkFile } from './paths.js';
+import { ConfigError } from './errors.js';
 /** 获取 BANMA_PROJECT_ID 环境变量 */
 export function getBanmaProjectId() {
     return process.env.BANMA_PROJECT_ID;
 }
+/**
+ * 解析项目 ID，优先级：
+ * 1. 命令行 --project-id 参数
+ * 2. BANMA_PROJECT_ID 环境变量
+ * 3. ~/.atlas/link.json（atlas link 绑定的项目）
+ */
+export function resolveProjectId(cliProjectId) {
+    if (cliProjectId)
+        return cliProjectId;
+    if (process.env.BANMA_PROJECT_ID)
+        return process.env.BANMA_PROJECT_ID;
+    try {
+        const linkFile = getLinkFile();
+        if (existsSync(linkFile)) {
+            const link = JSON.parse(readFileSync(linkFile, 'utf-8'));
+            if (link.projectId)
+                return link.projectId;
+        }
+    }
+    catch {
+        // ignore
+    }
+    throw new ConfigError('请指定 --project-id、设置 BANMA_PROJECT_ID、或先用 atlas link <project> 绑定项目');
+}
+/**
+ * 解析项目信息（ID + 名称），优先级同上。名称仅从 link 文件获取。
+ */
+export function resolveProjectInfo(cliProjectId) {
+    if (cliProjectId)
+        return { id: cliProjectId };
+    if (process.env.BANMA_PROJECT_ID)
+        return { id: process.env.BANMA_PROJECT_ID };
+    try {
+        const linkFile = getLinkFile();
+        if (existsSync(linkFile)) {
+            const link = JSON.parse(readFileSync(linkFile, 'utf-8'));
+            if (link.projectId)
+                return { id: link.projectId, name: link.projectName };
+        }
+    }
+    catch {
+        // ignore
+    }
+    throw new ConfigError('请指定 --project-id、设置 BANMA_PROJECT_ID、或先用 atlas link <project> 绑定项目');
+}
 /** 是否禁用自动升级 */
 export function isUpdateDisabled() {
     return process.env.ATLAS_DISABLE_UPDATE === '1';

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

@@ -39,3 +39,27 @@ export function expandMonths(from, to) {
     }
     return months;
 }
+/**
+ * 不传月份时的默认范围：当前月及前后各 12 个月（最多 25 个月，低于 MAX_MONTHS）。
+ * 使 actual month 无参数时与 baseline month 行为一致。
+ */
+export function expandMonthsDefault() {
+    const now = new Date();
+    const cy = now.getFullYear();
+    const cm = now.getMonth() + 1;
+    // 12 个月前
+    let fy = cy, fm = cm - 12;
+    while (fm < 1) {
+        fm += 12;
+        fy--;
+    }
+    // 12 个月后
+    let ty = cy, tm = cm + 12;
+    while (tm > 12) {
+        tm -= 12;
+        ty++;
+    }
+    const from = `${fy}-${String(fm).padStart(2, '0')}`;
+    const to = `${ty}-${String(tm).padStart(2, '0')}`;
+    return expandMonths(from, to);
+}

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

@@ -1 +1 @@
-export const ATLAS_VERSION = '0.7.9';
+export const ATLAS_VERSION = '0.7.11';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamor/atlas-cli",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "description": "Atlas CLI - 斑马云图人力基线管理工具",
   "type": "module",
   "bin": {