@bf-meishijian/aip 0.0.10 → 0.0.12

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.
Files changed (66) hide show
  1. package/README.md +2 -0
  2. package/dist/cli.d.ts +1 -0
  3. package/dist/cli.d.ts.map +1 -1
  4. package/dist/cli.js +5 -0
  5. package/dist/cli.js.map +1 -1
  6. package/dist/coding-run-manager.d.ts +19 -2
  7. package/dist/coding-run-manager.d.ts.map +1 -1
  8. package/dist/coding-run-manager.js +92 -55
  9. package/dist/coding-run-manager.js.map +1 -1
  10. package/dist/daemon.d.ts +1 -0
  11. package/dist/daemon.d.ts.map +1 -1
  12. package/dist/daemon.js +14 -2
  13. package/dist/daemon.js.map +1 -1
  14. package/dist/diagnostics.d.ts +3 -1
  15. package/dist/diagnostics.d.ts.map +1 -1
  16. package/dist/diagnostics.js +3 -0
  17. package/dist/diagnostics.js.map +1 -1
  18. package/dist/git-process.d.ts +23 -0
  19. package/dist/git-process.d.ts.map +1 -0
  20. package/dist/git-process.js +162 -0
  21. package/dist/git-process.js.map +1 -0
  22. package/dist/git-transport.d.ts +6 -0
  23. package/dist/git-transport.d.ts.map +1 -0
  24. package/dist/git-transport.js +51 -0
  25. package/dist/git-transport.js.map +1 -0
  26. package/dist/host-tools.d.ts +10 -0
  27. package/dist/host-tools.d.ts.map +1 -0
  28. package/dist/host-tools.js +109 -0
  29. package/dist/host-tools.js.map +1 -0
  30. package/dist/installer.d.ts.map +1 -1
  31. package/dist/installer.js +6 -1
  32. package/dist/installer.js.map +1 -1
  33. package/dist/live-employee.d.ts.map +1 -1
  34. package/dist/live-employee.js +18 -23
  35. package/dist/live-employee.js.map +1 -1
  36. package/dist/pi-model-service.d.ts.map +1 -1
  37. package/dist/platform-client.d.ts +3 -0
  38. package/dist/platform-client.d.ts.map +1 -1
  39. package/dist/platform-client.js +5 -1
  40. package/dist/platform-client.js.map +1 -1
  41. package/dist/qa-project-checkout.d.ts.map +1 -1
  42. package/dist/qa-project-checkout.js +9 -4
  43. package/dist/qa-project-checkout.js.map +1 -1
  44. package/dist/qa-session-manager.d.ts +2 -2
  45. package/dist/qa-session-manager.d.ts.map +1 -1
  46. package/dist/qa-session-manager.js +12 -9
  47. package/dist/qa-session-manager.js.map +1 -1
  48. package/dist/run-resources.d.ts +18 -0
  49. package/dist/run-resources.d.ts.map +1 -0
  50. package/dist/run-resources.js +115 -0
  51. package/dist/run-resources.js.map +1 -0
  52. package/dist/runtime-environment.d.ts +2 -0
  53. package/dist/runtime-environment.d.ts.map +1 -0
  54. package/dist/runtime-environment.js +7 -0
  55. package/dist/runtime-environment.js.map +1 -0
  56. package/dist/secure-json.d.ts +8 -0
  57. package/dist/secure-json.d.ts.map +1 -1
  58. package/dist/secure-json.js +30 -2
  59. package/dist/secure-json.js.map +1 -1
  60. package/dist/state.d.ts +2 -2
  61. package/dist/state.js +2 -2
  62. package/dist/windows-service.d.ts +1 -0
  63. package/dist/windows-service.d.ts.map +1 -1
  64. package/dist/windows-service.js +11 -5
  65. package/dist/windows-service.js.map +1 -1
  66. package/package.json +6 -6
