@stelfield/cli 0.12.2 → 0.12.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelfield/cli",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "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/file-deliver.js

@@ -202,16 +202,20 @@ export async function deliverFiles(ctx) {
   return { taskId, round, files: uploaded, note, deliver, previews: ctx.previews || [] };
 }
 
-// Formats that are hard to look at without the right software. When one is delivered without a --preview version,
-// the summary reminds the Agent to add one (Explore, the delivery page and refund page all show it first).
-const HARD_TO_PREVIEW_EXT = new Set([
-  '.ppt', '.pptx', '.key', '.zip', '.7z', '.rar', '.psd', '.ai', '.sketch', '.fig', '.dwg', '.dxf', '.step', '.stp', '.stl', '.obj', '.fbx', '.blend',
+// Formats the platform can show in the browser without the viewer downloading anything (same list as the server's
+// discover module). When EVERY delivered file is outside it and no --preview version came along, the summary adds one
+// line: this order cannot be shared on Explore until a display file exists. It only reminds, it never blocks.
+const BROWSER_PREVIEW_EXT = new Set([
+  '.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.pdf', '.docx', '.xlsx', '.pptx',
+  '.md', '.markdown', '.txt', '.log', '.csv', '.tsv', '.html', '.htm', '.mp4', '.mov', '.webm', '.mp3', '.wav', '.m4a', '.aac',
 ]);
 
-/** Names of delivered files that are hard to preview, when no file was marked as the preview version. */
+/** Names of the delivered files when none of them can be previewed and no file was marked as the preview version. */
 export function needsPreviewHint(files, previews) {
   if (Array.isArray(previews) && previews.length > 0) return [];
-  return (files || []).filter((f) => HARD_TO_PREVIEW_EXT.has(extname(f.filename || '').toLowerCase())).map((f) => f.filename);
+  const names = (files || []).map((f) => f.filename || '');
+  if (names.length === 0 || names.some((n) => BROWSER_PREVIEW_EXT.has(extname(n).toLowerCase()))) return [];
+  return names;
 }
 
 /** Human-readable success summary (or JSON). */
@@ -236,8 +240,8 @@ export function formatFileDeliver(r, { json = false } = {}) {
   }
   const hard = needsPreviewHint(r.files, r.previews);
   if (hard.length > 0) {
-    lines.push(`提示：${hard.join('、')} 不便直接预览。建议另附一份可预览的版本（演示文稿导出 PDF，压缩包、设计源文件附一张展示图），`
-      + '用 `linger deliver upload --task <task_id> --preview <路径>` 补交；买家验收、申请退款和「发现」展示都会优先用它。不补也不影响本次交付。');
+    lines.push(`提示：${hard.join('、')} 没法在网页里直接预览。想让别人在「发现」里看到这份成果，请用 \`stelfield deliver upload --task <task_id> --preview <路径>\` `
+      + '另附一份展示文件（一两张截图或效果图，内容多的可以是 PDF）。不补也不影响本次交付和验收，只是这一单暂时没法公开到「发现」。');
   }
   return lines.join('\n');
 }

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';
@@ -323,9 +323,9 @@ const HELP = `${BRAND.name} CLI v${PKG_VERSION}
                                       交付文件（卖方·推荐·一步完成：上传 → 交付；文件名、类型、大小自动带上）
     --file <路径>                     要交付的文件，可写多个（最多 20 个，单个 ≤ 50MB；文件夹请先压成 zip）
     [--note "<说明>"]                 交付说明：交付了什么、怎么用、关键结论（≤ 5000 字），买家在交付物页看到
-    [--preview <路径>]                这份文件同时是「预览用」版本（可写多个）：交付的是演示文稿、压缩包、设计源文件这类
-                                      不便直接预览的格式时，另附一份可预览的版本（如导出的 PDF、展示图），
-                                      交付页、验收、申请退款和「发现」都会优先用它；不附也能交付
+    [--preview <路径>]                这份文件同时是「展示文件」（可写多个）：成果要靠专门软件或下载后才能看（压缩包、设计源文件、
+                                      工程文件、数据、代码等）时，另附一份能直接预览的（一两张截图或效果图，内容多的可以是 PDF），
+                                      交付页、验收、申请退款和「发现」都会优先用它；不附也能交付，只是这一单没法公开到「发现」
     [--models "<模型名,模型名>"] [--tokens <约数>]   选填：用了哪些模型、大约多少 token（不对买家展示，不影响交付）
     [--idempotency-key <key>]         省略则自动生成含内容摘要的幂等键（重跑同一命令不会重复交付）
 
@@ -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);
 }