@hcmai/sdk 0.4.19 → 0.4.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +22 -9
- package/dist/index.js +21 -8
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -183,6 +183,7 @@ declare function listModels(http: AxiosInstance): Promise<ModelEntry[]>;
|
|
|
183
183
|
interface ModelQueryDsl {
|
|
184
184
|
filter?: Record<string, unknown>;
|
|
185
185
|
sort?: Array<Record<string, unknown>>;
|
|
186
|
+
additions?: Array<Record<string, unknown>>;
|
|
186
187
|
fields?: string[];
|
|
187
188
|
keyword?: string;
|
|
188
189
|
limit?: number;
|
|
@@ -676,6 +677,14 @@ declare class TokenStore {
|
|
|
676
677
|
*/
|
|
677
678
|
private storeToken;
|
|
678
679
|
getAccessToken(): Promise<string | null>;
|
|
680
|
+
/**
|
|
681
|
+
* 只读取这一个 store 持久化的 token,不接受 HCM_PAT/HCM_ACCESS_TOKEN 覆盖。
|
|
682
|
+
*
|
|
683
|
+
* `identity show <alias>` 要回答的是「这个 alias 到底是谁」;若沿用普通命令的环境变量
|
|
684
|
+
* 优先级,机器上临时设置的一枚 token 会让所有 alias 都显示成同一个人,正向角色验收
|
|
685
|
+
* 反而得到一份可信外观的错误证据。普通业务命令仍走 {@link getAccessToken},行为不变。
|
|
686
|
+
*/
|
|
687
|
+
getStoredAccessToken(): Promise<string | null>;
|
|
679
688
|
getRefreshToken(): Promise<string | null>;
|
|
680
689
|
clear(): Promise<void>;
|
|
681
690
|
private resolveRef;
|
|
@@ -698,6 +707,8 @@ declare class TokenStore {
|
|
|
698
707
|
* login 成功那行只回显前者,于是登错租户是静默的。
|
|
699
708
|
*/
|
|
700
709
|
interface Principal {
|
|
710
|
+
/** 服务端用户主键;登录响应使用 id,auth/info 使用 userId。 */
|
|
711
|
+
userId?: string;
|
|
701
712
|
/** 服务端认定的租户。ADR-177 之后新租户是 UUID,别按 int 处理。 */
|
|
702
713
|
tenantId?: string;
|
|
703
714
|
username?: string;
|
|
@@ -2199,14 +2210,15 @@ declare function createHttpClient(opts: HttpClientOptions): AxiosInstance;
|
|
|
2199
2210
|
* 必须先装技能才能建租户。所以本模块只需要 endpoint,不碰 identity/token。
|
|
2200
2211
|
*
|
|
2201
2212
|
* 后端契约(ChironController):
|
|
2202
|
-
* - `GET {base}
|
|
2203
|
-
* - `GET {base}/
|
|
2204
|
-
* - `GET {base}/
|
|
2205
|
-
* - `GET {base}/
|
|
2213
|
+
* - `GET {base}.json` 目录 manifest
|
|
2214
|
+
* - `GET {base}/{id}.md` 技能原文
|
|
2215
|
+
* - `GET {base}/{id}/references/{path}` 技能自带的参考文件
|
|
2216
|
+
* - `GET {base}/{id}/files?path=...` 完整 Skill 目录中的原始文件
|
|
2206
2217
|
*
|
|
2207
|
-
* 🔴 `{base}`
|
|
2208
|
-
*
|
|
2209
|
-
*
|
|
2218
|
+
* 🔴 `{base}` 是实际探中的挂载根(优先 `'/api/chiron'`,旧后端可能是
|
|
2219
|
+
* `'/api/skills'` / `'/chiron'` / `'/skills'`)。真实部署只把 `/api/**` 路由给后端,
|
|
2220
|
+
* 根路径归前端 SPA;同时旧后端还没有 `/chiron*` 正名。两类环境都要能连上,
|
|
2221
|
+
* 所以先按优先级探测,再让所有后续请求跟随同一个挂载根。
|
|
2210
2222
|
*/
|
|
2211
2223
|
interface ChironSkillFile {
|
|
2212
2224
|
path: string;
|
|
@@ -2258,10 +2270,11 @@ interface ChironManifest {
|
|
|
2258
2270
|
/**
|
|
2259
2271
|
* 探出本环境技能库的前缀。
|
|
2260
2272
|
*
|
|
2261
|
-
*
|
|
2273
|
+
* 为什么不能只写死正名:
|
|
2262
2274
|
* - 真实部署(反代把 `/api/**` 给后端、其余给前端)下根路径返回的是前端 SPA 的 HTML,
|
|
2263
2275
|
* HTTP 200 但根本不是 manifest —— 所以判据必须看**内容**,不能看状态码;
|
|
2264
|
-
* -
|
|
2276
|
+
* - CLI 可能连接只提供 `/api/skills*` 兼容面的旧后端;
|
|
2277
|
+
* - 更老的本地直连环境只有根路径。
|
|
2265
2278
|
*
|
|
2266
2279
|
* 两条都探不到时抛出可执行的错误,而不是把一段 HTML 当目录解析出满屏乱码。
|
|
2267
2280
|
*/
|
package/dist/index.js
CHANGED
|
@@ -214,8 +214,18 @@ var TokenStore = class _TokenStore {
|
|
|
214
214
|
async getAccessToken() {
|
|
215
215
|
if (process.env.HCM_PAT) return process.env.HCM_PAT;
|
|
216
216
|
if (process.env.HCM_ACCESS_TOKEN) return process.env.HCM_ACCESS_TOKEN;
|
|
217
|
+
return this.getStoredAccessToken();
|
|
218
|
+
}
|
|
219
|
+
/**
|
|
220
|
+
* 只读取这一个 store 持久化的 token,不接受 HCM_PAT/HCM_ACCESS_TOKEN 覆盖。
|
|
221
|
+
*
|
|
222
|
+
* `identity show <alias>` 要回答的是「这个 alias 到底是谁」;若沿用普通命令的环境变量
|
|
223
|
+
* 优先级,机器上临时设置的一枚 token 会让所有 alias 都显示成同一个人,正向角色验收
|
|
224
|
+
* 反而得到一份可信外观的错误证据。普通业务命令仍走 {@link getAccessToken},行为不变。
|
|
225
|
+
*/
|
|
226
|
+
async getStoredAccessToken() {
|
|
217
227
|
const meta = await this.readMeta();
|
|
218
|
-
if (!meta) return null;
|
|
228
|
+
if (!meta?.accessTokenRef) return null;
|
|
219
229
|
return this.resolveRef(meta.accessTokenRef);
|
|
220
230
|
}
|
|
221
231
|
async getRefreshToken() {
|
|
@@ -294,6 +304,8 @@ function toPrincipal(raw) {
|
|
|
294
304
|
if (!raw || typeof raw !== "object") return void 0;
|
|
295
305
|
const o = raw;
|
|
296
306
|
const principal = {};
|
|
307
|
+
const rawUserId = o.userId ?? o.id;
|
|
308
|
+
if (rawUserId !== void 0 && rawUserId !== null) principal.userId = String(rawUserId);
|
|
297
309
|
if (o.tenantId !== void 0 && o.tenantId !== null) principal.tenantId = String(o.tenantId);
|
|
298
310
|
if (typeof o.username === "string" && o.username) principal.username = o.username;
|
|
299
311
|
if (Array.isArray(o.roles)) principal.roles = o.roles.map(String);
|
|
@@ -954,6 +966,7 @@ async function query(http, model, dsl) {
|
|
|
954
966
|
if (filter !== void 0) body.filter = filter;
|
|
955
967
|
const orders = normalizeOrders(dsl.sort);
|
|
956
968
|
if (orders !== void 0) body.orders = orders;
|
|
969
|
+
if (dsl.additions !== void 0) body.additions = dsl.additions;
|
|
957
970
|
if (dsl.fields !== void 0) body.fields = dsl.fields;
|
|
958
971
|
if (dsl.keyword !== void 0) body.keyword = dsl.keyword;
|
|
959
972
|
const size = dsl.limit ?? 20;
|
|
@@ -9139,7 +9152,7 @@ function explainJacksonError(raw) {
|
|
|
9139
9152
|
|
|
9140
9153
|
// src/skills.ts
|
|
9141
9154
|
import yaml9, { JSON_SCHEMA as JSON_SCHEMA3 } from "js-yaml";
|
|
9142
|
-
var CHIRON_BASE_CANDIDATES = ["/api", ""];
|
|
9155
|
+
var CHIRON_BASE_CANDIDATES = ["/api/chiron", "/api/skills", "/chiron", "/skills"];
|
|
9143
9156
|
function looksLikeManifest(data) {
|
|
9144
9157
|
if (!data || typeof data !== "object") return false;
|
|
9145
9158
|
const m = data;
|
|
@@ -9148,7 +9161,7 @@ function looksLikeManifest(data) {
|
|
|
9148
9161
|
async function resolveChironBase(http) {
|
|
9149
9162
|
const tried = [];
|
|
9150
9163
|
for (const base of CHIRON_BASE_CANDIDATES) {
|
|
9151
|
-
const url = `${base}
|
|
9164
|
+
const url = `${base}.json`;
|
|
9152
9165
|
tried.push(url);
|
|
9153
9166
|
try {
|
|
9154
9167
|
const resp = await http.get(url);
|
|
@@ -9159,15 +9172,15 @@ async function resolveChironBase(http) {
|
|
|
9159
9172
|
}
|
|
9160
9173
|
throw new CliError({
|
|
9161
9174
|
code: "INVALID_ARGUMENT" /* INVALID_ARGUMENT */,
|
|
9162
|
-
message: `\u8FD9\u4E2A\u73AF\u5883\u4E0A\u627E\u4E0D\u5230\u777F\u620E\u6280\u80FD\u5E93\uFF08\u8BD5\u8FC7 ${tried.join(" \u548C ")}\uFF09\u3002\u5E38\u89C1\u539F\u56E0\uFF1A\u2460 \u540E\u7AEF\u7248\u672C\u8FD8\u6CA1\u6709 /api/skills \u7AEF\u70B9\uFF0C\u5347\u7EA7\u540E\u7AEF\u5373\u53EF\uFF1B\u2461 endpoint \u586B\u7684\u662F\u524D\u7AEF\u5730\u5740\u4E14\u672A\u53CD\u4EE3\u5230\u540E\u7AEF\uFF1B\u2462 \u5730\u5740\u6216\u7F51\u7EDC\u4E0D\u901A\u3002`
|
|
9175
|
+
message: `\u8FD9\u4E2A\u73AF\u5883\u4E0A\u627E\u4E0D\u5230\u777F\u620E\u6280\u80FD\u5E93\uFF08\u8BD5\u8FC7 ${tried.join(" \u548C ")}\uFF09\u3002\u5E38\u89C1\u539F\u56E0\uFF1A\u2460 \u540E\u7AEF\u7248\u672C\u8FD8\u6CA1\u6709 /api/chiron \u6216 /api/skills \u7AEF\u70B9\uFF0C\u5347\u7EA7\u540E\u7AEF\u5373\u53EF\uFF1B\u2461 endpoint \u586B\u7684\u662F\u524D\u7AEF\u5730\u5740\u4E14\u672A\u53CD\u4EE3\u5230\u540E\u7AEF\uFF1B\u2462 \u5730\u5740\u6216\u7F51\u7EDC\u4E0D\u901A\u3002`
|
|
9163
9176
|
});
|
|
9164
9177
|
}
|
|
9165
9178
|
async function fetchSkillCatalog(http, base) {
|
|
9166
|
-
const resp = await http.get(`${base}
|
|
9179
|
+
const resp = await http.get(`${base}.json`);
|
|
9167
9180
|
return resp.data?.data ?? resp.data;
|
|
9168
9181
|
}
|
|
9169
9182
|
async function fetchSkillMarkdown(http, id, base) {
|
|
9170
|
-
const resp = await http.get(`${base}
|
|
9183
|
+
const resp = await http.get(`${base}/${encodeURIComponent(id)}.md`, {
|
|
9171
9184
|
responseType: "text",
|
|
9172
9185
|
transformResponse: [(d) => d]
|
|
9173
9186
|
});
|
|
@@ -9176,7 +9189,7 @@ async function fetchSkillMarkdown(http, id, base) {
|
|
|
9176
9189
|
async function fetchSkillFile(http, id, relativePath, base) {
|
|
9177
9190
|
assertSafeSkillId(id);
|
|
9178
9191
|
assertSafeSkillFilePath(relativePath);
|
|
9179
|
-
const resp = await http.get(`${base}
|
|
9192
|
+
const resp = await http.get(`${base}/${encodeURIComponent(id)}/files`, {
|
|
9180
9193
|
params: { path: relativePath },
|
|
9181
9194
|
responseType: "arraybuffer",
|
|
9182
9195
|
transformResponse: [(data) => data]
|
|
@@ -9186,7 +9199,7 @@ async function fetchSkillFile(http, id, relativePath, base) {
|
|
|
9186
9199
|
async function fetchSkillReference(http, id, relativePath, base) {
|
|
9187
9200
|
assertSafeReferencePath(relativePath);
|
|
9188
9201
|
const encoded = relativePath.split("/").map(encodeURIComponent).join("/");
|
|
9189
|
-
const resp = await http.get(`${base}
|
|
9202
|
+
const resp = await http.get(`${base}/${encodeURIComponent(id)}/references/${encoded}`, {
|
|
9190
9203
|
responseType: "text",
|
|
9191
9204
|
transformResponse: [(d) => d]
|
|
9192
9205
|
});
|