@@ -0,0 +1,115 @@
1
+ import "./runtime-environment.js";
2
+ import { realpath, stat } from "node:fs/promises";
3
+ import { basename, isAbsolute, join, relative } from "node:path";
4
+ import { SessionManager } from "@earendil-works/pi-coding-agent";
5
+ import { execGitFile as git } from "./git-process.js";
6
+ import { gitTransportUrl, matchesRepository } from "./git-transport.js";
7
+ import { paths } from "./paths.js";
8
+ import { readJson } from "./secure-json.js";
9
+ export function projectDirectory(name) {
10
+ return basename(name).replace(/[^a-zA-Z0-9._-]/gu, "-") || "project";
11
+ }
12
+ export async function inspectRunResources(runId, input, busy = false) {
13
+ const local = paths();
14
+ const root = join(local.runWorktrees, runId);
15
+ const facts = {
16
+ session: "MISSING",
17
+ workspace: "PRESENT",
18
+ remoteBranch: "NOT_CHECKED",
19
+ busy,
20
+ reasonCode: "RESOURCES_READY",
21
+ };
22
+ if (!input.projects.length || input.projects.some((project) => !project.devBranch?.trim()))
23
+ return { ...facts, workspace: "INVALID", reasonCode: "CODING_RUN_WORKTREE_INVALID" };
24
+ try {
25
+ const state = await readJson(join(local.runState, `${runId}.json`));
26
+ const expected = input.expectedSessionId ?? state?.phaseSessions?.[input.phase];
27
+ const cwd = input.projects.length === 1 ? join(root, projectDirectory(input.projects[0].name)) : root;
28
+ if (expected) {
29
+ const listed = await SessionManager.list(cwd, local.piSessions);
30
+ const match = listed.find((session) => session.id === expected);
31
+ if (match) {
32
+ const sessionPath = await realpath(match.path);
33
+ const boundary = relative(await realpath(local.piSessions), sessionPath);
34
+ if (boundary.startsWith("..") || isAbsolute(boundary))
35
+ throw new Error("SESSION_BOUNDARY_INVALID");
36
+ const session = SessionManager.open(sessionPath, local.piSessions, cwd);
37
+ const bound = session
38
+ .getEntries()
39
+ .some((entry) => entry.type === "custom" &&
40
+ entry.customType === "aip-run-binding" &&
41
+ entry.data?.runId === runId);
42
+ facts.session = bound ? "PRESENT" : "INVALID";
43
+ }
44
+ }
45
+ }
46
+ catch {
47
+ facts.session = "INVALID";
48
+ }
49
+ const missing = [];
50
+ for (const project of input.projects) {
51
+ const target = join(root, projectDirectory(project.name));
52
+ if (!(await stat(target).catch(() => null))?.isDirectory()) {
53
+ missing.push(project);
54
+ if (facts.workspace !== "INVALID")
55
+ facts.workspace = "MISSING";
56
+ continue;
57
+ }
58
+ try {
59
+ const boundary = relative(await realpath(local.runWorktrees), await realpath(target));
60
+ if (boundary.startsWith("..") || isAbsolute(boundary))
61
+ throw new Error("WORKSPACE_BOUNDARY_INVALID");
62
+ const options = { cwd: target, timeout: 5_000 };
63
+ const [branch, origin] = await Promise.all([
64
+ git("git", ["branch", "--show-current"], options),
65
+ git("git", ["config", "--get", "remote.origin.url"], options),
66
+ ]);
67
+ if (branch.stdout.trim() !== project.devBranch ||
68
+ !(await matchesRepository(origin.stdout.trim(), project.repositoryUrl, project.sshRepositoryUrl)))
69
+ throw new Error("WORKSPACE_BINDING_INVALID");
70
+ }
71
+ catch {
72
+ facts.workspace = "INVALID";
73
+ }
74
+ }
75
+ if (facts.workspace === "MISSING") {
76
+ const statuses = await Promise.all(missing.map(async (project) => {
77
+ try {
78
+ const result = await git("git", [
79
+ "ls-remote",
80
+ "--exit-code",
81
+ "--heads",
82
+ gitTransportUrl(project.repositoryUrl, project.sshRepositoryUrl),
83
+ `refs/heads/${project.devBranch}`,
84
+ ], {
85
+ timeout: 10_000,
86
+ env: { ...process.env, GIT_TERMINAL_PROMPT: "0" },
87
+ });
88
+ return result.stdout.trim() ? "PRESENT" : "MISSING";
89
+ }
90
+ catch (error) {
91
+ return error.code === 2 ? "MISSING" : "UNKNOWN";
92
+ }
93
+ }));
94
+ facts.remoteBranch = statuses.includes("UNKNOWN")
95
+ ? "UNKNOWN"
96
+ : statuses.every((status) => status === "PRESENT")
97
+ ? "PRESENT"
98
+ : "MISSING";
99
+ }
100
+ facts.reasonCode = busy
101
+ ? "LOCAL_EXECUTION_ACTIVE"
102
+ : facts.workspace === "INVALID"
103
+ ? "CODING_RUN_WORKTREE_INVALID"
104
+ : facts.workspace === "MISSING"
105
+ ? facts.remoteBranch === "UNKNOWN"
106
+ ? "CODING_REPOSITORY_ACCESS_FAILED"
107
+ : "CODING_RUN_WORKTREE_MISSING"
108
+ : facts.session === "INVALID"
109
+ ? "PI_SESSION_INVALID"
110
+ : facts.session === "MISSING"
111
+ ? "PI_SESSION_NOT_FOUND"
112
+ : "RESOURCES_READY";
113
+ return facts;
114
+ }
115
+ //# sourceMappingURL=run-resources.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"run-resources.js","sourceRoot":"","sources":["../src/run-resources.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,WAAW,IAAI,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAc5C,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC,IAAI,SAAS,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAa,EACb,KAAoB,EACpB,IAAI,GAAG,KAAK;IAEZ,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;IACtB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAU;QACnB,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,SAAS;QACpB,YAAY,EAAE,aAAa;QAC3B,IAAI;QACJ,UAAU,EAAE,iBAAiB;KAC9B,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;QACxF,OAAO,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,6BAA6B,EAAE,CAAC;IACvF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAC1B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CACtC,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,IAAI,KAAK,EAAE,aAAa,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChF,MAAM,GAAG,GACP,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7F,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAChE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YAChE,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;gBACzE,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC;oBACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBAC9C,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;gBACxE,MAAM,KAAK,GAAG,OAAO;qBAClB,UAAU,EAAE;qBACZ,IAAI,CACH,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,IAAI,KAAK,QAAQ;oBACvB,KAAK,CAAC,UAAU,KAAK,iBAAiB;oBACrC,KAAK,CAAC,IAAuC,EAAE,KAAK,KAAK,KAAK,CAClE,CAAC;gBACJ,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAChD,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;IAC5B,CAAC;IACD,MAAM,OAAO,GAA8B,EAAE,CAAC;IAC9C,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC;YAC3D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;gBAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC/D,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YACtF,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC;gBACnD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YAChD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACzC,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBACjD,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC;aAC9D,CAAC,CAAC;YACH,IACE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC,SAAS;gBAC1C,CAAC,CAAC,MAAM,iBAAiB,CACvB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EACpB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,gBAAgB,CACzB,CAAC;gBAEF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC5B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,GAAG,CACtB,KAAK,EACL;oBACE,WAAW;oBACX,aAAa;oBACb,SAAS;oBACT,eAAe,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,gBAAgB,CAAC;oBAChE,cAAc,OAAO,CAAC,SAAS,EAAE;iBAClC,EACD;oBACE,OAAO,EAAE,MAAM;oBACf,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE;iBAClD,CACF,CAAC;gBACF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YACtD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAQ,KAA2B,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YACzE,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,KAAK,CAAC,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC/C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC;gBAChD,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,SAAS,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,UAAU,GAAG,IAAI;QACrB,CAAC,CAAC,wBAAwB;QAC1B,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS;YAC7B,CAAC,CAAC,6BAA6B;YAC/B,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS;gBAC7B,CAAC,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS;oBAChC,CAAC,CAAC,iCAAiC;oBACnC,CAAC,CAAC,6BAA6B;gBACjC,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS;oBAC3B,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS;wBAC3B,CAAC,CAAC,sBAAsB;wBACxB,CAAC,CAAC,iBAAiB,CAAC;IAC9B,OAAO,KAAK,CAAC;AACf,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=runtime-environment.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runtime-environment.d.ts","sourceRoot":"","sources":["../src/runtime-environment.ts"],"names":[],"mappings":""}
@@ -0,0 +1,7 @@
1
+ import { activeProfile, paths } from "./paths.js";
2
+ // 必须先于 Pi SDK 求值:工具管理器在模块加载时绑定其 bin 目录。
3
+ process.env.AIP_PROFILE = process.argv.includes("--local") ? "local" : activeProfile();
4
+ process.env.PI_CODING_AGENT_DIR = paths().piAgent;
5
+ // 正式 Runtime 已分发所需工具;缺失必须反馈,不能在任务期间临时下载。
6
+ process.env.PI_OFFLINE = "1";
7
+ //# sourceMappingURL=runtime-environment.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runtime-environment.js","sourceRoot":"","sources":["../src/runtime-environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAElD,wCAAwC;AACxC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;AACvF,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC;AAClD,yCAAyC;AACzC,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC"}
@@ -1,4 +1,12 @@
1
+ import { rename } from "node:fs/promises";
2
+ interface SecureFileReplaceOptions {
3
+ platform?: NodeJS.Platform;
4
+ renameFile?: typeof rename;
5
+ wait?: (milliseconds: number) => Promise<void>;
6
+ }
7
+ export declare function replaceSecureFile(temporary: string, path: string, options?: SecureFileReplaceOptions): Promise<void>;
1
8
  export declare function writeSecureJson(path: string, value: unknown): Promise<void>;
