@stalfh233/omc-cli 0.4.16 → 0.4.17

package/dist/cli.js

@@ -185,6 +185,8 @@ async function cmdDoctor(store, environment, serviceCode) {
                 steps.push(`服务凭据  ok  ${serviceCode} 鉴权参数形状正常（${probe.parameterCount} 项；掩码/占位/全 0 均未检出）`);
             else
                 steps.push(`服务凭据  WARN ${serviceCode} ${probe.findings.length} 项问题（${probe.findings.map((finding) => `${finding.code}:${finding.valueKind}`).join("、")}）——掩码/占位值不可用于真实调用；真值从任务环境事实取，不要抄 service.get 读回`);
+            if (serviceCode !== undefined)
+                steps.push(`连通性    --  形状检查不能证明凭据有效；真实连通性用 method.test（平台侧发起调用）`);
         }
     }
     catch (error) {

package/dist/config-store.js

@@ -30,6 +30,10 @@ export class ConfigStore {
     constructor(paths = defaultPaths()) {
         this.paths = paths;
     }
+    /** Config root (config file's directory) — token-cache placement (F1). */
+    get configPaths() {
+        return this.paths;
+    }
     atomicWrite(path, text, mode) {
         mkdirSync(dirname(path), { recursive: true });
         if (existsSync(path)) {

package/dist/field-families.js

@@ -258,8 +258,56 @@ export function fieldTypeHint(type) {
     for (const [concept, family] of Object.entries(FIELD_TYPE_SYNONYMS))
         if (type.includes(concept) || concept.includes(type))
             return `「${type}」看起来是概念名而非族名；最接近的是 ${family}`;
+    // F2 (r10-friction): an off-by-one family guess (NUMBER→NUMERICAL measured
+    // live as a full extra round) deserves a did-you-mean, not just the full
+    // list. Closest match by edit distance over the normalized names.
+    const closest = closestFamilyName(type);
+    if (closest)
+        return `「${type}」不是族名；你要找的可能是 ${closest}`;
     return undefined;
 }
+/** Case/underscore-insensitive closest match over the family list. */
+function closestFamilyName(type) {
+    const wanted = type.toUpperCase().replace(/[\s_-]/g, "");
+    if (wanted.length < 2)
+        return undefined;
+    let best;
+    for (const name of Object.keys(FIELD_PROPERTY_TYPES)) {
+        const candidate = name.toUpperCase().replace(/[\s_-]/g, "");
+        // Three acceptance shapes, from exact-ish to fuzzy:
+        // 1. prefix containment (STAFF→STAFF_SELECTOR, DATETIME→DATE)
+        const contained = (candidate.startsWith(wanted) || wanted.startsWith(candidate)) && Math.min(wanted.length, candidate.length) >= 4;
+        // 2. small edit distance (NUMERIC→NUMERICAL, SHORTTEXT→SHORT_TEXT)
+        const distance = editDistance(wanted, candidate);
+        const nearMiss = distance <= 2;
+        // 3. shared prefix + proportional distance (NUMBER→NUMERICAL, the live-measured case)
+        const sharedPrefix = commonPrefixLength(wanted, candidate);
+        const proportional = sharedPrefix >= 3 && wanted.length >= 5 && distance / Math.max(wanted.length, candidate.length) <= 0.58;
+        const accepted = contained || nearMiss || proportional;
+        if (accepted && (!best || distance < best.distance))
+            best = { name, distance };
+    }
+    return best?.name;
+}
+function commonPrefixLength(a, b) {
+    let index = 0;
+    while (index < a.length && index < b.length && a[index] === b[index])
+        index++;
+    return index;
+}
+function editDistance(a, b) {
+    const row = Array.from({ length: b.length + 1 }, (_, index) => index);
+    for (let i = 1; i <= a.length; i++) {
+        let previous = row[0];
+        row[0] = i;
+        for (let j = 1; j <= b.length; j++) {
+            const temp = row[j];
+            row[j] = Math.min(row[j] + 1, row[j - 1] + 1, previous + (a[i - 1] === b[j - 1] ? 0 : 1));
+            previous = temp;
+        }
+    }
+    return row[b.length];
+}
 /** wire propertyType (int) -> form controlType (type-matrix.md §3.1). */
 export const FIELD_CONTROL_TYPES = { ...CAPABILITY_CONTROL_TYPES };
 export const SYSTEM_FIELD_CODES = new Set([

package/dist/lanes/meta.js

@@ -251,7 +251,7 @@ export function registerMetaLane(tools) {
                         ? { step: "服务凭据", ok: null, serviceCode: probe.serviceCode, note: "未找到（get_by_code 无行）" }
                         : probe.status === "error"
                             ? { step: "服务凭据", ok: null, serviceCode: probe.serviceCode, note: `探测失败：${probe.message}` }
-                            : { step: "服务凭据", ok: probe.findings.length === 0, serviceCode: probe.serviceCode, adapterCode: probe.adapterCode, parameterCount: probe.parameterCount, findings: probe.findings, note: probe.findings.length === 0 ? "掩码/占位/全 0 均未检出" : "掩码/占位值不可用于真实调用；真值从任务环境事实取，不要抄 service.get 读回" });
+                            : { step: "服务凭据", ok: probe.findings.length === 0, serviceCode: probe.serviceCode, adapterCode: probe.adapterCode, parameterCount: probe.parameterCount, findings: probe.findings, note: `${probe.findings.length === 0 ? "掩码/占位/全 0 均未检出" : "掩码/占位值不可用于真实调用；真值从任务环境事实取，不要抄 service.get 读回"}；形状检查不能证明凭据有效，真实连通性用 method.test` });
                 }
                 return { status: "ok", steps };
             }

package/dist/session-manager.js

@@ -1,4 +1,5 @@
-import { CloudPivotSession } from "./session.js";
+import { CloudPivotSession, defaultRequestTimeoutMs } from "./session.js";
+import { TokenCache, loginFingerprint } from "./token-cache.js";
 /** Caches one logged-in session per named environment per process. */
 export class SessionManager {
     store;
@@ -20,7 +21,18 @@ export class SessionManager {
         let session = cached?.profileKey === profileKey ? cached.session : undefined;
         if (!session) {
             const credential = this.store.readCredential(resolved.name);
-            session = new CloudPivotSession(resolved.name, resolved.profile, credential, this.httpFactory?.(resolved.profile), this.systemConfigFactory?.(resolved.profile));
+            // F1: cross-process token cache — lives beside the credentials, keyed
+            // by the environment profile + credential fingerprint. Injected http
+            // factories (tests, fakes) still go through the same hooks; a fake
+            // accepts the cached token the same way it accepts a fresh one.
+            const cache = new TokenCache(this.store.configPaths.configPath);
+            const environmentName = resolved.name;
+            const fingerprint = loginFingerprint(resolved.profile, credential);
+            session = new CloudPivotSession(resolved.name, resolved.profile, credential, this.httpFactory?.(resolved.profile), this.systemConfigFactory?.(resolved.profile), defaultRequestTimeoutMs(), {
+                load: () => cache.load(environmentName, fingerprint),
+                save: (login) => cache.save(environmentName, fingerprint, login),
+                clear: () => cache.clear(environmentName),
+            });
             this.sessions.set(resolved.name, { profileKey, session });
         }
         await session.login();

package/dist/session.js

@@ -18,16 +18,18 @@ export class CloudPivotSession {
     credential;
     systemConfig;
     requestTimeoutMs;
+    tokenCache;
     loginResult;
     version;
     httpAdapter;
     fingerprintOf;
-    constructor(environmentName, profile, credential, http, systemConfig = undefined, requestTimeoutMs = defaultRequestTimeoutMs()) {
+    constructor(environmentName, profile, credential, http, systemConfig = undefined, requestTimeoutMs = defaultRequestTimeoutMs(), tokenCache) {
         this.environmentName = environmentName;
         this.profile = profile;
         this.credential = credential;
         this.systemConfig = systemConfig;
         this.requestTimeoutMs = requestTimeoutMs;
+        this.tokenCache = tokenCache;
         this.httpAdapter = http;
     }
     async http() {
@@ -42,6 +44,24 @@ export class CloudPivotSession {
     async login() {
         if (this.loginResult)
             return this.loginResult;
+        // F1: a fresh-enough cached login (same environment profile + credential
+        // fingerprint) skips the six-round-trip handshake entirely. A 401
+        // mid-call clears the cache and re-logins (request() below).
+        const cached = this.tokenCache?.load();
+        if (cached) {
+            const core = await omcCore();
+            if (!this.fingerprintOf)
+                this.fingerprintOf = core.canonicalCloudPivotEnvironmentFingerprint;
+            this.loginResult = {
+                token: cached.token,
+                enterpriseId: cached.enterpriseId,
+                administrator: cached.administrator,
+                ...(cached.accountIdentity !== undefined ? { accountIdentity: cached.accountIdentity } : {}),
+            };
+            if (cached.version !== undefined)
+                this.version = cached.version;
+            return this.loginResult;
+        }
         const core = await omcCore();
         if (!this.fingerprintOf)
             this.fingerprintOf = core.canonicalCloudPivotEnvironmentFingerprint;
@@ -59,6 +79,13 @@ export class CloudPivotSession {
             ...(systemConfig ? { systemConfig } : {}),
         });
         this.version = detectVersion(systemConfig);
+        this.tokenCache?.save({
+            token: this.loginResult.token,
+            enterpriseId: this.loginResult.enterpriseId,
+            administrator: this.loginResult.administrator,
+            ...(this.loginResult.accountIdentity !== undefined ? { accountIdentity: this.loginResult.accountIdentity } : {}),
+            ...(this.version !== undefined ? { version: this.version } : {}),
+        });
         return this.loginResult;
     }
     /** Version-family evidence; absent evidence returns undefined (fail closed upstream). */
@@ -104,6 +131,8 @@ export class CloudPivotSession {
             return first;
         this.loginResult = undefined;
         this.version = undefined;
+        // The invalidated token must not be re-loaded by the re-login below.
+        this.tokenCache?.clear();
         return this.send(input);
     }
     async send(input) {
@@ -167,7 +196,7 @@ export class CloudPivotRequestTimeoutError extends Error {
         this.name = "CloudPivotRequestTimeoutError";
     }
 }
-function defaultRequestTimeoutMs() {
+export function defaultRequestTimeoutMs() {
     const raw = process.env.OMC_HTTP_TIMEOUT_MS;
     const parsed = raw ? Number(raw) : NaN;
     return Number.isFinite(parsed) && parsed > 0 ? parsed : 120_000;

package/dist/token-cache.js

@@ -0,0 +1,65 @@
+import { createHash } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+export function loginFingerprint(profile, credential) {
+    return createHash("sha256")
+        .update(JSON.stringify({ baseUrl: profile.baseUrl, applicationCode: profile.applicationCode, engineCode: profile.engineCode ?? null, username: credential.username, password: credential.password }))
+        .digest("hex");
+}
+const DEFAULT_TTL_MS = 8 * 60 * 60 * 1000;
+export class TokenCache {
+    dir;
+    ttlMs;
+    constructor(configPath, ttlMs = Number(process.env.OMC_TOKEN_TTL_MS) > 0 ? Number(process.env.OMC_TOKEN_TTL_MS) : DEFAULT_TTL_MS) {
+        this.dir = join(dirname(configPath), "token-cache");
+        this.ttlMs = ttlMs;
+    }
+    load(environmentName, fingerprint) {
+        const file = join(this.dir, `${environmentName}.json`);
+        if (!existsSync(file))
+            return undefined;
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileSync(file, "utf8"));
+        }
+        catch {
+            return undefined;
+        }
+        if (parsed.fingerprint !== fingerprint)
+            return undefined;
+        if (typeof parsed.storedAt !== "number" || Date.now() - parsed.storedAt > this.ttlMs)
+            return undefined;
+        if (typeof parsed.token !== "string" || typeof parsed.enterpriseId !== "string" || typeof parsed.administrator !== "boolean")
+            return undefined;
+        return {
+            token: parsed.token,
+            enterpriseId: parsed.enterpriseId,
+            administrator: parsed.administrator,
+            ...(parsed.accountIdentity !== undefined ? { accountIdentity: parsed.accountIdentity } : {}),
+            ...(parsed.version !== undefined ? { version: parsed.version } : {}),
+        };
+    }
+    save(environmentName, fingerprint, login) {
+        try {
+            mkdirSync(this.dir, { recursive: true, mode: 0o700 });
+            const entry = { ...login, fingerprint, storedAt: Date.now() };
+            const file = join(this.dir, `${environmentName}.json`);
+            const tmp = `${file}.${process.pid}.tmp`;
+            writeFileSync(tmp, JSON.stringify(entry), { mode: 0o600 });
+            renameSync(tmp, file);
+        }
+        catch {
+            // The cache is an optimization, never a dependency: a failed write
+            // only means the next process logs in fresh.
+        }
+    }
+    clear(environmentName) {
+        try {
+            rmSync(join(this.dir, `${environmentName}.json`), { force: true });
+        }
+        catch {
+            // best effort
+        }
+    }
+}
+//# sourceMappingURL=token-cache.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stalfh233/omc-cli",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "description": "CloudPivot 8.6 configuration capability CLI — governed, fail-closed, coverage-manifest bounded.",
   "type": "module",
   "bin": {
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "commander": "14.0.3",
-    "omc-core": "0.4.16",
+    "omc-core": "0.4.17",
     "proper-lockfile": "4.1.2",
     "write-file-atomic": "6.0.0",
     "zod": "^3.23.8",