@bf-meishijian/aip 0.0.12 → 0.0.17
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/README.md +25 -0
- package/dist/aip-submit-outcome/SKILL.md +47 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +27 -6
- package/dist/cli.js.map +1 -1
- package/dist/coding-run-manager.d.ts.map +1 -1
- package/dist/coding-run-manager.js +114 -110
- package/dist/coding-run-manager.js.map +1 -1
- package/dist/coding-subagent-child.d.ts.map +1 -1
- package/dist/coding-subagent-child.js +13 -0
- package/dist/coding-subagent-child.js.map +1 -1
- package/dist/daemon.d.ts.map +1 -1
- package/dist/daemon.js +30 -3
- package/dist/daemon.js.map +1 -1
- package/dist/delivery-tools.d.ts.map +1 -1
- package/dist/delivery-tools.js +13 -0
- package/dist/delivery-tools.js.map +1 -1
- package/dist/diagnostic-log.d.ts +19 -0
- package/dist/diagnostic-log.d.ts.map +1 -0
- package/dist/diagnostic-log.js +59 -0
- package/dist/diagnostic-log.js.map +1 -0
- package/dist/diagnostics.d.ts +2 -0
- package/dist/diagnostics.d.ts.map +1 -1
- package/dist/diagnostics.js +18 -9
- package/dist/diagnostics.js.map +1 -1
- package/dist/host-tools.d.ts +9 -5
- package/dist/host-tools.d.ts.map +1 -1
- package/dist/host-tools.js +61 -39
- package/dist/host-tools.js.map +1 -1
- package/dist/installer.js +1 -1
- package/dist/installer.js.map +1 -1
- package/dist/local-handoff-workspace.d.ts.map +1 -1
- package/dist/local-handoff-workspace.js +22 -8
- package/dist/local-handoff-workspace.js.map +1 -1
- package/dist/outcome-cli.d.ts +2 -0
- package/dist/outcome-cli.d.ts.map +1 -0
- package/dist/outcome-cli.js +83 -0
- package/dist/outcome-cli.js.map +1 -0
- package/dist/pi-model-service.d.ts +2 -1
- package/dist/pi-model-service.d.ts.map +1 -1
- package/dist/pi-model-service.js +34 -34
- package/dist/pi-model-service.js.map +1 -1
- package/dist/platform-client.d.ts +4 -2
- package/dist/platform-client.d.ts.map +1 -1
- package/dist/platform-client.js +2 -2
- package/dist/platform-client.js.map +1 -1
- package/dist/runtime-search-tools.d.ts +3 -0
- package/dist/runtime-search-tools.d.ts.map +1 -0
- package/dist/runtime-search-tools.js +30 -0
- package/dist/runtime-search-tools.js.map +1 -0
- package/dist/secure-json.d.ts.map +1 -1
- package/dist/secure-json.js +3 -1
- package/dist/secure-json.js.map +1 -1
- package/dist/state.d.ts +2 -2
- package/dist/state.js +3 -3
- package/dist/state.js.map +1 -1
- package/package.json +14 -23
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { LocalCodingHostDiagnosticCheck } from "@ai-platform/api-contracts";
|
|
2
|
+
export interface DiagnosticLogContext {
|
|
3
|
+
source: "TOOL_CHECK" | "STATUS_REPORT" | "DIAGNOSTICS" | "RUN_DIAGNOSTICS" | "CLI_DOCTOR";
|
|
4
|
+
hostId?: string;
|
|
5
|
+
generation?: number;
|
|
6
|
+
commandId?: string;
|
|
7
|
+
}
|
|
8
|
+
/** 只提取固定错误分类,不记录异常正文、输出、参数、路径和环境变量。 */
|
|
9
|
+
export declare function diagnosticErrorFields(error: unknown): {
|
|
10
|
+
reason: string;
|
|
11
|
+
exitCode: number;
|
|
12
|
+
} | {
|
|
13
|
+
errorCode?: string;
|
|
14
|
+
reason: string;
|
|
15
|
+
exitCode?: never;
|
|
16
|
+
};
|
|
17
|
+
export declare function logDiagnosticCheck(check: LocalCodingHostDiagnosticCheck, context: DiagnosticLogContext): void;
|
|
18
|
+
export declare function logDiagnosticSummary(checks: LocalCodingHostDiagnosticCheck[], context: DiagnosticLogContext): void;
|
|
19
|
+
//# sourceMappingURL=diagnostic-log.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diagnostic-log.d.ts","sourceRoot":"","sources":["../src/diagnostic-log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAGjF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,YAAY,GAAG,eAAe,GAAG,aAAa,GAAG,iBAAiB,GAAG,YAAY,CAAC;IAC1F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,uCAAuC;AACvC,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO;;;;;;;EAsCnD;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,8BAA8B,EACrC,OAAO,EAAE,oBAAoB,QAS9B;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,8BAA8B,EAAE,EACxC,OAAO,EAAE,oBAAoB,QAS9B"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { logHostEvent } from "./host-log.js";
|
|
2
|
+
/** 只提取固定错误分类,不记录异常正文、输出、参数、路径和环境变量。 */
|
|
3
|
+
export function diagnosticErrorFields(error) {
|
|
4
|
+
// Pi 1.0.0 的搜索工具会把退出码变成 Error.message,而不是 error.code。
|
|
5
|
+
// 仅提取已核对的固定格式和数字,不把原始 stderr 带入日志。
|
|
6
|
+
const message = error instanceof Error ? error.message : "";
|
|
7
|
+
const exitMatch = /^(?:ripgrep|fd) exited with code (-?\d{1,10})$/u.exec(message);
|
|
8
|
+
if (exitMatch)
|
|
9
|
+
return { reason: "NON_ZERO_EXIT", exitCode: Number(exitMatch[1]) };
|
|
10
|
+
const missingTool = message === "ripgrep (rg) is not available and could not be downloaded"
|
|
11
|
+
? "RG_UNAVAILABLE"
|
|
12
|
+
: message === "fd is not available and could not be downloaded"
|
|
13
|
+
? "FD_UNAVAILABLE"
|
|
14
|
+
: message.startsWith("Custom shell path not found: ")
|
|
15
|
+
? "CUSTOM_SHELL_PATH_NOT_FOUND"
|
|
16
|
+
: message.startsWith("No bash shell found. Options:")
|
|
17
|
+
? "BASH_NOT_FOUND"
|
|
18
|
+
: message.startsWith("No PowerShell executable found.")
|
|
19
|
+
? "POWERSHELL_NOT_FOUND"
|
|
20
|
+
: undefined;
|
|
21
|
+
if (missingTool)
|
|
22
|
+
return { reason: "TOOL_NOT_FOUND", errorCode: missingTool };
|
|
23
|
+
const code = error?.code;
|
|
24
|
+
const errorCode = typeof code === "string" &&
|
|
25
|
+
["ENOENT", "EACCES", "EPERM", "ETIMEDOUT", "ENOEXEC", "EIO", "ECANCELED"].includes(code)
|
|
26
|
+
? code
|
|
27
|
+
: undefined;
|
|
28
|
+
const timeout = errorCode === "ETIMEDOUT" ||
|
|
29
|
+
(error instanceof Error && ["TimeoutError", "AbortError"].includes(error.name));
|
|
30
|
+
return {
|
|
31
|
+
reason: timeout
|
|
32
|
+
? "TIMEOUT"
|
|
33
|
+
: errorCode === "ENOENT"
|
|
34
|
+
? "TOOL_NOT_FOUND"
|
|
35
|
+
: errorCode === "EACCES" || errorCode === "EPERM"
|
|
36
|
+
? "PERMISSION_DENIED"
|
|
37
|
+
: "EXECUTION_ERROR",
|
|
38
|
+
...(errorCode ? { errorCode } : {}),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
export function logDiagnosticCheck(check, context) {
|
|
42
|
+
if (check.status !== "PASS")
|
|
43
|
+
logHostEvent("diagnostic_check_failed", {
|
|
44
|
+
...context,
|
|
45
|
+
checkId: check.id,
|
|
46
|
+
status: check.status,
|
|
47
|
+
code: check.code,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
export function logDiagnosticSummary(checks, context) {
|
|
51
|
+
logHostEvent("diagnostics_completed_locally", {
|
|
52
|
+
...context,
|
|
53
|
+
checkCount: checks.length,
|
|
54
|
+
failedCount: checks.filter((check) => check.status === "FAIL").length,
|
|
55
|
+
actionRequiredCount: checks.filter((check) => check.status === "ACTION_REQUIRED").length,
|
|
56
|
+
checks: checks.map(({ id, status, code }) => ({ id, status, code })),
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=diagnostic-log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diagnostic-log.js","sourceRoot":"","sources":["../src/diagnostic-log.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAS7C,uCAAuC;AACvC,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,sDAAsD;IACtD,mCAAmC;IACnC,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,MAAM,SAAS,GAAG,iDAAiD,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClF,IAAI,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAClF,MAAM,WAAW,GACf,OAAO,KAAK,2DAA2D;QACrE,CAAC,CAAC,gBAAgB;QAClB,CAAC,CAAC,OAAO,KAAK,iDAAiD;YAC7D,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,+BAA+B,CAAC;gBACnD,CAAC,CAAC,6BAA6B;gBAC/B,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,+BAA+B,CAAC;oBACnD,CAAC,CAAC,gBAAgB;oBAClB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,iCAAiC,CAAC;wBACrD,CAAC,CAAC,sBAAsB;wBACxB,CAAC,CAAC,SAAS,CAAC;IACxB,IAAI,WAAW;QAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAC7E,MAAM,IAAI,GAAI,KAAsC,EAAE,IAAI,CAAC;IAC3D,MAAM,SAAS,GACb,OAAO,IAAI,KAAK,QAAQ;QACxB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QACtF,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,OAAO,GACX,SAAS,KAAK,WAAW;QACzB,CAAC,KAAK,YAAY,KAAK,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,OAAO;QACL,MAAM,EAAE,OAAO;YACb,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,KAAK,QAAQ;gBACtB,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,OAAO;oBAC/C,CAAC,CAAC,mBAAmB;oBACrB,CAAC,CAAC,iBAAiB;QACzB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,KAAqC,EACrC,OAA6B;IAE7B,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;QACzB,YAAY,CAAC,yBAAyB,EAAE;YACtC,GAAG,OAAO;YACV,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAwC,EACxC,OAA6B;IAE7B,YAAY,CAAC,+BAA+B,EAAE;QAC5C,GAAG,OAAO;QACV,UAAU,EAAE,MAAM,CAAC,MAAM;QACzB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM;QACrE,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,MAAM;QACxF,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KACrE,CAAC,CAAC;AACL,CAAC"}
|
package/dist/diagnostics.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { LocalCodingHostDiagnosticCheck } from "@ai-platform/api-contracts";
|
|
2
2
|
import { type HostShell } from "@ai-platform/api-contracts";
|
|
3
|
+
import { type DiagnosticLogContext } from "./diagnostic-log.js";
|
|
3
4
|
export declare function runDiagnostics(options: {
|
|
4
5
|
platformReachable: boolean;
|
|
5
6
|
deviceCredentialValid: boolean;
|
|
@@ -8,6 +9,7 @@ export declare function runDiagnostics(options: {
|
|
|
8
9
|
providerReady: boolean;
|
|
9
10
|
runtimeVerification?: "full" | "installed-package";
|
|
10
11
|
shell?: HostShell | undefined;
|
|
12
|
+
logContext?: DiagnosticLogContext;
|
|
11
13
|
}, dependencies?: {
|
|
12
14
|
captureCommand?: typeof captureCommand;
|
|
13
15
|
}): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,
|
|
1
|
+
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EACL,KAAK,oBAAoB,EAG1B,MAAM,qBAAqB,CAAC;AAa7B,wBAAsB,cAAc,CAClC,OAAO,EAAE;IACP,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACnD,KAAK,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,oBAAoB,CAAC;CACnC,EACD,YAAY,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,cAAc,CAAA;CAAO;;;;;KA6C9D;AAoID,iBAAS,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;UAC1B,MAAM;YAAU,MAAM;GAUlD;AACD,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAmB1F"}
|
package/dist/diagnostics.js
CHANGED
|
@@ -3,6 +3,7 @@ import { constants } from "node:fs";
|
|
|
3
3
|
import { access, lstat, mkdir, readFile } from "node:fs/promises";
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { resolveHostShell } from "@ai-platform/api-contracts";
|
|
6
|
+
import { logDiagnosticCheck, logDiagnosticSummary, } from "./diagnostic-log.js";
|
|
6
7
|
import { checkHostTools } from "./host-tools.js";
|
|
7
8
|
import { launchAgentDefinition, verifyManifest, windowsTaskDefinition, } from "./installer.js";
|
|
8
9
|
import { linuxServiceDefinition } from "./linux-service.js";
|
|
@@ -12,35 +13,43 @@ import { isSecureFile, readJson } from "./secure-json.js";
|
|
|
12
13
|
export async function runDiagnostics(options, dependencies = {}) {
|
|
13
14
|
const local = paths();
|
|
14
15
|
const checks = [];
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const context = options.logContext ?? { source: "DIAGNOSTICS" };
|
|
17
|
+
const record = (check) => {
|
|
18
|
+
checks.push(check);
|
|
19
|
+
logDiagnosticCheck(check, context);
|
|
20
|
+
};
|
|
21
|
+
record(await runtimeCheck(local.runtimeCurrent, options.runtimeVerification));
|
|
22
|
+
record(await backgroundCheck(dependencies.captureCommand ?? captureCommand));
|
|
23
|
+
record(await deviceCredentialCheck(options.deviceCredentialValid));
|
|
24
|
+
record({
|
|
19
25
|
id: "PROVIDER_AUTH",
|
|
20
26
|
status: options.providerReady ? "PASS" : "ACTION_REQUIRED",
|
|
21
27
|
code: options.providerReady ? "PROVIDER_AUTH_OK" : "PROVIDER_LOGIN_REQUIRED",
|
|
22
28
|
nextAction: options.providerReady ? "无需处理" : "检查平台模型配置或登录订阅",
|
|
23
29
|
});
|
|
24
|
-
|
|
30
|
+
record({
|
|
25
31
|
id: "PLATFORM_CONNECTIVITY",
|
|
26
32
|
status: options.platformReachable ? "PASS" : "FAIL",
|
|
27
33
|
code: options.platformReachable ? "PLATFORM_REACHABLE" : "PLATFORM_UNREACHABLE",
|
|
28
34
|
nextAction: "检查网络后重试",
|
|
29
35
|
});
|
|
30
|
-
|
|
36
|
+
record({
|
|
31
37
|
id: "HOST_GENERATION",
|
|
32
38
|
status: options.generationValid ? "PASS" : "FAIL",
|
|
33
39
|
code: options.generationValid ? "HOST_GENERATION_OK" : "HOST_FENCED",
|
|
34
40
|
nextAction: `执行 ${aipCommand()} host register`,
|
|
35
41
|
});
|
|
36
|
-
|
|
37
|
-
|
|
42
|
+
record(await workspaceCheck(local.workspaceRoot));
|
|
43
|
+
record({
|
|
38
44
|
id: "DEFAULT_MODEL",
|
|
39
45
|
status: options.defaultModelValid ? "PASS" : "ACTION_REQUIRED",
|
|
40
46
|
code: options.defaultModelValid ? "DEFAULT_MODEL_OK" : "DEFAULT_MODEL_INVALID",
|
|
41
47
|
nextAction: "在平台重新选择默认模型",
|
|
42
48
|
});
|
|
43
|
-
|
|
49
|
+
const toolChecks = await checkHostTools(options.shell ?? resolveHostShell(process.platform, process.env), {}, context);
|
|
50
|
+
for (const check of toolChecks)
|
|
51
|
+
record(check);
|
|
52
|
+
logDiagnosticSummary(checks, context);
|
|
44
53
|
return checks;
|
|
45
54
|
}
|
|
46
55
|
async function runtimeCheck(path, verification = "full") {
|
package/dist/diagnostics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"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"}
|
package/dist/host-tools.d.ts
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import "./runtime-environment.js";
|
|
2
|
-
import type { TSchema } from "typebox";
|
|
3
2
|
import type { HostShell, LocalCodingHostDiagnosticCheck } from "@ai-platform/api-contracts";
|
|
4
3
|
import { createBashToolDefinition, type ToolDefinition } from "@earendil-works/pi-coding-agent";
|
|
4
|
+
import type { TSchema } from "typebox";
|
|
5
|
+
import { type DiagnosticLogContext } from "./diagnostic-log.js";
|
|
6
|
+
type ToolProbeLogContext = DiagnosticLogContext & {
|
|
7
|
+
checkId: LocalCodingHostDiagnosticCheck["id"];
|
|
8
|
+
shell?: HostShell["name"];
|
|
9
|
+
};
|
|
5
10
|
export declare function createHostShellTool(cwd: string, shell: HostShell, variables?: Record<string, string>): ReturnType<typeof createBashToolDefinition>;
|
|
6
|
-
export declare function probeToolExecution<T extends TSchema>(tool: Pick<ToolDefinition<T>, "execute">, args: Parameters<ToolDefinition<T>["execute"]>[1], expected: string, cwd?: string): Promise<boolean>;
|
|
7
|
-
|
|
8
|
-
export
|
|
9
|
-
export declare function checkHostTools(shell: HostShell, variables?: Record<string, string>): Promise<LocalCodingHostDiagnosticCheck[]>;
|
|
11
|
+
export declare function probeToolExecution<T extends TSchema>(tool: Pick<ToolDefinition<T>, "execute">, args: Parameters<ToolDefinition<T>["execute"]>[1], expected: string, cwd?: string, logContext?: ToolProbeLogContext): Promise<boolean>;
|
|
12
|
+
export declare function checkHostTools(shell: HostShell, variables?: Record<string, string>, logContext?: DiagnosticLogContext): Promise<LocalCodingHostDiagnosticCheck[]>;
|
|
13
|
+
export {};
|
|
10
14
|
//# sourceMappingURL=host-tools.d.ts.map
|
package/dist/host-tools.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-tools.d.ts","sourceRoot":"","sources":["../src/host-tools.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"host-tools.d.ts","sourceRoot":"","sources":["../src/host-tools.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;AAIlC,OAAO,KAAK,EAAE,SAAS,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EACL,wBAAwB,EAIxB,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,KAAK,oBAAoB,EAAyB,MAAM,qBAAqB,CAAC;AAIvF,KAAK,mBAAmB,GAAG,oBAAoB,GAAG;IAChD,OAAO,EAAE,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;CAC3B,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,EAChB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACrC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAc7C;AAED,wBAAsB,kBAAkB,CAAC,CAAC,SAAS,OAAO,EACxD,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EACxC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAgB,EACnB,UAAU,CAAC,EAAE,mBAAmB,GAC/B,OAAO,CAAC,OAAO,CAAC,CAiClB;AAED,wBAAsB,cAAc,CAClC,KAAK,EAAE,SAAS,EAChB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACtC,UAAU,GAAE,oBAA+C,GAC1D,OAAO,CAAC,8BAA8B,EAAE,CAAC,CAqE3C"}
|
package/dist/host-tools.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import "./runtime-environment.js";
|
|
2
|
-
import {
|
|
3
|
-
import { createHash } from "node:crypto";
|
|
2
|
+
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
4
3
|
import { tmpdir } from "node:os";
|
|
5
4
|
import { join } from "node:path";
|
|
6
|
-
import { createBashToolDefinition,
|
|
7
|
-
import {
|
|
5
|
+
import { createBashToolDefinition, createFindToolDefinition, createGrepToolDefinition, createPowerShellToolDefinition, } from "@earendil-works/pi-coding-agent";
|
|
6
|
+
import { diagnosticErrorFields } from "./diagnostic-log.js";
|
|
7
|
+
import { logHostEvent } from "./host-log.js";
|
|
8
|
+
import { activeProfile, aipBaseHome } from "./paths.js";
|
|
8
9
|
export function createHostShellTool(cwd, shell, variables = {}) {
|
|
9
10
|
const options = {
|
|
10
11
|
exposeSessionEnvironment: false,
|
|
@@ -20,51 +21,51 @@ export function createHostShellTool(cwd, shell, variables = {}) {
|
|
|
20
21
|
...(shell.shellPath ? { shellPath: shell.shellPath } : {}),
|
|
21
22
|
});
|
|
22
23
|
}
|
|
23
|
-
export async function probeToolExecution(tool, args, expected, cwd = process.cwd()) {
|
|
24
|
+
export async function probeToolExecution(tool, args, expected, cwd = process.cwd(), logContext) {
|
|
25
|
+
const startedAt = Date.now();
|
|
26
|
+
const signal = AbortSignal.timeout(5_000);
|
|
27
|
+
const fail = (details) => {
|
|
28
|
+
if (logContext)
|
|
29
|
+
logHostEvent("host_tool_check_failed", {
|
|
30
|
+
...logContext,
|
|
31
|
+
...details,
|
|
32
|
+
durationMs: Date.now() - startedAt,
|
|
33
|
+
});
|
|
34
|
+
return false;
|
|
35
|
+
};
|
|
24
36
|
try {
|
|
25
|
-
const result = await tool.execute("host-tool-diagnostic", args,
|
|
37
|
+
const result = await tool.execute("host-tool-diagnostic", args, signal, undefined, {
|
|
38
|
+
cwd,
|
|
39
|
+
});
|
|
26
40
|
const output = result.content
|
|
27
41
|
.map((part) => ("text" in part ? String(part.text) : ""))
|
|
28
42
|
.join("\n");
|
|
29
43
|
const structured = result.structuredContent;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
44
|
+
const exitCode = structured?.exit_code;
|
|
45
|
+
if (exitCode !== undefined && exitCode !== 0)
|
|
46
|
+
return fail({
|
|
47
|
+
reason: "NON_ZERO_EXIT",
|
|
48
|
+
...(Number.isSafeInteger(exitCode) ? { exitCode } : {}),
|
|
49
|
+
});
|
|
50
|
+
if (!output.includes(expected))
|
|
51
|
+
return fail({ reason: "OUTPUT_MISMATCH", ...(exitCode === 0 ? { exitCode } : {}) });
|
|
52
|
+
return true;
|
|
35
53
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const manifest = JSON.parse(await readFile(join(runtime, "runtime-manifest.json"), "utf8"));
|
|
40
|
-
const target = join(paths().piAgent, "bin");
|
|
41
|
-
await mkdir(target, { recursive: true, mode: 0o700 });
|
|
42
|
-
for (const name of ["rg", "fd"]) {
|
|
43
|
-
const filename = name + (process.platform === "win32" ? ".exe" : "");
|
|
44
|
-
const relative = `bin/${filename}`;
|
|
45
|
-
const entry = manifest.files.find((file) => file.path.replaceAll("\\", "/") === relative);
|
|
46
|
-
if (!entry)
|
|
47
|
-
throw new Error("RUNTIME_SEARCH_TOOLS_MISSING");
|
|
48
|
-
const source = join(runtime, "bin", filename);
|
|
49
|
-
const hash = createHash("sha256")
|
|
50
|
-
.update(await readFile(source))
|
|
51
|
-
.digest("hex");
|
|
52
|
-
if (hash !== entry.sha256)
|
|
53
|
-
throw new Error("RUNTIME_SEARCH_TOOLS_INVALID");
|
|
54
|
-
const destination = join(target, filename);
|
|
55
|
-
const existing = await readFile(destination)
|
|
56
|
-
.then((bytes) => createHash("sha256").update(bytes).digest("hex"))
|
|
57
|
-
.catch(() => null);
|
|
58
|
-
if (existing !== hash)
|
|
59
|
-
await cp(source, destination);
|
|
54
|
+
catch (error) {
|
|
55
|
+
const details = diagnosticErrorFields(error);
|
|
56
|
+
return fail({ ...details, ...(signal.aborted ? { reason: "TIMEOUT" } : {}) });
|
|
60
57
|
}
|
|
61
58
|
}
|
|
62
|
-
export async function checkHostTools(shell, variables = {}) {
|
|
63
|
-
|
|
59
|
+
export async function checkHostTools(shell, variables = {}, logContext = { source: "TOOL_CHECK" }) {
|
|
60
|
+
let root;
|
|
61
|
+
let stage = "CREATE_PROBE_DIRECTORY";
|
|
64
62
|
const token = "AIP_TOOL_EXECUTION_OK";
|
|
65
63
|
const checks = [];
|
|
66
64
|
try {
|
|
65
|
+
root = await mkdtemp(join(tmpdir(), "aip-tool-check-"));
|
|
66
|
+
stage = "CREATE_PROBE_FILE";
|
|
67
67
|
await writeFile(join(root, "host-tool-probe.txt"), `${token}\n`, { mode: 0o600 });
|
|
68
|
+
stage = "CREATE_TOOLS";
|
|
68
69
|
const cases = [
|
|
69
70
|
[
|
|
70
71
|
"SHELL",
|
|
@@ -92,7 +93,12 @@ export async function checkHostTools(shell, variables = {}) {
|
|
|
92
93
|
],
|
|
93
94
|
];
|
|
94
95
|
for (const [id, tool, args, expected, action] of cases) {
|
|
95
|
-
|
|
96
|
+
stage = id;
|
|
97
|
+
const ok = await probeToolExecution(tool, args, expected, root, {
|
|
98
|
+
...logContext,
|
|
99
|
+
checkId: id,
|
|
100
|
+
...(id === "SHELL" ? { shell: shell.name } : {}),
|
|
101
|
+
});
|
|
96
102
|
checks.push({
|
|
97
103
|
id,
|
|
98
104
|
status: ok ? "PASS" : "FAIL",
|
|
@@ -102,8 +108,24 @@ export async function checkHostTools(shell, variables = {}) {
|
|
|
102
108
|
}
|
|
103
109
|
return checks;
|
|
104
110
|
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
logHostEvent("host_tool_check_error", {
|
|
113
|
+
...logContext,
|
|
114
|
+
stage,
|
|
115
|
+
...diagnosticErrorFields(error),
|
|
116
|
+
});
|
|
117
|
+
throw error;
|
|
118
|
+
}
|
|
105
119
|
finally {
|
|
106
|
-
|
|
120
|
+
if (root)
|
|
121
|
+
await rm(root, { recursive: true, force: true }).catch((error) => {
|
|
122
|
+
logHostEvent("host_tool_check_error", {
|
|
123
|
+
...logContext,
|
|
124
|
+
stage: "CLEANUP",
|
|
125
|
+
...diagnosticErrorFields(error),
|
|
126
|
+
});
|
|
127
|
+
throw error;
|
|
128
|
+
});
|
|
107
129
|
}
|
|
108
130
|
}
|
|
109
131
|
//# sourceMappingURL=host-tools.js.map
|
package/dist/host-tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-tools.js","sourceRoot":"","sources":["../src/host-tools.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"host-tools.js","sourceRoot":"","sources":["../src/host-tools.ts"],"names":[],"mappings":"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"}
|
package/dist/installer.js
CHANGED
|
@@ -7,10 +7,10 @@ import { dirname, isAbsolute, join, relative, resolve } from "node:path";
|
|
|
7
7
|
import { installLinuxService } from "./linux-service.js";
|
|
8
8
|
import { activeProfile, aipCommand, launchAgentLabel, paths, windowsTaskName } from "./paths.js";
|
|
9
9
|
import { runtimeArchitecture } from "./platform.js";
|
|
10
|
+
import { installSearchTools } from "./runtime-search-tools.js";
|
|
10
11
|
import { RUNTIME_VERSION } from "./state.js";
|
|
11
12
|
import { activateWindowsRuntime } from "./windows-runtime.js";
|
|
12
13
|
import { installWindowsTask, stopWindowsTask } from "./windows-service.js";
|
|
13
|
-
import { installSearchTools } from "./host-tools.js";
|
|
14
14
|
export { windowsTaskDefinition } from "./windows-service.js";
|
|
15
15
|
export async function installRuntime(options = {}) {
|
|
16
16
|
const prepared = Boolean(options.preparedRuntime);
|
package/dist/installer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../src/installer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EACL,KAAK,EACL,EAAE,EACF,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,EAAE,EACF,IAAI,EACJ,OAAO,EACP,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAW7D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,UAAwC,EAAE;IAC7E,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe;QACpC,CAAC,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,eAAe,CAAC;QACvD,CAAC,CAAC,MAAM,qBAAqB,EAAE,CAAC;IAClC,IAAI,QAAyB,CAAC;IAC9B,IAAI,gBAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,gBAAgB,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAAE,MAAM,CAAC,CAAC;QACjF,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAoB,CAAC;IAC7D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,uBAAuB,MAAM,2BAA2B,EACxD,EAAE,KAAK,EAAE,CACV,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,KAAK,eAAe;QACtC,MAAM,IAAI,KAAK,CACb,oBAAoB,eAAe,OAAO,QAAQ,CAAC,OAAO,2BAA2B,CACtF,CAAC;IACJ,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;IAC3C,IAAI,QAAQ,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY;QAC1E,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC;IAC1E,IAAI,CAAC,QAAQ;QAAE,MAAM,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;IACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,OAAO,YAAY,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAChG,MAAM,MAAM,GAAG,QAAQ;QACrB,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,IAAI,CACF,QAAQ,EACR,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC1B,CAAC,CAAC,GAAG,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE;YACnG,CAAC,CAAC,QAAQ,CAAC,OAAO,CACrB,CAAC;IACN,gDAAgD;IAChD,oDAAoD;IACpD,MAAM,SAAS,GAAG,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9E,MAAM,cAAc,GAAG,IAAI,CACzB,QAAQ,EACR,GAAG,QAAQ,CAAC,OAAO,aAAa,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CACjE,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACxE,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,uBAAuB,GAAG,KAAK,CAAC;IACpC,IAAI,wBAAwB,GAAG,KAAK,CAAC;IACrC,MAAM,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,iDAAiD;YACjD,oBAAoB;QACtB,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAClE,uCAAuC;YACvC,MAAM,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACjD,uBAAuB,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QACzD,CAAC;QACD,MAAM,GAAG,CACP,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,EAC1E,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,EACjD,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAChC,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,wBAAwB,GAAG,IAAI,CAAC;YAChC,MAAM,sBAAsB,CAC1B,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,cAAc,EAAE,EACpD;gBACE,IAAI,EAAE,KAAK,IAAI,EAAE;oBACf,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG;wBAAE,MAAM,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACxF,CAAC;gBACD,KAAK,EAAE,KAAK,IAAI,EAAE;oBAChB,MAAM,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;oBAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAChC,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxE,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;oBAC7D,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,CAAC;oBAC5E,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG;wBACtC,MAAM,aAAa,CAAC,YAAY,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;oBAC1D,MAAM,gBAAgB,EAAE,CAAC;gBAC3B,CAAC;aACF,CACF,CAAC;YACF,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzB,MAAM,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;gBACrC,iBAAiB,GAAG,IAAI,CAAC;YAC3B,CAAC;YACD,MAAM,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;QACD,eAAe,GAAG,IAAI,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,cAAc,UAAU,CAAC;QAClD,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACnC,MAAM,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvC,MAAM,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAAE,MAAM,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;aAC7E,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;YACnC,MAAM,mBAAmB,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;;YACzD,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG;YACtC,MAAM,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;QACjE,MAAM,gBAAgB,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,uBAAuB,IAAI,CAAC,wBAAwB;YACtF,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,eAAe,IAAI,CAAC,QAAQ;YAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,IAAI,iBAAiB,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;YAAE,MAAM,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACvF,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,cAAc,WAAW,CAAC;gBACpD,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACpC,MAAM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACzC,MAAM,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;YAC/C,CAAC;;gBAAM,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,KAAa;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpD,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,gBAAgB,CAAC;QACxF,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrF,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC7B,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;IACtB,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;IAC7E,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IACrC,MAAM,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7F,MAAM,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,MAAM,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ;IAC3D,IAAI,QAAQ,KAAK,OAAO;QACtB,OAAO;YACL,WAAW;YACX,UAAU;YACV,gDAAgD;YAChD,sDAAsD;YACtD,iEAAiE;YACjE,6EAA6E;YAC7E,yEAAyE;YACzE,oHAAoH;YACpH,sEAAsE;YACtE,sBAAsB;YACtB,EAAE;SACH,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjB,OAAO;QACL,WAAW;QACX,eAAe,GAAG,QAAQ;QAC1B,sDAAsD;QACtD,oFAAoF;QACpF,wDAAwD;QACxD,gFAAgF;QAChF,gGAAgG;QAChG,6BAA6B;QAC7B,+DAA+D;QAC/D,gHAAgH;QAChH,kEAAkE;QAClE,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,IAAY;IAChC,OAAO,KAAK,CAAC,IAAI,CAAC;SACf,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;SAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,YAAoB,EAAE,OAAe;IAChE,yDAAyD;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IACtC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACnE,QAAQ,CAAuC,KAAK,EAAE,CAAC,WAAW,CAAC,CACpE,CAAC;QACF,IAAI,KAAK,EAAE,GAAG,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,IAAI,YAAY,EAAE,CAAC;YACzF,IAAI,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC3B,OAAO;YACT,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,IAAI,KAAK,CACb,gBAAgB,MAAM,sBAAsB,CAAC,OAAO,CAAC,QAAQ,UAAU,EAAE,SAAS,CACnF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,OAAe;IACnD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtF,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,gBAAgB;QACnC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS;QACnE,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,cAAc,EAAE;YACzC,QAAQ;YACR,KAAK;YACL,eAAe,EAAE;YACjB,IAAI;YACJ,KAAK;YACL,MAAM;SACP,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC;QAC5E,OAAO,cAAc,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,kBAAkB,YAAY,oBAAoB,IAAI,CAAC,IAAI,EAAE,IAAI,aAAa,cAAc,OAAO,EAAE,CAAC;IACrK,CAAC;IACD,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC;IACjG,MAAM,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,aAAa,CAAC;IACpF,MAAM,UAAU,GAAG,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,aAAa,CAAC;IAC5F,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC;IAC5E,OAAO,cAAc,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,kBAAkB,YAAY,mBAAmB,WAAW,uBAAuB,UAAU,cAAc,OAAO,EAAE,CAAC;AACpL,CAAC;AAED,KAAK,UAAU,qBAAqB;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC7F,MAAM,WAAW,GAAG,8BAA8B,OAAO,CAAC,QAAQ,IAAI,mBAAmB,EAAE,EAAE,CAAC;IAC9F,IAAI,cAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC;IACzF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,kBAAkB;YAC9D,MAAM,IAAI,KAAK,CAAC,kBAAkB,WAAW,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,MAAM,IAAI,KAAK,CACb,qBAAqB,WAAW,IAAI,eAAe,6EAA6E,WAAW,IAAI,eAAe,UAAU,UAAU,EAAE,eAAe,EACnM,EAAE,KAAK,EAAE,CACV,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,QAAyB;IAC1E,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YACvD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;QACrE,OAAO,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,IAAI;gBAAE,OAAO;YAClB,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAChC,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC7C,MAAM,CAAC,KAAK,CAAC,CAAC;YACjB,IAAI,MAAM,KAAK,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;IACtB,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IACjG,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,QAAQ,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACzD,MAAM,UAAU,GAA2B;QACzC,GAAG,EAAE,OAAO;QACZ,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,QAAQ;QACb,GAAG,EAAE,QAAQ;KACd,CAAC;IACF,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CAClC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG,sMAAsM,SAAS,CAAC,KAAK,CAAC,sDAAsD,SAAS,CAAC,IAAI,CAAC,oBAAoB,SAAS,CAAC,MAAM,CAAC,oFAAoF,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,0CAA0C,aAAa,EAAE,mCAAmC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,YAAY,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,0CAA0C,CAAC,CAAC,CAAC,EAAE,kGAAkG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,gDAAgD,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,4BAA4B,CAAC;IACt2B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;AACpF,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,OAAe;IAC/C,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;IACtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACzE,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAClE,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACjG,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG,EAAE,CAAC;QACzC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,GAAW;IAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC;SACzB,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;SAC3B,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAClB,IAAI,IAAI,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI;QAAE,OAAO;IACpC,MAAM,EAAE,CAAC,GAAG,GAAG,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,MAAM,MAAM,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,MAAM,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AACvD,CAAC;AAED,KAAK,UAAU,GAAG,CAChB,OAAe,EACf,IAAc,EACd,GAA4B,EAC5B,aAAa,GAAG,KAAK;IAErB,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE;QAC7D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YACjC,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,QAAQ;YACf,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG;SACpD,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IACH,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,UAAU,IAAI,GAAG,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,OAAO,CAAC,OAAe,EAAE,IAAc;IAC9C,OAAO,IAAI,OAAO,CAAS,CAAC,aAAa,EAAE,EAAE;QAC3C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7F,KAAK,MAAM,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YAC/C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,GAAG,GAAG,MAAM,GAAG,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACL,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../src/installer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-handoff-workspace.d.ts","sourceRoot":"","sources":["../src/local-handoff-workspace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-handoff-workspace.d.ts","sourceRoot":"","sources":["../src/local-handoff-workspace.ts"],"names":[],"mappings":"AAMA,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,MAAM;;;;;;;;;;GAqBxD;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBA0B1E;AAED,8CAA8C;AAC9C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO;;;cAWhD;AAED,iGAAiG;AACjG,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBA4B3E"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
|
+
import { execGitFile } from "./git-process.js";
|
|
3
4
|
const exec = promisify(execFile);
|
|
4
5
|
export async function inspectHandoffWorkspace(cwd) {
|
|
5
6
|
try {
|
|
@@ -28,20 +29,33 @@ export async function inspectHandoffWorkspace(cwd) {
|
|
|
28
29
|
export async function synchronizeLocalIntake(cwd, commitSha) {
|
|
29
30
|
if (!/^[a-f0-9]{40,64}$/u.test(commitSha))
|
|
30
31
|
throw new Error("LOCAL_INTAKE_COMMIT_INVALID");
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
throw new Error("LOCAL_INTAKE_WORKTREE_DIRTY:原工作区有未提交修改,请先处理后再继续。");
|
|
34
|
-
await exec("git", ["fetch", "origin", commitSha], { cwd });
|
|
35
|
-
const head = (await exec("git", ["rev-parse", "HEAD"], { cwd })).stdout.trim();
|
|
32
|
+
const git = (...args) => execGitFile("git", args, { cwd });
|
|
33
|
+
const head = (await git("rev-parse", "HEAD")).stdout.trim();
|
|
36
34
|
if (head === commitSha)
|
|
37
35
|
return;
|
|
38
36
|
try {
|
|
39
|
-
|
|
37
|
+
// 已包含接回提交时,不移动 HEAD;未提交文件和未推送提交均可原样接续。
|
|
38
|
+
await git("merge-base", "--is-ancestor", commitSha, head);
|
|
39
|
+
return;
|
|
40
40
|
}
|
|
41
|
-
catch {
|
|
41
|
+
catch (error) {
|
|
42
|
+
const code = error.code;
|
|
43
|
+
if (code !== 1 && code !== 128)
|
|
44
|
+
throw error;
|
|
45
|
+
}
|
|
46
|
+
const status = await git("status", "--porcelain");
|
|
47
|
+
if (status.stdout.trim())
|
|
48
|
+
throw new Error("LOCAL_INTAKE_WORKTREE_DIRTY:原工作区有未提交修改,请先处理后再继续。");
|
|
49
|
+
await git("fetch", "origin", commitSha);
|
|
50
|
+
try {
|
|
51
|
+
await git("merge-base", "--is-ancestor", head, commitSha);
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
if (error.code !== 1)
|
|
55
|
+
throw error;
|
|
42
56
|
throw new Error("LOCAL_INTAKE_WORKTREE_DIVERGED:原工作区与接回提交不一致,请先处理,不自动覆盖。");
|
|
43
57
|
}
|
|
44
|
-
await
|
|
58
|
+
await git("merge", "--ff-only", commitSha);
|
|
45
59
|
}
|
|
46
60
|
/** 仅回传已知冲突的固定说明,Git stderr 可能包含凭证,不作为平台文案。 */
|
|
47
61
|
export function localIntakeFailure(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-handoff-workspace.js","sourceRoot":"","sources":["../src/local-handoff-workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"local-handoff-workspace.js","sourceRoot":"","sources":["../src/local-handoff-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outcome-cli.d.ts","sourceRoot":"","sources":["../src/outcome-cli.ts"],"names":[],"mappings":"AAgBA,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,iBAwE1E"}
|