2
9
  export declare function readJson<T>(path: string): Promise<T | null>;
3
10
  export declare function isSecureFile(path: string): Promise<boolean>;
11
+ export {};
4
12
  //# sourceMappingURL=secure-json.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"secure-json.d.ts","sourceRoot":"","sources":["../src/secure-json.ts"],"names":[],"mappings":"AAKA,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,iBAcjE;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAOjE;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,oBAO9C"}
1
+ {"version":3,"file":"secure-json.d.ts","sourceRoot":"","sources":["../src/secure-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,MAAM,EAAY,MAAM,kBAAkB,CAAC;AAMlF,UAAU,wBAAwB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,wBAA6B,iBAmBvC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,iBAmBjE;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAOjE;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,oBAO9C"}
@@ -1,7 +1,29 @@
1
1
  import { spawn } from "node:child_process";
2
2
  import { randomBytes } from "node:crypto";
3
- import { chmod, mkdir, open, readFile, rename, stat } from "node:fs/promises";
3
+ import { chmod, mkdir, open, readFile, rename, rm, stat } from "node:fs/promises";
4
4
  import { dirname } from "node:path";
5
+ const WINDOWS_REPLACE_ATTEMPTS = 150;
6
+ const WINDOWS_REPLACE_DELAY_MS = 200;
7
+ export async function replaceSecureFile(temporary, path, options = {}) {
8
+ const platform = options.platform ?? process.platform;
9
+ const renameFile = options.renameFile ?? rename;
10
+ const wait = options.wait ??
11
+ ((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)));
12
+ const attempts = platform === "win32" ? WINDOWS_REPLACE_ATTEMPTS : 1;
13
+ for (let attempt = 1; attempt <= attempts; attempt++) {
14
+ try {
15
+ await renameFile(temporary, path);
16
+ return;
17
+ }
18
+ catch (error) {
19
+ const code = error.code;
20
+ const transient = code === "EPERM" || code === "EACCES" || code === "EBUSY";
21
+ if (platform !== "win32" || !transient || attempt === attempts)
22
+ throw error;
23
+ await wait(WINDOWS_REPLACE_DELAY_MS);
24
+ }
25
+ }
26
+ }
5
27
  export async function writeSecureJson(path, value) {
6
28
  await mkdir(dirname(path), { recursive: true, mode: 0o700 });
7
29
  const temporary = `${path}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`;
@@ -17,7 +39,13 @@ export async function writeSecureJson(path, value) {
17
39
  await restrictWindowsAcl(temporary);
18
40
  else
19
41
  await chmod(temporary, 0o600);
20
- await rename(temporary, path);
42
+ try {
43
+ await replaceSecureFile(temporary, path);
44
+ }
45
+ catch (error) {
46
+ await rm(temporary, { force: true }).catch(() => undefined);
47
+ throw error;
48
+ }
21
49
  if (process.platform !== "win32")
22
50
  await chmod(path, 0o600);
23
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"secure-json.js","sourceRoot":"","sources":["../src/secure-json.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"secure-json.js","sourceRoot":"","sources":["../src/secure-json.ts"],"names":[],"mappings":"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"}
package/dist/state.d.ts CHANGED
@@ -18,8 +18,8 @@ export interface HostState {
18
18
  runtimeVersion: string;
19
19
  catalogRevision: number;
20
20
  }
21
- export declare const CLI_VERSION = "0.0.10";
22
- export declare const RUNTIME_VERSION = "0.0.10";
21
+ export declare const CLI_VERSION = "0.0.12";
22
+ export declare const RUNTIME_VERSION = "0.0.12";
23
23
  export declare function hostIdentity(): {
24
24
  fingerprint: string;
25
25
  hostName: string;
package/dist/state.js CHANGED
@@ -4,8 +4,8 @@ import { paths } from "./paths.js";
4
4
  import { bindPlatform } from "./profile.js";
5
5
  import { runtimeArchitecture } from "./platform.js";
6
6
  import { readJson, writeSecureJson } from "./secure-json.js";
7
- export const CLI_VERSION = "0.0.10";
8
- export const RUNTIME_VERSION = "0.0.10";
7
+ export const CLI_VERSION = "0.0.12";
8
+ export const RUNTIME_VERSION = "0.0.12";
9
9
  export function hostIdentity() {
10
10
  const hostName = hostname();
11
11
  return {
@@ -16,5 +16,6 @@ export declare function installWindowsTask(runtime: string, root: string, taskNa
16
16
  };
17
17
  }>;
18
18
  export declare function stopWindowsTask(runtime: string, taskName?: string): Promise<void>;
19
+ export declare function windowsStopScript(runtime: string, taskName?: string): string;
19
20
  export declare function runWindowsPowerShell(script: string): Promise<number>;
20
21
  //# sourceMappingURL=windows-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"windows-service.d.ts","sourceRoot":"","sources":["../src/windows-service.ts"],"names":[],"mappings":"AAQA,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;;;;EAqBnE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAc5D;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,SAAoB;;;;;;;GAiC7B;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAoB,iBAiBlF;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,mBAyBxD"}
1
+ {"version":3,"file":"windows-service.d.ts","sourceRoot":"","sources":["../src/windows-service.ts"],"names":[],"mappings":"AAQA,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;;;;EAqBnE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAc5D;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,SAAoB;;;;;;;GAiC7B;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAoB,iBAElF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAoB,UAkB9E;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,mBAyBxD"}
@@ -63,20 +63,26 @@ export async function installWindowsTask(runtime, root, taskName = windowsTaskNa
63
63
  return task;
64
64
  }
65
65
  export async function stopWindowsTask(runtime, taskName = windowsTaskName()) {
66
- await runWindowsPowerShell([
66
+ await runWindowsPowerShell(windowsStopScript(runtime, taskName));
67
+ }
68
+ export function windowsStopScript(runtime, taskName = windowsTaskName()) {
69
+ return [
67
70
  `$name = ${quote(taskName)}`,
68
- "if (Get-ScheduledTask -TaskName $name -ErrorAction SilentlyContinue) { Stop-ScheduledTask -TaskName $name }",
71
+ "$scheduledTask = Get-ScheduledTask -TaskName $name -ErrorAction SilentlyContinue",
72
+ "if ($scheduledTask) { Stop-ScheduledTask -TaskName $name }",
69
73
  `$daemon = ${quote(win32.join(runtime, "app", "dist", "daemon.js"))}`,
70
74
  // 只处理该 Runtime 的 daemon,不能停止用户其他 node.exe 或当前安装 CLI。
71
75
  "$deadline = [DateTime]::UtcNow.AddSeconds(30)",
72
76
  "do {",
73
77
  " $remaining = @(Get-CimInstance Win32_Process -Filter \"Name='node.exe'\" | Where-Object { $_.CommandLine -and $_.CommandLine.Contains($daemon) })",
74
78
  " foreach ($process in $remaining) { Stop-Process -Id $process.ProcessId -Force -ErrorAction SilentlyContinue }",
75
- " if ($remaining.Count -gt 0) { Start-Sleep -Milliseconds 200 }",
76
- "} while ($remaining.Count -gt 0 -and [DateTime]::UtcNow -lt $deadline)",
79
+ " $scheduledTask = Get-ScheduledTask -TaskName $name -ErrorAction SilentlyContinue",
80
+ " if ($remaining.Count -gt 0 -or ($scheduledTask -and $scheduledTask.State -eq 'Running')) { Start-Sleep -Milliseconds 200 }",
81
+ "} while (($remaining.Count -gt 0 -or ($scheduledTask -and $scheduledTask.State -eq 'Running')) -and [DateTime]::UtcNow -lt $deadline)",
77
82
  "$remaining = @(Get-CimInstance Win32_Process -Filter \"Name='node.exe'\" | Where-Object { $_.CommandLine -and $_.CommandLine.Contains($daemon) })",
78
83
  "if ($remaining.Count -gt 0) { throw 'Host process did not stop' }",
79
- ].join("\n"));
84
+ "if ($scheduledTask -and $scheduledTask.State -eq 'Running') { throw 'Scheduled task did not stop' }",
85
+ ].join("\n");
80
86
  }
81
87
  export async function runWindowsPowerShell(script) {
82
88
  const executable = windowsTaskDefinition("", "").executable;
@@ -1 +1 @@
1
- {"version":3,"file":"windows-service.js","sourceRoot":"","sources":["../src/windows-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"windows-service.js","sourceRoot":"","sources":["../src/windows-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bf-meishijian/aip",
3
- "version": "0.0.10",
3
+ "version": "0.0.12",
4
4
  "description": "AI Platform Local Coding Host",
5
5
  "type": "module",
6
6
  "bin": {
@@ -38,11 +38,11 @@
38
38
  },
39
39
  "license": "UNLICENSED",
40
40
  "optionalDependencies": {
41
- "@bf-meishijian/aip-runtime-darwin-arm64": "0.0.10",
42
- "@bf-meishijian/aip-runtime-darwin-x64": "0.0.10",
43
- "@bf-meishijian/aip-runtime-linux-arm64": "0.0.10",
44
- "@bf-meishijian/aip-runtime-linux-x64": "0.0.10",
45
- "@bf-meishijian/aip-runtime-win32-x64": "0.0.10"
41
+ "@bf-meishijian/aip-runtime-darwin-arm64": "0.0.12",
42
+ "@bf-meishijian/aip-runtime-darwin-x64": "0.0.12",
43
+ "@bf-meishijian/aip-runtime-linux-arm64": "0.0.12",
44
+ "@bf-meishijian/aip-runtime-linux-x64": "0.0.12",
45
+ "@bf-meishijian/aip-runtime-win32-x64": "0.0.12"
46
46
  },
47
47
  "scripts": {
48
48
  "build": "tsc -p tsconfig.build.json && node scripts/bundle-stage-delivery.mjs",