@ats-cx/cx-core 0.1.0 → 0.1.1

package/dist/config.d.ts

@@ -19,4 +19,9 @@ export interface LoadConfigOptions {
 export type ConfigSource = "explicit" | "workspace" | "env" | "toolkit";
 /** cx-cli 的机器级配置与无工作区产物目录。 */
 export declare function machineConfigDir(): string;
+/**
+ * 只读取 apm-provider 叠层并判定三态，不碰 toolkit / 语义表 / 规则表。
+ * 给 `skills` 组与 `init` 的只读探针用：它们只关心站点地址填没填，不该因无关配置损坏而失败。
+ */
+export declare function loadApmProviderState(configDir: string, options?: Pick<LoadConfigOptions, "source">): Pick<ResolvedConfig, "apmProvider" | "apmProviderState">;
 export declare function loadConfig(configDir: string, options?: LoadConfigOptions): ResolvedConfig;

package/dist/config.js

@@ -8,13 +8,13 @@ import { loadEventSemanticsTable } from "./semantics/table-loader.js";
 export function machineConfigDir() {
     return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "cx-cli");
 }
-export function loadConfig(configDir, options = {}) {
+/**
+ * 只读取 apm-provider 叠层并判定三态，不碰 toolkit / 语义表 / 规则表。
+ * 给 `skills` 组与 `init` 的只读探针用：它们只关心站点地址填没填，不该因无关配置损坏而失败。
+ */
+export function loadApmProviderState(configDir, options = {}) {
     const dir = resolve(configDir);
     const machineDir = machineConfigDir();
-    const machineToolkit = options.source === "toolkit"
-        ? resolveToolkitPaths(readJsonIfExists(join(machineDir, "toolkit.local.json")), machineDir)
-        : {};
-    const toolkit = mergeLocal(mergeLocal(readJsonIfExists(join(dir, "toolkit.json")), machineToolkit), readJsonIfExists(join(dir, "toolkit.local.json")));
     const apmProviderPaths = [
         join(dir, "apm-provider.json"),
         ...(options.source === "toolkit" ? [join(machineDir, "apm-provider.local.json")] : []),
@@ -22,38 +22,43 @@ export function loadConfig(configDir, options = {}) {
     ];
     const apmProviderLayers = apmProviderPaths.map(readApmJsonIfExists);
     const apmProviderFiles = apmProviderPaths.filter(existsSync);
-    const apmProviderRaw = mergeLocal(mergeLocal(apmProviderLayers[0]?.value ?? {}, apmProviderLayers[1]?.value ?? {}), apmProviderLayers[2]?.value ?? {});
+    const apmProviderRaw = apmProviderLayers.reduce((merged, layer) => mergeLocal(merged, layer.value), {});
     const fillPath = options.source === "toolkit"
         ? join(machineDir, "apm-provider.local.json")
         : join(dir, "apm-provider.local.json");
-    let apmProvider = null;
-    let apmProviderState;
     const apmJsonError = apmProviderLayers.find(layer => layer.error !== undefined)?.error;
     if (apmJsonError !== undefined) {
-        apmProviderState = { kind: "invalid", fillPath, error: apmJsonError };
+        return { apmProvider: null, apmProviderState: { kind: "invalid", fillPath, error: apmJsonError } };
     }
-    else if (!existsSync(join(dir, "apm-provider.json"))) {
-        apmProviderState = { kind: "missing", fillPath, configDir: dir };
+    if (!existsSync(join(dir, "apm-provider.json"))) {
+        return { apmProvider: null, apmProviderState: { kind: "missing", fillPath, configDir: dir } };
     }
-    else {
-        try {
-            const parsed = parseApmConfig(apmProviderRaw);
-            if (parsed.baseUrl === "" || parsed.defaults.host === "") {
-                apmProviderState = { kind: "unconfigured", fillPath };
-            }
-            else {
-                apmProvider = parsed;
-                apmProviderState = null;
-            }
+    try {
+        const parsed = parseApmConfig(apmProviderRaw);
+        if (parsed.baseUrl === "" || parsed.defaults.host === "") {
+            return { apmProvider: null, apmProviderState: { kind: "unconfigured", fillPath } };
         }
-        catch (error) {
-            apmProviderState = {
+        return { apmProvider: parsed, apmProviderState: null };
+    }
+    catch (error) {
+        return {
+            apmProvider: null,
+            apmProviderState: {
                 kind: "invalid",
                 fillPath,
                 error: `${error instanceof Error ? error.message : String(error)}（配置文件：${apmProviderFiles.join("、")}）`,
-            };
-        }
+            },
+        };
     }
+}
+export function loadConfig(configDir, options = {}) {
+    const dir = resolve(configDir);
+    const machineDir = machineConfigDir();
+    const machineToolkit = options.source === "toolkit"
+        ? resolveToolkitPaths(readJsonIfExists(join(machineDir, "toolkit.local.json")), machineDir)
+        : {};
+    const toolkit = mergeLocal(mergeLocal(readJsonIfExists(join(dir, "toolkit.json")), machineToolkit), readJsonIfExists(join(dir, "toolkit.local.json")));
+    const { apmProvider, apmProviderState } = loadApmProviderState(dir, options);
     const eventSemantics = loadEventSemanticsTable(options.eventSemanticsPath ?? join(dir, "event-semantics.json"), {
         required: options.eventSemanticsPath !== undefined,
     });

package/dist/index.d.ts

@@ -11,7 +11,7 @@ export { fetchLiveProject, resolveUserId } from "./apm/portal.js";
 export type { ApmPortalDeps, FetchLiveProjectParams, LiveProjectResult, ResolveUserIdParams, } from "./apm/portal.js";
 export { assertColumnName, assertSafeValue, FIXED_REQUEST_KEYS, isSiteHost, LOG_TYPES, normalizeLogTime, ORDERS, } from "./apm/values.js";
 export type { ApmOrder, LogType } from "./apm/values.js";
-export { loadConfig, machineConfigDir } from "./config.js";
+export { loadApmProviderState, loadConfig, machineConfigDir } from "./config.js";
 export type { ConfigSource, LoadConfigOptions } from "./config.js";
 export { loadEventSemanticsTable } from "./semantics/table-loader.js";
 export type { EventSemanticsTable } from "./semantics/table-loader.js";

package/dist/index.js

@@ -5,7 +5,7 @@ export { createApmClient } from "./apm/client.js";
 export { ApmRequestError } from "./apm/errors.js";
 export { fetchLiveProject, resolveUserId } from "./apm/portal.js";
 export { assertColumnName, assertSafeValue, FIXED_REQUEST_KEYS, isSiteHost, LOG_TYPES, normalizeLogTime, ORDERS, } from "./apm/values.js";
-export { loadConfig, machineConfigDir } from "./config.js";
+export { loadApmProviderState, loadConfig, machineConfigDir } from "./config.js";
 export { loadEventSemanticsTable } from "./semantics/table-loader.js";
 export * from "./normalize/log.js";
 export * from "./normalize/project.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ats-cx/cx-core",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "cx-cli 的事实层：providers、normalize、semantics、rules、diff、run 原语。随 @ats-cx/cx-cli 同号发布，不是独立公共 API",
   "author": "heyg",
   "license": "UNLICENSED",