@hcmai/sdk 0.15.9 → 0.15.11
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 +347 -5
- package/dist/index.js +446 -20
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -80,6 +80,7 @@ var CliErrorCode = /* @__PURE__ */ ((CliErrorCode2) => {
|
|
|
80
80
|
CliErrorCode2["WS_HANDSHAKE_REJECTED"] = "WS_HANDSHAKE_REJECTED";
|
|
81
81
|
CliErrorCode2["SCOPE_FORBIDDEN"] = "SCOPE_FORBIDDEN";
|
|
82
82
|
CliErrorCode2["BUSINESS_RULE_VIOLATION"] = "BUSINESS_RULE_VIOLATION";
|
|
83
|
+
CliErrorCode2["STREAM_FAILED_NO_SERVER_CODE"] = "STREAM_FAILED_NO_SERVER_CODE";
|
|
83
84
|
CliErrorCode2["MODEL_NOT_FOUND"] = "MODEL_NOT_FOUND";
|
|
84
85
|
CliErrorCode2["ACTION_NOT_FOUND"] = "ACTION_NOT_FOUND";
|
|
85
86
|
CliErrorCode2["AGENT_NOT_FOUND"] = "AGENT_NOT_FOUND";
|
|
@@ -97,6 +98,7 @@ var CliErrorCode = /* @__PURE__ */ ((CliErrorCode2) => {
|
|
|
97
98
|
CliErrorCode2["IDENTITY_NOT_FOUND"] = "IDENTITY_NOT_FOUND";
|
|
98
99
|
CliErrorCode2["IDENTITY_ALREADY_EXISTS"] = "IDENTITY_ALREADY_EXISTS";
|
|
99
100
|
CliErrorCode2["IDENTITY_NOT_IN_ENV"] = "IDENTITY_NOT_IN_ENV";
|
|
101
|
+
CliErrorCode2["IDENTITY_META_INCOMPLETE"] = "IDENTITY_META_INCOMPLETE";
|
|
100
102
|
CliErrorCode2["TOKEN_EXPIRED"] = "TOKEN_EXPIRED";
|
|
101
103
|
CliErrorCode2["NO_ACTIVE_ENV"] = "NO_ACTIVE_ENV";
|
|
102
104
|
CliErrorCode2["SKILL_ID_CONFLICT"] = "SKILL_ID_CONFLICT";
|
|
@@ -115,6 +117,9 @@ var CODE_TO_EXIT = {
|
|
|
115
117
|
["WS_HANDSHAKE_REJECTED" /* WS_HANDSHAKE_REJECTED */]: 2 /* AUTH_ERROR */,
|
|
116
118
|
["SCOPE_FORBIDDEN" /* SCOPE_FORBIDDEN */]: 2 /* AUTH_ERROR */,
|
|
117
119
|
["BUSINESS_RULE_VIOLATION" /* BUSINESS_RULE_VIOLATION */]: 3 /* BUSINESS_ERROR */,
|
|
120
|
+
// 退出码仍是 3:脚本与 P0 runner 按 3 判「这一轮没跑成」,这一刀只换**码**不换档位。
|
|
121
|
+
// 换的是码承载的信息——从「后端说了业务规则不通过」变成「后端什么都没说到我这儿」。
|
|
122
|
+
["STREAM_FAILED_NO_SERVER_CODE" /* STREAM_FAILED_NO_SERVER_CODE */]: 3 /* BUSINESS_ERROR */,
|
|
118
123
|
["MODEL_NOT_FOUND" /* MODEL_NOT_FOUND */]: 3 /* BUSINESS_ERROR */,
|
|
119
124
|
["ACTION_NOT_FOUND" /* ACTION_NOT_FOUND */]: 3 /* BUSINESS_ERROR */,
|
|
120
125
|
["AGENT_NOT_FOUND" /* AGENT_NOT_FOUND */]: 3 /* BUSINESS_ERROR */,
|
|
@@ -132,6 +137,7 @@ var CODE_TO_EXIT = {
|
|
|
132
137
|
["IDENTITY_NOT_FOUND" /* IDENTITY_NOT_FOUND */]: 5 /* CONFIG_ERROR */,
|
|
133
138
|
["IDENTITY_ALREADY_EXISTS" /* IDENTITY_ALREADY_EXISTS */]: 5 /* CONFIG_ERROR */,
|
|
134
139
|
["IDENTITY_NOT_IN_ENV" /* IDENTITY_NOT_IN_ENV */]: 5 /* CONFIG_ERROR */,
|
|
140
|
+
["IDENTITY_META_INCOMPLETE" /* IDENTITY_META_INCOMPLETE */]: 5 /* CONFIG_ERROR */,
|
|
135
141
|
["TOKEN_EXPIRED" /* TOKEN_EXPIRED */]: 2 /* AUTH_ERROR */,
|
|
136
142
|
["NO_ACTIVE_ENV" /* NO_ACTIVE_ENV */]: 5 /* CONFIG_ERROR */,
|
|
137
143
|
["SKILL_ID_CONFLICT" /* SKILL_ID_CONFLICT */]: 3 /* BUSINESS_ERROR */,
|
|
@@ -143,6 +149,31 @@ function exitCodeFor(code) {
|
|
|
143
149
|
return CODE_TO_EXIT[code] ?? 1 /* USAGE_ERROR */;
|
|
144
150
|
}
|
|
145
151
|
|
|
152
|
+
// src/http/endpoint-url.ts
|
|
153
|
+
var REJECTED_BEFORE_ROUTING_CODE = "REQUEST_REJECTED_BEFORE_ROUTING";
|
|
154
|
+
function normalizeEndpoint(raw) {
|
|
155
|
+
const input = raw ?? "";
|
|
156
|
+
const normalized = input.trim().replace(/\/+$/, "");
|
|
157
|
+
return { normalized, changed: normalized !== input, raw: input };
|
|
158
|
+
}
|
|
159
|
+
function diagnoseRejectedBeforeRouting(requestUrl, baseUrl) {
|
|
160
|
+
const pathPart = doubleSlashPath(requestUrl, baseUrl);
|
|
161
|
+
if (!pathPart) return void 0;
|
|
162
|
+
const base = normalizeEndpoint(baseUrl);
|
|
163
|
+
const fix = base.changed ? `\u6539\u6389\u518D\u8BD5: hcm env edit endpoint ${base.normalized}` : `\u6838\u4E00\u773C\u5F53\u524D env \u7684 endpoint \u4E0E frontend: hcm env show`;
|
|
164
|
+
return `\u8FD9\u6B21\u8BF7\u6C42\u7684\u8DEF\u5F84\u662F '${pathPart}'\uFF0C\u91CC\u9762\u7684 '//' \u4F1A\u88AB\u5BB9\u5668\u5728\u8FDB\u5165\u8DEF\u7531\u4E4B\u524D\u62D2\u6389 \u2014\u2014 \u6700\u5E38\u89C1\u7684\u6210\u56E0\u662F env \u7684 endpoint \u672B\u5C3E\u591A\u4E86\u4E00\u4E2A '/'\u3002${fix}`;
|
|
165
|
+
}
|
|
166
|
+
function doubleSlashPath(requestUrl, baseUrl) {
|
|
167
|
+
if (!requestUrl) return void 0;
|
|
168
|
+
let pathname;
|
|
169
|
+
try {
|
|
170
|
+
pathname = new URL(requestUrl, baseUrl ?? void 0).pathname;
|
|
171
|
+
} catch {
|
|
172
|
+
return void 0;
|
|
173
|
+
}
|
|
174
|
+
return pathname.includes("//") ? pathname : void 0;
|
|
175
|
+
}
|
|
176
|
+
|
|
146
177
|
// src/errors/cli-error.ts
|
|
147
178
|
var CliError = class extends Error {
|
|
148
179
|
code;
|
|
@@ -183,6 +214,9 @@ var CliError = class extends Error {
|
|
|
183
214
|
if (causeText) out += `
|
|
184
215
|
\u539F\u56E0: ${causeText}`;
|
|
185
216
|
}
|
|
217
|
+
const localDiagnosis = this.context?.localDiagnosis;
|
|
218
|
+
if (typeof localDiagnosis === "string" && localDiagnosis) out += `
|
|
219
|
+
\u8BCA\u65AD: ${localDiagnosis}`;
|
|
186
220
|
const nextStep = this.context?.nextStep;
|
|
187
221
|
if (typeof nextStep === "string" && nextStep) out += `
|
|
188
222
|
\u4E0B\u4E00\u6B65: ${nextStep}`;
|
|
@@ -206,8 +240,9 @@ function fromAxiosError(err, profile) {
|
|
|
206
240
|
const respMsg = body?.message;
|
|
207
241
|
const respField = body?.field;
|
|
208
242
|
const respDetails = body?.details;
|
|
209
|
-
const respNextStep = body?.nextStep;
|
|
243
|
+
const respNextStep = body?.next_step ?? body?.nextStep;
|
|
210
244
|
const respRetryable = body?.retryable;
|
|
245
|
+
const localDiagnosis = respCode === REJECTED_BEFORE_ROUTING_CODE ? diagnoseRejectedBeforeRouting(err.config?.url, err.config?.baseURL) : void 0;
|
|
211
246
|
let code;
|
|
212
247
|
if (status === 401) code = "AUTH_FAILED" /* AUTH_FAILED */;
|
|
213
248
|
else if (status === 403) code = "SCOPE_FORBIDDEN" /* SCOPE_FORBIDDEN */;
|
|
@@ -228,7 +263,9 @@ function fromAxiosError(err, profile) {
|
|
|
228
263
|
...respField ? { field: respField } : {},
|
|
229
264
|
...respDetails !== void 0 ? { details: respDetails } : {},
|
|
230
265
|
...respNextStep ? { nextStep: respNextStep } : {},
|
|
231
|
-
...respRetryable !== void 0 ? { retryable: respRetryable } : {}
|
|
266
|
+
...respRetryable !== void 0 ? { retryable: respRetryable } : {},
|
|
267
|
+
// 与后端的 nextStep 并存、不互相覆盖:一个是服务端的通用路标,一个是本地对症结论。
|
|
268
|
+
...localDiagnosis ? { localDiagnosis } : {}
|
|
232
269
|
},
|
|
233
270
|
traceId,
|
|
234
271
|
profile,
|
|
@@ -259,6 +296,17 @@ function formatCause(cause) {
|
|
|
259
296
|
}
|
|
260
297
|
|
|
261
298
|
// src/meta/describe.ts
|
|
299
|
+
var HCM_FIELD_RAW_KEYS = [
|
|
300
|
+
"key",
|
|
301
|
+
"name",
|
|
302
|
+
"type",
|
|
303
|
+
"isRequired",
|
|
304
|
+
"description",
|
|
305
|
+
"enums",
|
|
306
|
+
"object",
|
|
307
|
+
"objectLabel",
|
|
308
|
+
"isI18n"
|
|
309
|
+
];
|
|
262
310
|
function normalizeActionParams(action3) {
|
|
263
311
|
if (action3.parameters) return action3.parameters;
|
|
264
312
|
if (action3.params) return action3.params;
|
|
@@ -281,7 +329,9 @@ async function describe(http, model, _opts = {}) {
|
|
|
281
329
|
type: f.type ?? "unknown",
|
|
282
330
|
required: f.isRequired,
|
|
283
331
|
description: f.description,
|
|
284
|
-
|
|
332
|
+
// 只在真有值时出这一位,口径同下面的 object / i18n:绝大多数字段没有值域,
|
|
333
|
+
// 无条件出一个 `enums: undefined` 会让 --output json 每个字段都多一行噪声。
|
|
334
|
+
...f.enums?.length ? { enums: f.enums } : {},
|
|
285
335
|
// 只在有值时出这两位:没有关联目标的普通字段不该多两行 `object: undefined` 噪声
|
|
286
336
|
...f.object ? { object: f.object } : {},
|
|
287
337
|
...f.objectLabel ? { objectLabel: f.objectLabel } : {},
|
|
@@ -423,6 +473,55 @@ var manifest = JSON.parse(
|
|
|
423
473
|
);
|
|
424
474
|
var SDK_VERSION = manifest.version;
|
|
425
475
|
|
|
476
|
+
// src/http/endpoint.ts
|
|
477
|
+
function assertUsableEndpoint(endpoint, field = "endpoint") {
|
|
478
|
+
const fail2 = (message, nextStep) => {
|
|
479
|
+
throw new CliError({
|
|
480
|
+
code: "INVALID_ARGUMENT" /* INVALID_ARGUMENT */,
|
|
481
|
+
message,
|
|
482
|
+
context: { field, nextStep }
|
|
483
|
+
});
|
|
484
|
+
};
|
|
485
|
+
if (!endpoint) {
|
|
486
|
+
return fail2(
|
|
487
|
+
`${field} \u4E0D\u80FD\u4E3A\u7A7A\u3002`,
|
|
488
|
+
"\u5F62\u5982 https://hcm.example.com\uFF08\u53EF\u5E26\u90E8\u7F72\u524D\u7F00\uFF0C\u5982 https://host/hcm\uFF09"
|
|
489
|
+
);
|
|
490
|
+
}
|
|
491
|
+
let url;
|
|
492
|
+
try {
|
|
493
|
+
url = new URL(endpoint);
|
|
494
|
+
} catch {
|
|
495
|
+
return fail2(
|
|
496
|
+
`${field} '${endpoint}' \u4E0D\u662F\u5408\u6CD5\u7684 URL\u3002`,
|
|
497
|
+
"\u8981\u5E26\u534F\u8BAE\u5934\uFF0C\u5F62\u5982 https://hcm.example.com \u2014\u2014 \u53EA\u5199\u4E3B\u673A\u540D\uFF08hcm.example.com\uFF09\u89E3\u6790\u4E0D\u4E86"
|
|
498
|
+
);
|
|
499
|
+
}
|
|
500
|
+
if (url.protocol !== "http:" && url.protocol !== "https:") {
|
|
501
|
+
return fail2(
|
|
502
|
+
`${field} '${endpoint}' \u7684\u534F\u8BAE\u662F ${url.protocol.replace(":", "")}\uFF0C\u53EA\u652F\u6301 http / https\u3002`,
|
|
503
|
+
"\u6539\u6210 https://\u2026 \u6216 http://\u2026"
|
|
504
|
+
);
|
|
505
|
+
}
|
|
506
|
+
if (url.search) {
|
|
507
|
+
return fail2(
|
|
508
|
+
`${field} '${endpoint}' \u5E26\u4E86\u67E5\u8BE2\u4E32 '${url.search}'\uFF0C\u57FA\u5740\u4E0D\u80FD\u5E26\u67E5\u8BE2\u4E32\u3002`,
|
|
509
|
+
`\u53BB\u6389 '${url.search}' \u540E\u91CD\u8BD5`
|
|
510
|
+
);
|
|
511
|
+
}
|
|
512
|
+
if (url.hash) {
|
|
513
|
+
return fail2(
|
|
514
|
+
`${field} '${endpoint}' \u5E26\u4E86\u951A\u70B9 '${url.hash}'\uFF0C\u57FA\u5740\u4E0D\u80FD\u5E26\u951A\u70B9\u3002`,
|
|
515
|
+
`\u53BB\u6389 '${url.hash}' \u540E\u91CD\u8BD5`
|
|
516
|
+
);
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
function normalizeAndAssertEndpoint(raw, field = "endpoint") {
|
|
520
|
+
const result = normalizeEndpoint(raw);
|
|
521
|
+
assertUsableEndpoint(result.normalized, field);
|
|
522
|
+
return result;
|
|
523
|
+
}
|
|
524
|
+
|
|
426
525
|
// src/http/client.ts
|
|
427
526
|
var DEFAULT_HTTP_TIMEOUT_MS = 6e4;
|
|
428
527
|
var HCM_LANG_ENV = "HCM_LANG";
|
|
@@ -435,7 +534,10 @@ function toAcceptLanguage(language) {
|
|
|
435
534
|
function createHttpClient(opts) {
|
|
436
535
|
const acceptLanguage = toAcceptLanguage(opts.language ?? process.env[HCM_LANG_ENV]);
|
|
437
536
|
const client = axios.create({
|
|
438
|
-
|
|
537
|
+
// 走相对路径时 axios 的 combineURLs 自己会吃掉尾斜杠,这里归一是为了让
|
|
538
|
+
// `danger-env` 那条 `new URL(request.baseURL!)` 以及任何读 baseURL 的地方
|
|
539
|
+
// 看到的都是同一个规范形态 —— 判据不该因为用户多打了一个 `/` 而分岔。
|
|
540
|
+
baseURL: normalizeEndpoint(opts.endpoint).normalized,
|
|
439
541
|
timeout: opts.timeoutMs ?? DEFAULT_HTTP_TIMEOUT_MS,
|
|
440
542
|
headers: {
|
|
441
543
|
"User-Agent": opts.userAgent ?? `hcmai-sdk/${SDK_VERSION}`,
|
|
@@ -528,6 +630,11 @@ function assertNotReservedEnvName(name) {
|
|
|
528
630
|
});
|
|
529
631
|
}
|
|
530
632
|
}
|
|
633
|
+
function normalizeEnvAddresses(cfg) {
|
|
634
|
+
const out = { ...cfg, endpoint: normalizeEndpoint(cfg.endpoint).normalized };
|
|
635
|
+
if (cfg.frontend !== void 0) out.frontend = normalizeEndpoint(cfg.frontend).normalized;
|
|
636
|
+
return out;
|
|
637
|
+
}
|
|
531
638
|
async function saveEnv(name, cfg) {
|
|
532
639
|
if (!cfg.endpoint) {
|
|
533
640
|
throw new CliError({
|
|
@@ -536,12 +643,12 @@ async function saveEnv(name, cfg) {
|
|
|
536
643
|
});
|
|
537
644
|
}
|
|
538
645
|
await fs.mkdir(envDir(name), { recursive: true });
|
|
539
|
-
await fs.writeFile(envFile(name), yaml.dump(cfg), "utf-8");
|
|
646
|
+
await fs.writeFile(envFile(name), yaml.dump(normalizeEnvAddresses(cfg)), "utf-8");
|
|
540
647
|
}
|
|
541
648
|
async function loadEnv(name) {
|
|
542
649
|
try {
|
|
543
650
|
const content = await fs.readFile(envFile(name), "utf-8");
|
|
544
|
-
return yaml.load(content);
|
|
651
|
+
return normalizeEnvAddresses(yaml.load(content));
|
|
545
652
|
} catch (e) {
|
|
546
653
|
if (e.code === "ENOENT") {
|
|
547
654
|
throw new CliError({
|
|
@@ -1954,12 +2061,12 @@ var HcmClient = class _HcmClient {
|
|
|
1954
2061
|
closeEphemeralSession;
|
|
1955
2062
|
constructor(opts) {
|
|
1956
2063
|
this.profile = opts.profile ?? "default";
|
|
1957
|
-
this.endpoint = opts.endpoint;
|
|
2064
|
+
this.endpoint = normalizeEndpoint(opts.endpoint).normalized;
|
|
1958
2065
|
this.tenantId = opts.tenantId;
|
|
1959
2066
|
this.tokenStore = new TokenStore(this.profile);
|
|
1960
2067
|
this.explicitToken = opts.accessToken;
|
|
1961
2068
|
this.http = createHttpClient({
|
|
1962
|
-
endpoint:
|
|
2069
|
+
endpoint: this.endpoint,
|
|
1963
2070
|
timeoutMs: opts.timeoutMs,
|
|
1964
2071
|
environmentSafety: opts.environmentSafety,
|
|
1965
2072
|
getAccessToken: () => this.getAccessToken(),
|
|
@@ -2391,6 +2498,7 @@ import axios2 from "axios";
|
|
|
2391
2498
|
import { setTimeout as delay } from "timers/promises";
|
|
2392
2499
|
var CLI_AUTHORIZE_PATH = "/api/auth/cli/authorize";
|
|
2393
2500
|
var CLI_EXCHANGE_PATH = "/api/auth/cli/exchange";
|
|
2501
|
+
var CLI_STATUS_PATH = "/api/auth/cli/status";
|
|
2394
2502
|
var CLI_VERIFICATION_PATH = "/cli/authorize";
|
|
2395
2503
|
function protocol(message) {
|
|
2396
2504
|
return new CliError({
|
|
@@ -2399,11 +2507,57 @@ function protocol(message) {
|
|
|
2399
2507
|
context: { nextStep: "\u68C0\u67E5\u540E\u7AEF CLI \u6388\u6743\u63A5\u53E3\u7248\u672C\uFF1B\u672C\u6B21\u6CA1\u6709\u4FDD\u5B58\u767B\u5F55\u51ED\u636E\u3002" }
|
|
2400
2508
|
});
|
|
2401
2509
|
}
|
|
2402
|
-
function
|
|
2510
|
+
function diagnoseExpiry(lastRejection, probe) {
|
|
2511
|
+
if (probe?.lastStatus === "DENIED") return "denied";
|
|
2512
|
+
if (probe?.lastStatus === "APPROVED") return "approved";
|
|
2513
|
+
if (lastRejection) return "blocked";
|
|
2514
|
+
if (probe && !probe.supported) return "unsupported";
|
|
2515
|
+
if (probe && probe.answeredAt === void 0) return "unreachable";
|
|
2516
|
+
if (probe?.answeredAt !== void 0 && probe.deadline - probe.answeredAt > BROWSER_STATUS_INTERVAL_MS) return "stale";
|
|
2517
|
+
return "quiet";
|
|
2518
|
+
}
|
|
2519
|
+
var expiryCopy = {
|
|
2520
|
+
denied: {
|
|
2521
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\u3002\u6388\u6743\u9875\u4E0A\u8FD9\u6B21\u767B\u5F55\u88AB\u62D2\u7EDD\u4E86\uFF0C\u6240\u4EE5\u8FD9\u53F0\u673A\u5668\u4E00\u76F4\u6CA1\u7B49\u5230\u56DE\u8DF3\u3002",
|
|
2522
|
+
nextStep: "\u5982\u679C\u4E0D\u662F\u4F60\u672C\u4EBA\u70B9\u7684\u62D2\u7EDD\uFF0C\u8BF4\u660E\u8FD9\u6761\u6388\u6743\u94FE\u63A5\u843D\u5230\u4E86\u522B\u4EBA\u624B\u91CC\uFF1B\u91CD\u65B0\u8FD0\u884C hcm login \u4F1A\u6362\u4E00\u6761\u65B0\u94FE\u63A5\u3002"
|
|
2523
|
+
},
|
|
2524
|
+
approved: {
|
|
2525
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\u3002\u6388\u6743\u5728\u6D4F\u89C8\u5668\u4E0A\u5DF2\u7ECF\u6279\u51C6\u4E86\uFF0C\u4F46\u8FD9\u53F0\u673A\u5668\u4E00\u76F4\u6CA1\u6536\u5230\u56DE\u8DF3\u2014\u2014\u6388\u6743\u9875\u591A\u534A\u662F\u5728\u522B\u7684\u673A\u5668\u4E0A\u6253\u5F00\u7684\u3002",
|
|
2526
|
+
nextStep: "\u6388\u6743\u9875\u8981\u5728\u300C\u8FD9\u53F0\u300D\u673A\u5668\u7684\u6D4F\u89C8\u5668\u91CC\u6253\u5F00\uFF1B\u8FDC\u7A0B/\u65E0\u6D4F\u89C8\u5668\u7EC8\u7AEF\u8BF7\u6539\u7528 hcm login --device-auth\u3002"
|
|
2527
|
+
},
|
|
2528
|
+
blocked: {
|
|
2529
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\uFF1B\u671F\u95F4\u6709\u4EBA\u6253\u5F00\u8FC7\u6388\u6743\u94FE\u63A5\uFF0C\u4F46\u6BCF\u6B21\u90FD\u88AB\u6321\u4E0B\uFF0C\u672C\u6B21\u6CA1\u6709\u5B8C\u6210\u767B\u5F55\u3002",
|
|
2530
|
+
nextStep: "\u5148\u5904\u7406\u4E0A\u9762\u90A3\u6761\u62D2\u7EDD\u539F\u56E0\uFF0C\u518D\u91CD\u65B0\u8FD0\u884C hcm login\u3002"
|
|
2531
|
+
},
|
|
2532
|
+
unsupported: {
|
|
2533
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\uFF0C\u672C\u6B21\u6CA1\u6709\u5B8C\u6210\u767B\u5F55\u3002\u8FD9\u4E2A\u540E\u7AEF\u8FD8\u4E0D\u652F\u6301\u5728\u7B49\u5F85\u671F\u95F4\u67E5\u770B\u88AB\u6321\u539F\u56E0\uFF0C\u6240\u4EE5\u8FD9\u4E00\u5934\u770B\u4E0D\u51FA\u6709\u6CA1\u6709\u4EBA\u6253\u5F00\u8FC7\u94FE\u63A5\u3002",
|
|
2534
|
+
nextStep: "\u5347\u7EA7\u670D\u52A1\u7AEF\u540E\uFF0C\u7B49\u5F85\u671F\u95F4\u5C31\u80FD\u770B\u5230\u88AB\u6321\u539F\u56E0\uFF1B\u672C\u6B21\u8BF7\u91CD\u65B0\u8FD0\u884C hcm login\u3002"
|
|
2535
|
+
},
|
|
2536
|
+
unreachable: {
|
|
2537
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\uFF0C\u672C\u6B21\u6CA1\u6709\u5B8C\u6210\u767B\u5F55\u3002\u7B49\u5F85\u671F\u95F4\u8FD9\u4E00\u5934\u4E00\u6B21\u90FD\u6CA1\u95EE\u901A\u72B6\u6001\u63A5\u53E3\uFF0C\u6240\u4EE5\u770B\u4E0D\u51FA\u6709\u6CA1\u6709\u4EBA\u6253\u5F00\u8FC7\u94FE\u63A5\u3002",
|
|
2538
|
+
nextStep: "\u672C\u6B21\u8BF7\u91CD\u65B0\u8FD0\u884C hcm login\uFF1B\u82E5\u53CD\u590D\u5982\u6B64\uFF0C\u591A\u534A\u662F\u7F51\u7EDC\u4E0D\u901A\u6216\u670D\u52A1\u7AEF\u9650\u6D41\u6321\u4F4F\u4E86\u72B6\u6001\u67E5\u8BE2\u3002"
|
|
2539
|
+
},
|
|
2540
|
+
stale: {
|
|
2541
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\uFF0C\u672C\u6B21\u6CA1\u6709\u5B8C\u6210\u767B\u5F55\u3002\u72B6\u6001\u67E5\u8BE2\u5728\u6700\u540E\u4E00\u6BB5\u65F6\u95F4\u91CC\u6CA1\u80FD\u95EE\u901A\uFF0C\u90A3\u6BB5\u65F6\u95F4\u91CC\u53D1\u751F\u4E86\u4EC0\u4E48\u8FD9\u4E00\u5934\u770B\u4E0D\u5230\u3002",
|
|
2542
|
+
nextStep: "\u672C\u6B21\u8BF7\u91CD\u65B0\u8FD0\u884C hcm login\uFF1B\u82E5\u53CD\u590D\u5982\u6B64\uFF0C\u591A\u534A\u662F\u670D\u52A1\u7AEF\u9650\u6D41\u6321\u4F4F\u4E86\u72B6\u6001\u67E5\u8BE2\u3002"
|
|
2543
|
+
},
|
|
2544
|
+
quiet: {
|
|
2545
|
+
message: "\u767B\u5F55\u6388\u6743\u7B49\u5F85\u5DF2\u5230\u671F\uFF0C\u672C\u6B21\u6CA1\u6709\u5B8C\u6210\u767B\u5F55\u3002",
|
|
2546
|
+
nextStep: "\u91CD\u65B0\u8FD0\u884C hcm login \u53D1\u8D77\u65B0\u6388\u6743\u3002"
|
|
2547
|
+
}
|
|
2548
|
+
};
|
|
2549
|
+
function cliAuthorizationExpired(lastRejection, probe) {
|
|
2550
|
+
const diagnosis = diagnoseExpiry(lastRejection, probe);
|
|
2551
|
+
const copy = expiryCopy[diagnosis];
|
|
2403
2552
|
return new CliError({
|
|
2404
2553
|
code: "AUTH_EXPIRED" /* AUTH_EXPIRED */,
|
|
2405
|
-
message:
|
|
2406
|
-
context: {
|
|
2554
|
+
message: copy.message,
|
|
2555
|
+
context: {
|
|
2556
|
+
...lastRejection ? { lastRejection } : {},
|
|
2557
|
+
...diagnosis === "denied" || diagnosis === "approved" ? { lastStatus: probe?.lastStatus } : {},
|
|
2558
|
+
...diagnosis === "unsupported" || diagnosis === "unreachable" || diagnosis === "stale" ? { statusProbe: diagnosis } : {},
|
|
2559
|
+
nextStep: copy.nextStep
|
|
2560
|
+
}
|
|
2407
2561
|
});
|
|
2408
2562
|
}
|
|
2409
2563
|
function checkCancelled(signal) {
|
|
@@ -2437,6 +2591,7 @@ function safeCliAuthorizationError(error) {
|
|
|
2437
2591
|
const unsupported = known === void 0 && unsupportedBackend(status);
|
|
2438
2592
|
const code = unsupported ? "PROTOCOL_UNSUPPORTED" /* PROTOCOL_UNSUPPORTED */ : timedOut ? "TIMEOUT" /* TIMEOUT */ : status === 401 ? "AUTH_FAILED" /* AUTH_FAILED */ : status === 403 ? "SCOPE_FORBIDDEN" /* SCOPE_FORBIDDEN */ : status && status >= 500 ? "SERVER_ERROR" /* SERVER_ERROR */ : status ? "AUTH_FAILED" /* AUTH_FAILED */ : "NETWORK_ERROR" /* NETWORK_ERROR */;
|
|
2439
2593
|
const interval = error.response?.data?.error?.details?.interval;
|
|
2594
|
+
const lastRejection = rejectionOf(error.response?.data?.error?.details);
|
|
2440
2595
|
return new CliError({
|
|
2441
2596
|
code,
|
|
2442
2597
|
message: unsupported ? "\u540E\u7AEF\u5C1A\u4E0D\u652F\u6301\u6D4F\u89C8\u5668/\u8BBE\u5907\u7801\u767B\u5F55\uFF0C\u9700\u8981\u5347\u7EA7\u670D\u52A1\u7AEF\u3002" : timedOut ? "\u767B\u5F55\u6388\u6743\u8BF7\u6C42\u8D85\u65F6\uFF0C\u5B8C\u6210\u72B6\u6001\u672A\u786E\u8BA4\u3002" : known ? errorMessages[known] : status === 401 ? "\u6388\u6743\u670D\u52A1\u8981\u6C42\u91CD\u65B0\u767B\u5F55\u3002" : "\u670D\u52A1\u7AEF\u8FD4\u56DE\u672A\u77E5\u6388\u6743\u9519\u8BEF\uFF0C\u5DF2\u505C\u6B62\u767B\u5F55\u3002",
|
|
@@ -2444,6 +2599,7 @@ function safeCliAuthorizationError(error) {
|
|
|
2444
2599
|
...status !== void 0 ? { status } : {},
|
|
2445
2600
|
responseCode: known ?? "unrecognized_response",
|
|
2446
2601
|
...known === "slow_down" && typeof interval === "number" ? { interval } : {},
|
|
2602
|
+
...lastRejection ? { lastRejection } : {},
|
|
2447
2603
|
...timedOut ? { requestTimeout: true } : {},
|
|
2448
2604
|
nextStep: unsupported ? "\u5347\u7EA7\u540E\u7AEF\u4E0E\u524D\u7AEF\uFF1B\u65E7\u7248\u53EF\u5728\u7F51\u9875\u201C\u547D\u4EE4\u884C\u5DE5\u5177\u201D\u751F\u6210\u914D\u5BF9\u7801\uFF0C\u518D\u8FD0\u884C hcm login --code <\u914D\u5BF9\u7801>\u3002" : known === "authorization_pending" || known === "slow_down" ? "\u7B49\u5F85\u540C\u4E00\u6388\u6743\u5B8C\u6210\u3002" : "\u6838\u5BF9\u6388\u6743\u72B6\u6001\u540E\u91CD\u65B0\u8FD0\u884C hcm login\uFF1B\u672C\u6B21\u4E0D\u4F1A\u81EA\u52A8\u91CD\u65B0\u53D1\u8D77\u6388\u6743\u3002"
|
|
2449
2605
|
}
|
|
@@ -2455,6 +2611,11 @@ function positive(value) {
|
|
|
2455
2611
|
function text(value) {
|
|
2456
2612
|
return typeof value === "string" && value.length > 0;
|
|
2457
2613
|
}
|
|
2614
|
+
function rejectionOf(details) {
|
|
2615
|
+
const raw = details?.lastRejection;
|
|
2616
|
+
if (!raw || typeof raw !== "object" || !text(raw.reason) || !/^[a-z_]{1,64}$/.test(raw.reason) || !positive(raw.at)) return void 0;
|
|
2617
|
+
return { reason: raw.reason, at: raw.at };
|
|
2618
|
+
}
|
|
2458
2619
|
function validateCliAuthorizationUrl(raw, label) {
|
|
2459
2620
|
let url;
|
|
2460
2621
|
try {
|
|
@@ -2596,16 +2757,70 @@ async function exchangeBrowserAuthorization(input) {
|
|
|
2596
2757
|
}, Math.min(3e4, remaining));
|
|
2597
2758
|
return readLoginResponse(input, data, "browser");
|
|
2598
2759
|
}
|
|
2760
|
+
var BROWSER_STATUS_INTERVAL_MS = 5e3;
|
|
2761
|
+
var BROWSER_STATUS_MAX_INTERVAL_MS = 6e4;
|
|
2762
|
+
function watchBrowserAuthorization(input) {
|
|
2763
|
+
let stopped = false;
|
|
2764
|
+
let last;
|
|
2765
|
+
let interval = BROWSER_STATUS_INTERVAL_MS;
|
|
2766
|
+
let supported = true;
|
|
2767
|
+
let answeredAt;
|
|
2768
|
+
let lastStatus;
|
|
2769
|
+
void (async () => {
|
|
2770
|
+
while (!stopped) {
|
|
2771
|
+
const remaining = input.deadline - Date.now();
|
|
2772
|
+
if (remaining <= 0) return;
|
|
2773
|
+
try {
|
|
2774
|
+
await delay(Math.min(interval, remaining), void 0, { signal: input.signal });
|
|
2775
|
+
} catch {
|
|
2776
|
+
return;
|
|
2777
|
+
}
|
|
2778
|
+
if (stopped || Date.now() >= input.deadline) return;
|
|
2779
|
+
try {
|
|
2780
|
+
const data = await post(
|
|
2781
|
+
input,
|
|
2782
|
+
CLI_STATUS_PATH,
|
|
2783
|
+
{ requestId: input.requestId, state: input.state },
|
|
2784
|
+
1e4
|
|
2785
|
+
);
|
|
2786
|
+
interval = BROWSER_STATUS_INTERVAL_MS;
|
|
2787
|
+
answeredAt = Date.now();
|
|
2788
|
+
if (typeof data?.status === "string") {
|
|
2789
|
+
lastStatus = data.status;
|
|
2790
|
+
}
|
|
2791
|
+
const rejection = rejectionOf(data);
|
|
2792
|
+
if (rejection && (rejection.at !== last?.at || rejection.reason !== last.reason)) {
|
|
2793
|
+
last = rejection;
|
|
2794
|
+
input.onRejection(rejection);
|
|
2795
|
+
}
|
|
2796
|
+
} catch (error) {
|
|
2797
|
+
if (safeCliAuthorizationError(error).code === "PROTOCOL_UNSUPPORTED" /* PROTOCOL_UNSUPPORTED */) {
|
|
2798
|
+
supported = false;
|
|
2799
|
+
return;
|
|
2800
|
+
}
|
|
2801
|
+
interval = Math.min(interval * 2, BROWSER_STATUS_MAX_INTERVAL_MS);
|
|
2802
|
+
}
|
|
2803
|
+
}
|
|
2804
|
+
})();
|
|
2805
|
+
return {
|
|
2806
|
+
stop: () => {
|
|
2807
|
+
stopped = true;
|
|
2808
|
+
},
|
|
2809
|
+
lastRejection: () => last,
|
|
2810
|
+
probe: () => ({ supported, answeredAt, lastStatus, deadline: input.deadline })
|
|
2811
|
+
};
|
|
2812
|
+
}
|
|
2599
2813
|
async function pollDeviceAuthorization(input) {
|
|
2600
2814
|
let serverInterval = input.authorization.interval * 1e3;
|
|
2601
2815
|
let interval = serverInterval;
|
|
2816
|
+
let lastRejection;
|
|
2602
2817
|
while (Date.now() < input.authorization.deadline) {
|
|
2603
2818
|
checkCancelled(input.signal);
|
|
2604
2819
|
try {
|
|
2605
2820
|
await delay(Math.min(interval, input.authorization.deadline - Date.now()), void 0, { signal: input.signal });
|
|
2606
2821
|
} catch {
|
|
2607
2822
|
checkCancelled(input.signal);
|
|
2608
|
-
throw cliAuthorizationExpired();
|
|
2823
|
+
throw cliAuthorizationExpired(lastRejection);
|
|
2609
2824
|
}
|
|
2610
2825
|
const remaining = input.authorization.deadline - Date.now();
|
|
2611
2826
|
if (remaining <= 0) break;
|
|
@@ -2616,7 +2831,14 @@ async function pollDeviceAuthorization(input) {
|
|
|
2616
2831
|
const failure = safeCliAuthorizationError(error);
|
|
2617
2832
|
const status = failure.context?.status;
|
|
2618
2833
|
const code = failure.context?.responseCode;
|
|
2619
|
-
if (status === 400 && code === "authorization_pending")
|
|
2834
|
+
if (status === 400 && code === "authorization_pending") {
|
|
2835
|
+
const rejection = failure.context?.lastRejection;
|
|
2836
|
+
if (rejection && (rejection.at !== lastRejection?.at || rejection.reason !== lastRejection.reason)) {
|
|
2837
|
+
lastRejection = rejection;
|
|
2838
|
+
input.onRejection?.(rejection);
|
|
2839
|
+
}
|
|
2840
|
+
continue;
|
|
2841
|
+
}
|
|
2620
2842
|
if (status === 400 && code === "slow_down") {
|
|
2621
2843
|
const seconds = failure.context?.interval;
|
|
2622
2844
|
if (!positive(seconds) || seconds > 900 || seconds * 1e3 < serverInterval) throw protocol("slow_down \u672A\u8FD4\u56DE\u6709\u6548\u4E14\u4E0D\u51CF\u901F\u7684 interval\uFF0C\u5DF2\u505C\u6B62\u8F6E\u8BE2\u3002");
|
|
@@ -2632,7 +2854,7 @@ async function pollDeviceAuthorization(input) {
|
|
|
2632
2854
|
throw failure;
|
|
2633
2855
|
}
|
|
2634
2856
|
}
|
|
2635
|
-
throw cliAuthorizationExpired();
|
|
2857
|
+
throw cliAuthorizationExpired(lastRejection);
|
|
2636
2858
|
}
|
|
2637
2859
|
|
|
2638
2860
|
// src/auth/change-password.ts
|
|
@@ -2879,12 +3101,17 @@ function classifyMessage(parsed) {
|
|
|
2879
3101
|
return "connection";
|
|
2880
3102
|
}
|
|
2881
3103
|
var HANDSHAKE_TOKEN_QUERY_PARAM = "token";
|
|
3104
|
+
var HANDSHAKE_CONVERSATION_QUERY_PARAM = "conversationId";
|
|
2882
3105
|
var HANDSHAKE_AUTH_ERROR_HEADER = "x-websocket-auth-error";
|
|
3106
|
+
var CONTROL_BUFFER_LIMIT = 16;
|
|
2883
3107
|
var HANDSHAKE_BODY_CAP = 4096;
|
|
2884
3108
|
var HANDSHAKE_BODY_WAIT_MS = 2e3;
|
|
2885
|
-
function buildHandshakeUrl(endpoint, token) {
|
|
3109
|
+
function buildHandshakeUrl(endpoint, token, conversationId) {
|
|
2886
3110
|
const url = new URL(endpoint);
|
|
2887
3111
|
url.searchParams.set(HANDSHAKE_TOKEN_QUERY_PARAM, token);
|
|
3112
|
+
if (conversationId && conversationId.trim()) {
|
|
3113
|
+
url.searchParams.set(HANDSHAKE_CONVERSATION_QUERY_PARAM, conversationId.trim());
|
|
3114
|
+
}
|
|
2888
3115
|
return url.toString();
|
|
2889
3116
|
}
|
|
2890
3117
|
function conversationWebSocketEndpoint(endpoint) {
|
|
@@ -2893,8 +3120,8 @@ function conversationWebSocketEndpoint(endpoint) {
|
|
|
2893
3120
|
url.pathname = url.pathname.replace(/\/$/, "") + "/ws/conversation";
|
|
2894
3121
|
return url.toString();
|
|
2895
3122
|
}
|
|
2896
|
-
function createHandshakeSocket(endpoint, token, handshakeTimeout) {
|
|
2897
|
-
return new WebSocket(buildHandshakeUrl(endpoint, token), {
|
|
3123
|
+
function createHandshakeSocket(endpoint, token, handshakeTimeout, conversationId) {
|
|
3124
|
+
return new WebSocket(buildHandshakeUrl(endpoint, token, conversationId), {
|
|
2898
3125
|
headers: { Authorization: `Bearer ${token}` },
|
|
2899
3126
|
...handshakeTimeout === void 0 ? {} : { handshakeTimeout }
|
|
2900
3127
|
});
|
|
@@ -2984,6 +3211,16 @@ var WsClient = class {
|
|
|
2984
3211
|
disconnectHandlers = /* @__PURE__ */ new Set();
|
|
2985
3212
|
/** 由 close()/ensureConnected 主动关闭 → 不广播 disconnect(非异常断连)。 */
|
|
2986
3213
|
intentionalClose = false;
|
|
3214
|
+
/**
|
|
3215
|
+
* issue #257:零订阅者时到达的控制帧。
|
|
3216
|
+
*
|
|
3217
|
+
* 后端 `redeliverPending` 的重投帧跟 `auth_success` 挨着发,而 CLI 挂上 onControl
|
|
3218
|
+
* 要晚好几个网络往返(timeline 回放、附件上传)。`dispatchControl` 的循环在零订阅者时
|
|
3219
|
+
* 一次都不转 —— 帧静默消失,与「后端根本没发」完全同形。攒着,等第一个订阅者来取。
|
|
3220
|
+
*/
|
|
3221
|
+
controlBuffer = [];
|
|
3222
|
+
/** 缓冲区溢出丢掉的帧数。丢可以,静默丢不行——调用方要分得清「没发」与「我扔了」。 */
|
|
3223
|
+
droppedControl = 0;
|
|
2987
3224
|
/**
|
|
2988
3225
|
* 订阅「流进行中 socket 异常断连」(后端重启 / 网络闪断)。主动 close() 不触发。
|
|
2989
3226
|
* iterator 订阅它 → 断连时 finish()(incomplete 终态),杜绝 await consume 永久挂死。
|
|
@@ -3012,7 +3249,8 @@ var WsClient = class {
|
|
|
3012
3249
|
message: "no access token; run `hcm login`"
|
|
3013
3250
|
});
|
|
3014
3251
|
}
|
|
3015
|
-
this.
|
|
3252
|
+
this.controlBuffer = [];
|
|
3253
|
+
this.ws = createHandshakeSocket(this.opts.endpoint, tok, void 0, this.opts.conversationId);
|
|
3016
3254
|
return new Promise((resolve6, reject2) => {
|
|
3017
3255
|
const settle = (fn) => {
|
|
3018
3256
|
off();
|
|
@@ -3133,10 +3371,22 @@ var WsClient = class {
|
|
|
3133
3371
|
onControl(fn) {
|
|
3134
3372
|
const h = { kind: "control", fn };
|
|
3135
3373
|
this.handlers.push(h);
|
|
3374
|
+
if (this.controlBuffer.length) {
|
|
3375
|
+
const pending2 = this.controlBuffer;
|
|
3376
|
+
this.controlBuffer = [];
|
|
3377
|
+
for (const ev of pending2) fn(ev);
|
|
3378
|
+
}
|
|
3136
3379
|
return () => {
|
|
3137
3380
|
this.handlers = this.handlers.filter((x) => x !== h);
|
|
3138
3381
|
};
|
|
3139
3382
|
}
|
|
3383
|
+
/**
|
|
3384
|
+
* 建连窗口里被缓冲区挤掉的控制帧数(填空必自陈)。
|
|
3385
|
+
* 非 0 意味着这条连接错过了那么多张确认卡 / 追问,调用方该据此提示用户去列一次未决暂停。
|
|
3386
|
+
*/
|
|
3387
|
+
droppedControlFrames() {
|
|
3388
|
+
return this.droppedControl;
|
|
3389
|
+
}
|
|
3140
3390
|
isReady() {
|
|
3141
3391
|
return this.ready;
|
|
3142
3392
|
}
|
|
@@ -3208,7 +3458,18 @@ var WsClient = class {
|
|
|
3208
3458
|
for (const h of this.handlers) if (h.kind === "connection") h.fn(msg);
|
|
3209
3459
|
}
|
|
3210
3460
|
dispatchControl(ev) {
|
|
3211
|
-
|
|
3461
|
+
const subscribers = this.handlers.filter(
|
|
3462
|
+
(h) => h.kind === "control"
|
|
3463
|
+
);
|
|
3464
|
+
if (!subscribers.length) {
|
|
3465
|
+
this.controlBuffer.push(ev);
|
|
3466
|
+
while (this.controlBuffer.length > CONTROL_BUFFER_LIMIT) {
|
|
3467
|
+
this.controlBuffer.shift();
|
|
3468
|
+
this.droppedControl++;
|
|
3469
|
+
}
|
|
3470
|
+
return;
|
|
3471
|
+
}
|
|
3472
|
+
for (const h of subscribers) h.fn(ev);
|
|
3212
3473
|
}
|
|
3213
3474
|
};
|
|
3214
3475
|
|
|
@@ -3257,6 +3518,7 @@ function buildSteer(content, conversationId) {
|
|
|
3257
3518
|
}
|
|
3258
3519
|
|
|
3259
3520
|
// src/chat/stream-iterator.ts
|
|
3521
|
+
var SERVER_ERROR_GRACE_MS = 300;
|
|
3260
3522
|
async function sendMessageAndStream(ws, prompt, opts = {}) {
|
|
3261
3523
|
const conversationId = opts.conversationId ?? randomUUID2();
|
|
3262
3524
|
const commandId = randomUUID2();
|
|
@@ -3279,6 +3541,16 @@ async function sendMessageAndStream(ws, prompt, opts = {}) {
|
|
|
3279
3541
|
offDisconnect?.();
|
|
3280
3542
|
};
|
|
3281
3543
|
const offDisconnect = ws.onDisconnect?.(() => finish());
|
|
3544
|
+
let lastServerError = null;
|
|
3545
|
+
let serverErrorWaiters = [];
|
|
3546
|
+
ws.onConnection?.((msg) => {
|
|
3547
|
+
const m = msg;
|
|
3548
|
+
if (!m || m.type !== "error") return;
|
|
3549
|
+
lastServerError = { code: m.code, message: m.message };
|
|
3550
|
+
const waiting = serverErrorWaiters;
|
|
3551
|
+
serverErrorWaiters = [];
|
|
3552
|
+
for (const w of waiting) w(lastServerError);
|
|
3553
|
+
});
|
|
3282
3554
|
const off = ws.onEvent((ev) => {
|
|
3283
3555
|
if (done) return;
|
|
3284
3556
|
if (ev.requestId !== commandId) return;
|
|
@@ -3369,7 +3641,27 @@ async function sendMessageAndStream(ws, prompt, opts = {}) {
|
|
|
3369
3641
|
if (ev.conversationId === conversationId) fn(ev);
|
|
3370
3642
|
});
|
|
3371
3643
|
const sendCommand = (command) => ws.send(command);
|
|
3372
|
-
|
|
3644
|
+
const serverError = (graceMs = SERVER_ERROR_GRACE_MS) => {
|
|
3645
|
+
if (lastServerError) return Promise.resolve(lastServerError);
|
|
3646
|
+
if (graceMs <= 0) return Promise.resolve(null);
|
|
3647
|
+
return new Promise((resolve6) => {
|
|
3648
|
+
let settled = false;
|
|
3649
|
+
const onFrame = (f) => {
|
|
3650
|
+
if (settled) return;
|
|
3651
|
+
settled = true;
|
|
3652
|
+
clearTimeout(timer);
|
|
3653
|
+
resolve6(f);
|
|
3654
|
+
};
|
|
3655
|
+
const timer = setTimeout(() => {
|
|
3656
|
+
if (settled) return;
|
|
3657
|
+
settled = true;
|
|
3658
|
+
serverErrorWaiters = serverErrorWaiters.filter((w) => w !== onFrame);
|
|
3659
|
+
resolve6(null);
|
|
3660
|
+
}, graceMs);
|
|
3661
|
+
serverErrorWaiters.push(onFrame);
|
|
3662
|
+
});
|
|
3663
|
+
};
|
|
3664
|
+
return { conversationId, commandId, events, cancel, onControl, sendCommand, serverError };
|
|
3373
3665
|
}
|
|
3374
3666
|
|
|
3375
3667
|
// src/chat/delegation-constants.ts
|
|
@@ -3833,6 +4125,126 @@ async function fetchRecentConversations(http, limit = 10) {
|
|
|
3833
4125
|
return { rows: result.rows, total: result.total };
|
|
3834
4126
|
}
|
|
3835
4127
|
|
|
4128
|
+
// src/chat/interactions.ts
|
|
4129
|
+
var RESPOND_TIMEOUT_MS = 18e4;
|
|
4130
|
+
async function listPendingInteractions(http, agentId, conversationId) {
|
|
4131
|
+
const resp = await http.get(
|
|
4132
|
+
`/api/agents/${agentId}/conversations/${conversationId}/interactions`,
|
|
4133
|
+
{ params: { status: "pending" } }
|
|
4134
|
+
);
|
|
4135
|
+
const body = resp.data?.data ?? resp.data;
|
|
4136
|
+
const rows = Array.isArray(body?.interactions) ? body.interactions : [];
|
|
4137
|
+
return rows;
|
|
4138
|
+
}
|
|
4139
|
+
var RESPOND_NEXT_STEP = {
|
|
4140
|
+
// TOOL_EXECUTION_FAILED:这条路上它表达的是「确认已过期或不存在」(见 handleWriteConfirm 的 catch)
|
|
4141
|
+
"5006": "\u8BE5\u6682\u505C\u5DF2\u8FC7\u671F\uFF08\u9ED8\u8BA4 5 \u5206\u949F\uFF09\u6216\u5DF2\u88AB\u5904\u7406\uFF1A\u7528 `hcm interactions list --conversation <\u4F1A\u8BDD>` \u91CD\u65B0\u770B\u4E00\u773C\u8FD8\u5269\u54EA\u4E9B\uFF1B\u90FD\u6CA1\u6709\u4E86\u5C31\u91CD\u53D1\u539F\u59CB\u6307\u4EE4",
|
|
4142
|
+
"5004": "\u65E0\u6743\u56DE\u5E94\u6B64\u6682\u505C\uFF1A\u5B83\u5C5E\u4E8E\u522B\u7684\u7528\u6237\u6216\u522B\u7684\u4F1A\u8BDD\uFF1B\u786E\u8BA4 --conversation \u4E0E\u767B\u5F55\u8EAB\u4EFD\u5BF9\u5F97\u4E0A\uFF08hcm identity list\uFF09",
|
|
4143
|
+
"5011": "\u8FD9\u4E2A\u4F1A\u8BDD\u8FD8\u6709\u522B\u7684\u672A\u51B3\u6682\u505C\u6321\u7740\uFF1A\u5148 `hcm interactions list --conversation <\u4F1A\u8BDD>` \u9010\u6761\u5904\u7406\u5B8C",
|
|
4144
|
+
"9001": "\u540E\u7AEF\u5904\u7406\u786E\u8BA4\u65F6\u5185\u90E8\u51FA\u9519\uFF1A\u628A traceId \u4E00\u8D77\u62A5\u7ED9\u7814\u53D1\uFF1B\u91CD\u8BD5\u524D\u5148 list \u4E00\u6B21\u786E\u8BA4\u8FD9\u6761\u8FD8\u5728"
|
|
4145
|
+
};
|
|
4146
|
+
async function respondToInteraction(ws, opts) {
|
|
4147
|
+
const { conversationId, interactionId, decision } = opts;
|
|
4148
|
+
const timeoutMs = opts.timeoutMs ?? RESPOND_TIMEOUT_MS;
|
|
4149
|
+
return new Promise((resolve6, reject2) => {
|
|
4150
|
+
let settled = false;
|
|
4151
|
+
const finish = (fn) => {
|
|
4152
|
+
if (settled) return;
|
|
4153
|
+
settled = true;
|
|
4154
|
+
clearTimeout(timer);
|
|
4155
|
+
offControl();
|
|
4156
|
+
offConnection();
|
|
4157
|
+
offDisconnect();
|
|
4158
|
+
fn();
|
|
4159
|
+
};
|
|
4160
|
+
const offControl = ws.onControl((ev) => {
|
|
4161
|
+
if (ev.type !== "control.interaction.resolved") return;
|
|
4162
|
+
const p = ev.payload;
|
|
4163
|
+
if (p.interactionId !== interactionId) return;
|
|
4164
|
+
if (p.phase === "RESUMED") {
|
|
4165
|
+
opts.onAccepted?.();
|
|
4166
|
+
return;
|
|
4167
|
+
}
|
|
4168
|
+
if (p.phase !== "TERMINAL") return;
|
|
4169
|
+
finish(
|
|
4170
|
+
() => resolve6({
|
|
4171
|
+
interactionId,
|
|
4172
|
+
type: p.type ?? null,
|
|
4173
|
+
decision: p.decision ?? null,
|
|
4174
|
+
status: p.status ?? null,
|
|
4175
|
+
text: p.text ?? null,
|
|
4176
|
+
originAgentPath: p.originAgentPath ?? null
|
|
4177
|
+
})
|
|
4178
|
+
);
|
|
4179
|
+
});
|
|
4180
|
+
const offConnection = ws.onConnection((msg) => {
|
|
4181
|
+
const m = msg;
|
|
4182
|
+
if (m?.type !== "error") return;
|
|
4183
|
+
const serverCode = m.code === void 0 || m.code === null ? void 0 : String(m.code);
|
|
4184
|
+
finish(
|
|
4185
|
+
() => reject2(
|
|
4186
|
+
new CliError({
|
|
4187
|
+
code: "BUSINESS_RULE_VIOLATION" /* BUSINESS_RULE_VIOLATION */,
|
|
4188
|
+
message: m.message || `\u56DE\u5E94\u6682\u505C\u88AB\u62D2\uFF08\u670D\u52A1\u7AEF\u7801 ${serverCode ?? "\u672A\u7ED9"}\uFF09`,
|
|
4189
|
+
traceId: m.traceId,
|
|
4190
|
+
context: {
|
|
4191
|
+
interactionId,
|
|
4192
|
+
...serverCode ? { responseCode: serverCode } : {},
|
|
4193
|
+
...m.reason && m.reason !== "null" ? { details: m.reason } : {},
|
|
4194
|
+
nextStep: serverCode && RESPOND_NEXT_STEP[serverCode] || "\u7528 `hcm interactions list --conversation <\u4F1A\u8BDD>` \u770B\u8FD9\u6761\u8FD8\u5728\u4E0D\u5728\uFF1B\u5728\u5C31\u91CD\u8BD5\uFF0C\u4E0D\u5728\u8BF4\u660E\u5B83\u5DF2\u8FC7\u671F\u6216\u5DF2\u88AB\u5904\u7406"
|
|
4195
|
+
}
|
|
4196
|
+
})
|
|
4197
|
+
)
|
|
4198
|
+
);
|
|
4199
|
+
});
|
|
4200
|
+
const offDisconnect = ws.onDisconnect(
|
|
4201
|
+
() => finish(
|
|
4202
|
+
() => reject2(
|
|
4203
|
+
new CliError({
|
|
4204
|
+
code: "NETWORK_ERROR" /* NETWORK_ERROR */,
|
|
4205
|
+
message: `\u7B49\u5F85\u6682\u505C\u7EC8\u6001\u65F6\u8FDE\u63A5\u65AD\u5F00: interactionId=${interactionId}`,
|
|
4206
|
+
context: {
|
|
4207
|
+
interactionId,
|
|
4208
|
+
// 决定可能已经落库了——续跑是同步跑的,断的只是回程。不能让用户当成「没发生」。
|
|
4209
|
+
nextStep: "\u51B3\u5B9A\u53EF\u80FD\u5DF2\u88AB\u53D7\u7406\uFF1A\u5148 `hcm interactions list --conversation <\u4F1A\u8BDD>` \u770B\u5B83\u8FD8\u5728\u4E0D\u5728\uFF0C\u4E0D\u5728\u5C31\u522B\u91CD\u53D1"
|
|
4210
|
+
}
|
|
4211
|
+
})
|
|
4212
|
+
)
|
|
4213
|
+
)
|
|
4214
|
+
);
|
|
4215
|
+
const timer = setTimeout(() => {
|
|
4216
|
+
finish(
|
|
4217
|
+
() => reject2(
|
|
4218
|
+
new CliError({
|
|
4219
|
+
code: "TIMEOUT" /* TIMEOUT */,
|
|
4220
|
+
message: `\u7B49\u5F85\u6682\u505C\u7EC8\u6001\u8D85\u65F6\uFF08${timeoutMs}ms\uFF09: interactionId=${interactionId}`,
|
|
4221
|
+
context: {
|
|
4222
|
+
interactionId,
|
|
4223
|
+
// 只收到 RESUMED 就超时是常态(续跑是一次完整 LLM 轮次),别说成「失败」。
|
|
4224
|
+
nextStep: "\u7EED\u8DD1\u53EF\u80FD\u8FD8\u5728\u8FDB\u884C\uFF1A\u7528 `--timeout` \u7ED9\u66F4\u957F\u65F6\u95F4\uFF0C\u6216 `hcm interactions list --conversation <\u4F1A\u8BDD>` \u786E\u8BA4\u5B83\u5DF2\u7ECF\u4E0D\u5728\u672A\u51B3\u6E05\u5355\u91CC\uFF08\u4E0D\u5728 = \u5DF2\u5904\u7406\u5B8C\uFF09"
|
|
4225
|
+
}
|
|
4226
|
+
})
|
|
4227
|
+
)
|
|
4228
|
+
);
|
|
4229
|
+
}, timeoutMs);
|
|
4230
|
+
try {
|
|
4231
|
+
ws.send(commandFor(decision, interactionId, conversationId));
|
|
4232
|
+
} catch (e) {
|
|
4233
|
+
finish(() => reject2(e));
|
|
4234
|
+
}
|
|
4235
|
+
});
|
|
4236
|
+
}
|
|
4237
|
+
function commandFor(decision, interactionId, conversationId) {
|
|
4238
|
+
switch (decision.kind) {
|
|
4239
|
+
case "confirm":
|
|
4240
|
+
return buildConfirm(interactionId, conversationId);
|
|
4241
|
+
case "reject":
|
|
4242
|
+
return buildReject(interactionId, conversationId, decision.reason);
|
|
4243
|
+
case "answer":
|
|
4244
|
+
return buildAnswer(interactionId, conversationId, decision.answer, decision.choiceIndex);
|
|
4245
|
+
}
|
|
4246
|
+
}
|
|
4247
|
+
|
|
3836
4248
|
// src/mini/types.ts
|
|
3837
4249
|
var MINI_CONTEXT_FILE = "hcm.context.json";
|
|
3838
4250
|
var MINI_STATE_DIR = ".hcm";
|
|
@@ -22158,6 +22570,7 @@ export {
|
|
|
22158
22570
|
CHECK_GROUPS2 as CHECK_GROUPS,
|
|
22159
22571
|
CLI_AUTHORIZE_PATH,
|
|
22160
22572
|
CLI_EXCHANGE_PATH,
|
|
22573
|
+
CLI_STATUS_PATH,
|
|
22161
22574
|
CLI_VERIFICATION_PATH,
|
|
22162
22575
|
CNB_FAVICON_URL,
|
|
22163
22576
|
CNB_ORIGIN,
|
|
@@ -22179,6 +22592,7 @@ export {
|
|
|
22179
22592
|
CODE_UNBIND_READBACK_UNREADABLE,
|
|
22180
22593
|
CODE_UNBIND_REFUSED,
|
|
22181
22594
|
CODE_WORDS,
|
|
22595
|
+
CONTROL_BUFFER_LIMIT,
|
|
22182
22596
|
CREDENTIAL_STORE_MODES,
|
|
22183
22597
|
CliError,
|
|
22184
22598
|
CliErrorCode,
|
|
@@ -22211,7 +22625,9 @@ export {
|
|
|
22211
22625
|
FORCE_STALE_FLAG_TEXT,
|
|
22212
22626
|
GATE_COMPONENTS,
|
|
22213
22627
|
HANDSHAKE_AUTH_ERROR_HEADER,
|
|
22628
|
+
HANDSHAKE_CONVERSATION_QUERY_PARAM,
|
|
22214
22629
|
HANDSHAKE_TOKEN_QUERY_PARAM,
|
|
22630
|
+
HCM_FIELD_RAW_KEYS,
|
|
22215
22631
|
HCM_LANG_ENV,
|
|
22216
22632
|
HcmClient,
|
|
22217
22633
|
IMPERSONATION_ACTIVE_PATH,
|
|
@@ -22287,7 +22703,9 @@ export {
|
|
|
22287
22703
|
REASON_BASELINE_ROUND_NOT_COMPLETE,
|
|
22288
22704
|
VERDICTS2 as RECONCILE_VERDICTS,
|
|
22289
22705
|
RECOVERY_WORDS,
|
|
22706
|
+
REJECTED_BEFORE_ROUTING_CODE,
|
|
22290
22707
|
REQUIRED_SECTIONS,
|
|
22708
|
+
RESPOND_TIMEOUT_MS,
|
|
22291
22709
|
RESTORE_CODES,
|
|
22292
22710
|
RISK_CODES,
|
|
22293
22711
|
RISK_FILE,
|
|
@@ -22302,6 +22720,7 @@ export {
|
|
|
22302
22720
|
RefStore,
|
|
22303
22721
|
RestoreFailed,
|
|
22304
22722
|
SDK_VERSION,
|
|
22723
|
+
SERVER_ERROR_GRACE_MS,
|
|
22305
22724
|
STATUSES,
|
|
22306
22725
|
STEP_NOTHING,
|
|
22307
22726
|
STEP_PROBE,
|
|
@@ -22358,6 +22777,7 @@ export {
|
|
|
22358
22777
|
assertSafeReferencePath,
|
|
22359
22778
|
assertSafeSkillFilePath,
|
|
22360
22779
|
assertSafeSkillId,
|
|
22780
|
+
assertUsableEndpoint,
|
|
22361
22781
|
baselineRoundPremise,
|
|
22362
22782
|
bootstrapTenant,
|
|
22363
22783
|
buildAnswer,
|
|
@@ -22410,6 +22830,7 @@ export {
|
|
|
22410
22830
|
detectDelegationPause,
|
|
22411
22831
|
detectDirectInteractionPending,
|
|
22412
22832
|
detectPasswordChangeChallenge,
|
|
22833
|
+
diagnoseRejectedBeforeRouting,
|
|
22413
22834
|
discardedColumnLines,
|
|
22414
22835
|
discoverProjectEnv,
|
|
22415
22836
|
displayWidth,
|
|
@@ -22484,6 +22905,7 @@ export {
|
|
|
22484
22905
|
listEnvs,
|
|
22485
22906
|
listIdentities,
|
|
22486
22907
|
listModels,
|
|
22908
|
+
listPendingInteractions,
|
|
22487
22909
|
listProfiles,
|
|
22488
22910
|
listTenantMeta,
|
|
22489
22911
|
listWorkspaceFiles,
|
|
@@ -22512,6 +22934,8 @@ export {
|
|
|
22512
22934
|
modelKeys,
|
|
22513
22935
|
needsRefresh,
|
|
22514
22936
|
newRoundId,
|
|
22937
|
+
normalizeAndAssertEndpoint,
|
|
22938
|
+
normalizeEndpoint,
|
|
22515
22939
|
normalizeOrigin,
|
|
22516
22940
|
normalizeReferences,
|
|
22517
22941
|
notAsked,
|
|
@@ -22574,6 +22998,7 @@ export {
|
|
|
22574
22998
|
resolveProjectEnvironment,
|
|
22575
22999
|
resolveRefs,
|
|
22576
23000
|
resolveSkillInstallOrder,
|
|
23001
|
+
respondToInteraction,
|
|
22577
23002
|
riskFromArtifacts,
|
|
22578
23003
|
roundAge,
|
|
22579
23004
|
roundWarning,
|
|
@@ -22622,6 +23047,7 @@ export {
|
|
|
22622
23047
|
verifyRc,
|
|
22623
23048
|
verifyText,
|
|
22624
23049
|
waitForInstallRun,
|
|
23050
|
+
watchBrowserAuthorization,
|
|
22625
23051
|
workspaceLayer,
|
|
22626
23052
|
writeChangeState,
|
|
22627
23053
|
writeImportPlan,
|