@stelfield/cli 0.12.2 → 0.12.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelfield/cli",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "Stelfield 平台命令行工具——让任何能执行 shell 命令的 Agent 用一条命令接入 Stelfield：登录、发单接单、管理能力。",
   "type": "module",
   "bin": {

package/src/api.js

@@ -240,7 +240,7 @@ async function authedRequestWithRefresh(baseUrl, credOpts, httpOpts, makeRequest
 
   // ── 命中 401：触发 refresh ────────────────────────────────
   // 用凭证目录作 key 实现 profile 隔离（不同目录各自独立 refresh）
-  const credDir = credOpts.dir || process.env.STELFIELD_CONFIG_DIR || (await import('node:os')).homedir() + '/' + BRAND.configDirName;
+  const credDir = credOpts.dir || (await import('./profile.js')).configRootFromEnv();
 
   const newTokens = await refreshWithDedup(credDir, baseUrl, creds.refresh_token, fetchImpl);
 

package/src/credentials.js

@@ -18,7 +18,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { atomicWriteFile } from './atomic-write.js';
-import { resolveCredDir, resolveLegacyCredDir } from './profile.js';
+import { resolveCredDir } from './profile.js';
 
 /**
  * 凭证目录解析（三级优先级）。
@@ -60,9 +60,7 @@ export function loadCredentials(opts = {}) {
   try {
     raw = fs.readFileSync(file, 'utf8');
   } catch {
-    // Upgrade from the old `linger` command: no login here yet, but the same Agent may still be logged in under the
-    // old folder. Copy it over once (the old folder is left untouched) so the owner does not have to bind again.
-    return migrateLegacyCredentials(opts);
+    return null; // 文件不存在 / 读不了 → 未登录
   }
   try {
     return JSON.parse(raw);
@@ -71,24 +69,3 @@ export function loadCredentials(opts = {}) {
   }
 }
 
-/**
- * One-time carry-over of a pre-rename login. Skipped when the caller pins an explicit directory (tests) so unit
- * tests never touch the real home folder. Returns the credentials, or null when there is nothing to carry over.
- */
-function migrateLegacyCredentials(opts = {}) {
-  if (opts.dir) return null;
-  try {
-    const legacyFile = path.join(resolveLegacyCredDir({ profile: opts.profile }), 'credentials');
-    const creds = JSON.parse(fs.readFileSync(legacyFile, 'utf8'));
-    if (!creds || !creds.refresh_token) return null;
-    saveCredentials(creds, opts);
-    // The poll cursor goes along, so the first poll does not replay events the Agent already handled.
-    try {
-      const cur = fs.readFileSync(path.join(path.dirname(legacyFile), 'poll-cursor'), 'utf8');
-      atomicWriteFile(path.join(path.dirname(credentialsPath(opts)), 'poll-cursor'), cur, 0o600);
-    } catch { /* no cursor yet */ }
-    return creds;
-  } catch {
-    return null; // nothing to carry over, or unreadable: behave as not logged in
-  }
-}

package/src/index.js

@@ -12,7 +12,7 @@ import { parseArgs } from './cli-parse.js';
 import { buildAskQuestions, buildAnswers } from './collab-input.js';
 import { RETIRED_COMMANDS } from './retired-commands.js';
 import { resolveBaseUrl } from './config.js';
-import { defaultRootDir, isValidProfileName, profileDir, resolveCredDir } from './profile.js';
+import { configRootFromEnv, defaultRootDir, isValidProfileName, profileDir, resolveCredDir } from './profile.js';
 import { loadCredentials } from './credentials.js';
 import { runAuthLogin } from './oauth.js';
 import { runConnect } from './connect.js';
@@ -656,7 +656,7 @@ export async function run(argv, deps = {}) {
         );
         return 2;
       }
-      profileDirPath = profileDir(flags.profile, { rootDir: env.STELFIELD_CONFIG_DIR || defaultRootDir() });
+      profileDirPath = profileDir(flags.profile, { rootDir: configRootFromEnv(env) });
     }
 
     if (command === 'auth:login') {

package/src/profile.js

@@ -13,11 +13,28 @@
 // profile 名限 [A-Za-z0-9._-]{1,32}，防止拼出目录穿越路径。
 
 import os from 'node:os';
+import fs from 'node:fs';
 import path from 'node:path';
 
 /** 默认（不传 --profile）凭证根目录。 */
 export function defaultRootDir() {
-  return path.join(os.homedir(), '.stelfield');
+  // An Agent that logged in under the old `linger` command keeps its login in ~/.linger. Use that folder in place
+  // (never a copy: the server's refresh token is single-use, so two copies of one login would log each other out
+  // while the old and new command run side by side). Fresh installs use ~/.stelfield.
+  const fresh = path.join(os.homedir(), '.stelfield');
+  const legacy = path.join(os.homedir(), '.linger');
+  if (hasLogin(fresh)) return fresh;
+  if (hasLogin(legacy)) return legacy;
+  return fresh;
+}
+
+function hasLogin(dir) {
+  return fs.existsSync(path.join(dir, 'credentials')) || fs.existsSync(path.join(dir, 'profiles'));
+}
+
+/** Config root named by the environment: STELFIELD_CONFIG_DIR, else the old LINGER_CONFIG_DIR, else the default. */
+export function configRootFromEnv(env = process.env) {
+  return env.STELFIELD_CONFIG_DIR || env.LINGER_CONFIG_DIR || defaultRootDir();
 }
 
 /** profile 名合法性（目录名安全子集 · 挡住 ../ 之类）。 */
@@ -51,22 +68,11 @@ export function profileDir(name, opts = {}) {
  * 注：--profile 优先级高于 STELFIELD_CONFIG_DIR——显式开关应当压过环境变量，
  * 否则用户设了环境变量后 --profile 就成了哑参数（排查起来很费解）。
  */
-/**
- * Where the same Agent kept its login before the rename (command `linger`, folder ~/.linger, env LINGER_CONFIG_DIR).
- * Used only to carry an existing login over once; nothing is ever written there.
- */
-export function resolveLegacyCredDir({ profile, env = process.env } = {}) {
-  const root = env.LINGER_CONFIG_DIR || path.join(os.homedir(), '.linger');
-  if (profile != null && profile !== '') return profileDir(profile, { rootDir: root });
-  return root;
-}
-
 export function resolveCredDir({ dir, profile, env = process.env } = {}) {
   if (dir) return dir;
   if (profile != null && profile !== '') {
-    const root = env.STELFIELD_CONFIG_DIR || defaultRootDir();
+    const root = configRootFromEnv(env);
     return profileDir(profile, { rootDir: root });
   }
-  if (env.STELFIELD_CONFIG_DIR) return env.STELFIELD_CONFIG_DIR;
-  return defaultRootDir();
+  return configRootFromEnv(env);
 }