daycare-cli 0.0.32 → 0.0.33
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/engine/modules/rlm/rlmNoToolsPromptBuild.spec.js +2 -1
- package/dist/engine/modules/rlm/rlmNoToolsPromptBuild.spec.js.map +1 -1
- package/dist/plugins/upgrade/plugin.d.ts.map +1 -1
- package/dist/plugins/upgrade/plugin.js +33 -0
- package/dist/plugins/upgrade/plugin.js.map +1 -1
- package/dist/plugins/upgrade/plugin.spec.js +60 -1
- package/dist/plugins/upgrade/plugin.spec.js.map +1 -1
- package/dist/plugins/upgrade/upgradeRestartPendingSet.d.ts +2 -1
- package/dist/plugins/upgrade/upgradeRestartPendingSet.d.ts.map +1 -1
- package/dist/plugins/upgrade/upgradeRestartPendingSet.js +3 -2
- package/dist/plugins/upgrade/upgradeRestartPendingSet.js.map +1 -1
- package/dist/plugins/upgrade/upgradeRestartPendingTake.d.ts +1 -1
- package/dist/plugins/upgrade/upgradeRestartPendingTake.js +6 -2
- package/dist/plugins/upgrade/upgradeRestartPendingTake.js.map +1 -1
- package/dist/plugins/upgrade/upgradeRestartPendingTypes.d.ts +1 -0
- package/dist/plugins/upgrade/upgradeRestartPendingTypes.d.ts.map +1 -1
- package/dist/plugins/upgrade/upgradeRun.d.ts +1 -0
- package/dist/plugins/upgrade/upgradeRun.d.ts.map +1 -1
- package/dist/plugins/upgrade/upgradeRun.js +3 -3
- package/dist/plugins/upgrade/upgradeRun.js.map +1 -1
- package/dist/plugins/upgrade/upgradeRun.spec.js +4 -5
- package/dist/plugins/upgrade/upgradeRun.spec.js.map +1 -1
- package/dist/plugins/upgrade/upgradeVersionRead.d.ts +6 -0
- package/dist/plugins/upgrade/upgradeVersionRead.d.ts.map +1 -0
- package/dist/plugins/upgrade/upgradeVersionRead.js +34 -0
- package/dist/plugins/upgrade/upgradeVersionRead.js.map +1 -0
- package/dist/plugins/upgrade/upgradeVersionRead.spec.d.ts +2 -0
- package/dist/plugins/upgrade/upgradeVersionRead.spec.d.ts.map +1 -0
- package/dist/plugins/upgrade/upgradeVersionRead.spec.js +10 -0
- package/dist/plugins/upgrade/upgradeVersionRead.spec.js.map +1 -0
- package/dist/prompts/SYSTEM_PERMISSIONS.md +1 -1
- package/dist/prompts/SYSTEM_TOOLS_RLM_INLINE.md +3 -1
- package/package.json +1 -1
|
@@ -18,7 +18,8 @@ describe("rlmNoToolsPromptBuild", () => {
|
|
|
18
18
|
expect(prompt).not.toContain("Available skills");
|
|
19
19
|
expect(prompt).toContain("<python_result>...</python_result>");
|
|
20
20
|
expect(prompt).toContain("do not use `print()` for the final return value");
|
|
21
|
-
expect(prompt).toContain("
|
|
21
|
+
expect(prompt).toContain("emit `<say>` only if you have new user-facing information");
|
|
22
|
+
expect(prompt).toContain("do not repeat the same message");
|
|
22
23
|
expect(prompt.indexOf("Call functions directly (no `await`).")).toBeLessThan(prompt.indexOf("Available functions:"));
|
|
23
24
|
expect(prompt.match(/Use `try\/except ToolError` for tool failures\./g)?.length ?? 0).toBe(1);
|
|
24
25
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rlmNoToolsPromptBuild.spec.js","sourceRoot":"","sources":["../../../../sources/engine/modules/rlm/rlmNoToolsPromptBuild.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,KAAK,GAAG;YACZ,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;YACvD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1D,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE;SACxC,CAAC;QAEvB,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uDAAuD,CAAC,CAAC;QAClF,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,+CAA+C,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,gDAAgD,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,iDAAiD,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"rlmNoToolsPromptBuild.spec.js","sourceRoot":"","sources":["../../../../sources/engine/modules/rlm/rlmNoToolsPromptBuild.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,KAAK,GAAG;YACZ,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;YACvD,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1D,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE;SACxC,CAAC;QAEvB,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAElD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uDAAuD,CAAC,CAAC;QAClF,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,+CAA+C,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,gDAAgD,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,iDAAiD,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,2DAA2D,CAAC,CAAC;QACtF,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC,CAAC,YAAY,CAC1E,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CACvC,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA4BxB,eAAO,MAAM,MAAM;;;gCAmLjB,CAAC"}
|
|
@@ -6,6 +6,7 @@ import { upgradeRestartPendingTake } from "./upgradeRestartPendingTake.js";
|
|
|
6
6
|
import { upgradePm2ProcessDetect } from "./upgradePm2ProcessDetect.js";
|
|
7
7
|
import { upgradeRestartRun } from "./upgradeRestartRun.js";
|
|
8
8
|
import { upgradeRun } from "./upgradeRun.js";
|
|
9
|
+
import { upgradeVersionRead } from "./upgradeVersionRead.js";
|
|
9
10
|
const UPGRADE_COMMAND = "upgrade";
|
|
10
11
|
const RESTART_COMMAND = "restart";
|
|
11
12
|
const RESTART_CONFIRM_MAX_AGE_MS = 5 * 60 * 1000;
|
|
@@ -46,6 +47,22 @@ export const plugin = definePlugin({
|
|
|
46
47
|
}
|
|
47
48
|
};
|
|
48
49
|
await sendStatus("Upgrading Daycare...");
|
|
50
|
+
const previousVersion = await upgradeVersionRead();
|
|
51
|
+
if (previousVersion) {
|
|
52
|
+
try {
|
|
53
|
+
await upgradeRestartPendingSet({
|
|
54
|
+
dataDir: api.dataDir,
|
|
55
|
+
descriptor,
|
|
56
|
+
context,
|
|
57
|
+
requestedAtMs: Date.now(),
|
|
58
|
+
requesterPid: process.pid,
|
|
59
|
+
previousVersion
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
api.logger.warn({ error }, "error: Failed to persist upgrade pending marker");
|
|
64
|
+
}
|
|
65
|
+
}
|
|
49
66
|
try {
|
|
50
67
|
await upgradeRun({
|
|
51
68
|
strategy: settings.strategy,
|
|
@@ -54,6 +71,7 @@ export const plugin = definePlugin({
|
|
|
54
71
|
});
|
|
55
72
|
}
|
|
56
73
|
catch (error) {
|
|
74
|
+
await upgradeRestartPendingClear(api.dataDir);
|
|
57
75
|
api.logger.warn({ error }, "error: Upgrade command failed");
|
|
58
76
|
}
|
|
59
77
|
};
|
|
@@ -124,6 +142,21 @@ export const plugin = definePlugin({
|
|
|
124
142
|
if (Date.now() - pending.requestedAtMs > RESTART_CONFIRM_MAX_AGE_MS) {
|
|
125
143
|
return;
|
|
126
144
|
}
|
|
145
|
+
if (pending.previousVersion) {
|
|
146
|
+
const currentVersion = await upgradeVersionRead();
|
|
147
|
+
if (!currentVersion || currentVersion === pending.previousVersion) {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
try {
|
|
151
|
+
await api.registrar.sendMessage(pending.descriptor, pending.context, {
|
|
152
|
+
text: `Upgrade complete: Daycare ${pending.previousVersion} -> ${currentVersion}.`
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
api.logger.warn({ error }, "error: Failed to send upgrade completion status message");
|
|
157
|
+
}
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
127
160
|
try {
|
|
128
161
|
await api.registrar.sendMessage(pending.descriptor, pending.context, { text: "Restart complete. Daycare is back online." });
|
|
129
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { upgradeRestartPendingSet } from "./upgradeRestartPendingSet.js";
|
|
|
6
6
|
import { upgradeRestartPendingTake } from "./upgradeRestartPendingTake.js";
|
|
7
7
|
import { upgradeRestartRun } from "./upgradeRestartRun.js";
|
|
8
8
|
import { upgradeRun } from "./upgradeRun.js";
|
|
9
|
+
import { upgradeVersionRead } from "./upgradeVersionRead.js";
|
|
9
10
|
vi.mock("./upgradePm2ProcessDetect.js", () => ({
|
|
10
11
|
upgradePm2ProcessDetect: vi.fn()
|
|
11
12
|
}));
|
|
@@ -24,6 +25,9 @@ vi.mock("./upgradeRestartPendingTake.js", () => ({
|
|
|
24
25
|
vi.mock("./upgradeRestartPendingClear.js", () => ({
|
|
25
26
|
upgradeRestartPendingClear: vi.fn()
|
|
26
27
|
}));
|
|
28
|
+
vi.mock("./upgradeVersionRead.js", () => ({
|
|
29
|
+
upgradeVersionRead: vi.fn()
|
|
30
|
+
}));
|
|
27
31
|
describe("upgrade plugin onboarding", () => {
|
|
28
32
|
beforeEach(() => {
|
|
29
33
|
vi.mocked(upgradePm2ProcessDetect).mockReset();
|
|
@@ -32,9 +36,11 @@ describe("upgrade plugin onboarding", () => {
|
|
|
32
36
|
vi.mocked(upgradeRestartPendingSet).mockReset();
|
|
33
37
|
vi.mocked(upgradeRestartPendingTake).mockReset();
|
|
34
38
|
vi.mocked(upgradeRestartPendingClear).mockReset();
|
|
39
|
+
vi.mocked(upgradeVersionRead).mockReset();
|
|
35
40
|
vi.mocked(upgradeRestartPendingSet).mockResolvedValue(undefined);
|
|
36
41
|
vi.mocked(upgradeRestartPendingTake).mockResolvedValue(null);
|
|
37
42
|
vi.mocked(upgradeRestartPendingClear).mockResolvedValue(undefined);
|
|
43
|
+
vi.mocked(upgradeVersionRead).mockResolvedValue("0.0.30");
|
|
38
44
|
});
|
|
39
45
|
it("returns default pm2 settings when daycare process is detected", async () => {
|
|
40
46
|
vi.mocked(upgradePm2ProcessDetect).mockResolvedValue({
|
|
@@ -184,7 +190,13 @@ describe("upgrade plugin commands", () => {
|
|
|
184
190
|
processName: "daycare",
|
|
185
191
|
sendStatus: expect.any(Function)
|
|
186
192
|
}));
|
|
187
|
-
expect(upgradeRestartPendingSet).
|
|
193
|
+
expect(upgradeRestartPendingSet).toHaveBeenNthCalledWith(1, expect.objectContaining({
|
|
194
|
+
dataDir: "/tmp/daycare",
|
|
195
|
+
descriptor,
|
|
196
|
+
context,
|
|
197
|
+
previousVersion: "0.0.30"
|
|
198
|
+
}));
|
|
199
|
+
expect(upgradeRestartPendingSet).toHaveBeenNthCalledWith(2, expect.objectContaining({
|
|
188
200
|
dataDir: "/tmp/daycare",
|
|
189
201
|
descriptor,
|
|
190
202
|
context
|
|
@@ -279,5 +291,52 @@ describe("upgrade plugin commands", () => {
|
|
|
279
291
|
userId: "123"
|
|
280
292
|
}, { messageId: "77" }, { text: "Restart complete. Daycare is back online." });
|
|
281
293
|
});
|
|
294
|
+
it("sends upgrade completion from postStart when the version changed", async () => {
|
|
295
|
+
vi.mocked(upgradeRestartPendingTake).mockResolvedValue({
|
|
296
|
+
descriptor: {
|
|
297
|
+
type: "user",
|
|
298
|
+
connector: "telegram",
|
|
299
|
+
channelId: "123",
|
|
300
|
+
userId: "123"
|
|
301
|
+
},
|
|
302
|
+
context: { messageId: "77" },
|
|
303
|
+
requestedAtMs: Date.now(),
|
|
304
|
+
requesterPid: process.pid - 1,
|
|
305
|
+
previousVersion: "0.0.30"
|
|
306
|
+
});
|
|
307
|
+
vi.mocked(upgradeVersionRead).mockResolvedValue("0.0.31");
|
|
308
|
+
const registrar = {
|
|
309
|
+
registerCommand: vi.fn(),
|
|
310
|
+
unregisterCommand: vi.fn(),
|
|
311
|
+
sendMessage: vi.fn(async () => undefined)
|
|
312
|
+
};
|
|
313
|
+
const api = {
|
|
314
|
+
instance: { instanceId: "upgrade", pluginId: "upgrade" },
|
|
315
|
+
settings: { strategy: "pm2", processName: "daycare" },
|
|
316
|
+
engineSettings: {},
|
|
317
|
+
logger: { warn: vi.fn() },
|
|
318
|
+
auth: {},
|
|
319
|
+
dataDir: "/tmp/daycare",
|
|
320
|
+
registrar,
|
|
321
|
+
exposes: {
|
|
322
|
+
registerProvider: async () => undefined,
|
|
323
|
+
unregisterProvider: async () => undefined,
|
|
324
|
+
listProviders: () => []
|
|
325
|
+
},
|
|
326
|
+
fileStore: {},
|
|
327
|
+
inference: { complete: async () => undefined },
|
|
328
|
+
processes: {},
|
|
329
|
+
mode: "runtime",
|
|
330
|
+
events: { emit: () => undefined }
|
|
331
|
+
};
|
|
332
|
+
const instance = await plugin.create(api);
|
|
333
|
+
await instance.postStart?.();
|
|
334
|
+
expect(registrar.sendMessage).toHaveBeenCalledWith({
|
|
335
|
+
type: "user",
|
|
336
|
+
connector: "telegram",
|
|
337
|
+
channelId: "123",
|
|
338
|
+
userId: "123"
|
|
339
|
+
}, { messageId: "77" }, { text: "Upgrade complete: Daycare 0.0.30 -> 0.0.31." });
|
|
340
|
+
});
|
|
282
341
|
});
|
|
283
342
|
//# sourceMappingURL=plugin.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.spec.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/plugin.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugin.spec.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/plugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,10 @@ type UpgradeRestartPendingSetOptions = {
|
|
|
5
5
|
context: MessageContext;
|
|
6
6
|
requestedAtMs: number;
|
|
7
7
|
requesterPid: number;
|
|
8
|
+
previousVersion?: string;
|
|
8
9
|
};
|
|
9
10
|
/**
|
|
10
|
-
* Persists restart
|
|
11
|
+
* Persists post-restart metadata so the next process can acknowledge restart/upgrade completion.
|
|
11
12
|
* Expects: dataDir exists or can be created, and descriptor/context are command invoker payloads.
|
|
12
13
|
*/
|
|
13
14
|
export declare function upgradeRestartPendingSet(options: UpgradeRestartPendingSetOptions): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRestartPendingSet.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingSet.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE/D,KAAK,+BAA+B,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,cAAc,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"upgradeRestartPendingSet.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingSet.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE/D,KAAK,+BAA+B,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,cAAc,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CAaf"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { mkdir, writeFile } from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
/**
|
|
4
|
-
* Persists restart
|
|
4
|
+
* Persists post-restart metadata so the next process can acknowledge restart/upgrade completion.
|
|
5
5
|
* Expects: dataDir exists or can be created, and descriptor/context are command invoker payloads.
|
|
6
6
|
*/
|
|
7
7
|
export async function upgradeRestartPendingSet(options) {
|
|
@@ -10,7 +10,8 @@ export async function upgradeRestartPendingSet(options) {
|
|
|
10
10
|
descriptor: options.descriptor,
|
|
11
11
|
context: options.context,
|
|
12
12
|
requestedAtMs: options.requestedAtMs,
|
|
13
|
-
requesterPid: options.requesterPid
|
|
13
|
+
requesterPid: options.requesterPid,
|
|
14
|
+
...(options.previousVersion ? { previousVersion: options.previousVersion } : {})
|
|
14
15
|
}), "utf8");
|
|
15
16
|
}
|
|
16
17
|
//# sourceMappingURL=upgradeRestartPendingSet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRestartPendingSet.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"upgradeRestartPendingSet.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAa7B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAAwC;IAExC,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,SAAS,CACb,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,sBAAsB,CAAC,EAClD,IAAI,CAAC,SAAS,CAAC;QACb,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjF,CAAC,EACF,MAAM,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { UpgradeRestartPending } from "./upgradeRestartPendingTypes.js";
|
|
2
2
|
/**
|
|
3
|
-
* Reads and clears persisted restart
|
|
3
|
+
* Reads and clears persisted post-restart metadata.
|
|
4
4
|
* Expects: dataDir points to the plugin data directory.
|
|
5
5
|
*/
|
|
6
6
|
export declare function upgradeRestartPendingTake(dataDir: string): Promise<UpgradeRestartPending | null>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { readFile, rm } from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
/**
|
|
4
|
-
* Reads and clears persisted restart
|
|
4
|
+
* Reads and clears persisted post-restart metadata.
|
|
5
5
|
* Expects: dataDir points to the plugin data directory.
|
|
6
6
|
*/
|
|
7
7
|
export async function upgradeRestartPendingTake(dataDir) {
|
|
@@ -47,7 +47,11 @@ function pendingParse(value) {
|
|
|
47
47
|
descriptor: candidate.descriptor,
|
|
48
48
|
context: candidate.context,
|
|
49
49
|
requestedAtMs: candidate.requestedAtMs,
|
|
50
|
-
requesterPid: candidate.requesterPid
|
|
50
|
+
requesterPid: candidate.requesterPid,
|
|
51
|
+
...(typeof candidate.previousVersion === "string" &&
|
|
52
|
+
candidate.previousVersion.trim().length > 0
|
|
53
|
+
? { previousVersion: candidate.previousVersion.trim() }
|
|
54
|
+
: {})
|
|
51
55
|
};
|
|
52
56
|
}
|
|
53
57
|
//# sourceMappingURL=upgradeRestartPendingTake.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRestartPendingTake.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingTake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,OAAe;IAEf,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC7D,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAY,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"upgradeRestartPendingTake.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingTake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,OAAe;IAEf,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC7D,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAY,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,MAMjB,CAAC;IACF,IAAI,OAAO,SAAS,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,SAAS,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,UAAU,EAAE,SAAS,CAAC,UAAiD;QACvE,OAAO,EAAE,SAAS,CAAC,OAA2C;QAC9D,aAAa,EAAE,SAAS,CAAC,aAAa;QACtC,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,GAAG,CAAC,OAAO,SAAS,CAAC,eAAe,KAAK,QAAQ;YACjD,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;YACzC,CAAC,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE;YACvD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRestartPendingTypes.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE/D,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,cAAc,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"upgradeRestartPendingTypes.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRestartPendingTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE/D,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,cAAc,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}
|
|
@@ -5,6 +5,7 @@ type UpgradeRunOptions = {
|
|
|
5
5
|
};
|
|
6
6
|
/**
|
|
7
7
|
* Runs a full CLI upgrade and restart flow for the configured runtime strategy.
|
|
8
|
+
* PM2 restart command errors are reported and ignored so postStart can confirm by version delta.
|
|
8
9
|
* Expects: strategy is supported and processName is a non-empty PM2 process identifier.
|
|
9
10
|
*/
|
|
10
11
|
export declare function upgradeRun(options: UpgradeRunOptions): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRun.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRun.ts"],"names":[],"mappings":"AAEA,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,KAAK,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"upgradeRun.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRun.ts"],"names":[],"mappings":"AAEA,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,KAAK,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B1E"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
2
|
/**
|
|
3
3
|
* Runs a full CLI upgrade and restart flow for the configured runtime strategy.
|
|
4
|
+
* PM2 restart command errors are reported and ignored so postStart can confirm by version delta.
|
|
4
5
|
* Expects: strategy is supported and processName is a non-empty PM2 process identifier.
|
|
5
6
|
*/
|
|
6
7
|
export async function upgradeRun(options) {
|
|
@@ -23,11 +24,10 @@ export async function upgradeRun(options) {
|
|
|
23
24
|
await commandRun("pm2", ["restart", options.processName]);
|
|
24
25
|
}
|
|
25
26
|
catch (error) {
|
|
26
|
-
const text = `
|
|
27
|
+
const text = `Restart reported an error for PM2 process \"${options.processName}\" and was ignored: ${errorTextBuild(error)}`;
|
|
27
28
|
await options.sendStatus(text);
|
|
28
|
-
|
|
29
|
+
return;
|
|
29
30
|
}
|
|
30
|
-
await options.sendStatus(`Upgrade complete. PM2 process \"${options.processName}\" restarted.`);
|
|
31
31
|
}
|
|
32
32
|
function commandRun(command, args) {
|
|
33
33
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRun.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAQ9C
|
|
1
|
+
{"version":3,"file":"upgradeRun.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAQ9C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA0B;IACzD,MAAM,OAAO,CAAC,UAAU,CAAC,uDAAuD,CAAC,CAAC;IAElF,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,gDAAgD,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACrF,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,wCAAwC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACxE,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,OAAO,CAAC,UAAU,CAAC,wBAAwB,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;IAErF,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,+CAA+C,OAAO,CAAC,WAAW,uBAAuB,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9H,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,OAAe,EAAE,IAAc;IACjD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,QAAQ,CACN,OAAO,EACP,IAAI,EACJ;YACE,WAAW,EAAE,IAAI;SAClB,EACD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,OAAO;YACT,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,UAAU,GAAG,KAGlB,CAAC;IACF,MAAM,OAAO,GAAG;QACd,MAAM,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QACtC,MAAM,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;KACvC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACpC,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,IAAI,eAAe,CAAC;AAC1C,CAAC"}
|
|
@@ -33,8 +33,7 @@ describe("upgradeRun", () => {
|
|
|
33
33
|
expect(execFileMock).toHaveBeenNthCalledWith(2, "pm2", ["restart", "daycare"], { windowsHide: true }, expect.any(Function));
|
|
34
34
|
expect(sendStatus.mock.calls.map((call) => call[0])).toEqual([
|
|
35
35
|
"Upgrading Daycare CLI (npm install -g daycare-cli)...",
|
|
36
|
-
"Restarting process \"daycare\" via pm2..."
|
|
37
|
-
"Upgrade complete. PM2 process \"daycare\" restarted."
|
|
36
|
+
"Restarting process \"daycare\" via pm2..."
|
|
38
37
|
]);
|
|
39
38
|
});
|
|
40
39
|
it("reports npm install failures and aborts restart", async () => {
|
|
@@ -51,7 +50,7 @@ describe("upgradeRun", () => {
|
|
|
51
50
|
expect(execFileMock).toHaveBeenCalledTimes(1);
|
|
52
51
|
expect(sendStatus).toHaveBeenCalledWith("Upgrade failed while installing daycare-cli: permission denied");
|
|
53
52
|
});
|
|
54
|
-
it("
|
|
53
|
+
it("ignores restart failures after install succeeds", async () => {
|
|
55
54
|
execSucceed();
|
|
56
55
|
const error = Object.assign(new Error("restart failed"), {
|
|
57
56
|
stderr: "pm2 not found"
|
|
@@ -62,9 +61,9 @@ describe("upgradeRun", () => {
|
|
|
62
61
|
strategy: "pm2",
|
|
63
62
|
processName: "daycare",
|
|
64
63
|
sendStatus
|
|
65
|
-
})).
|
|
64
|
+
})).resolves.toBeUndefined();
|
|
66
65
|
expect(execFileMock).toHaveBeenCalledTimes(2);
|
|
67
|
-
expect(sendStatus).toHaveBeenCalledWith('
|
|
66
|
+
expect(sendStatus).toHaveBeenCalledWith('Restart reported an error for PM2 process "daycare" and was ignored: pm2 not found');
|
|
68
67
|
});
|
|
69
68
|
});
|
|
70
69
|
//# sourceMappingURL=upgradeRun.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeRun.spec.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRun.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,YAAY,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AAE7B,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;CACxD,CAAC,CAAC,CAAC;AAEJ,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,SAAS,WAAW;IAClB,YAAY,CAAC,sBAAsB,CACjC,CACE,QAAgB,EAChB,KAAe,EACf,QAAkC,EAClC,QAAuC,EACvC,EAAE;QACF,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAY;IAC5B,YAAY,CAAC,sBAAsB,CACjC,CACE,QAAgB,EAChB,KAAe,EACf,QAAkC,EAClC,QAAuC,EACvC,EAAE;QACF,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,CAAC,SAAS,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,CAA0B,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC;QAEzE,MAAM,UAAU,CAAC;YACf,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,SAAS;YACtB,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,CAAC,YAAY,CAAC,CAAC,uBAAuB,CAC1C,CAAC,EACD,KAAK,EACL,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC,EAChC,EAAE,WAAW,EAAE,IAAI,EAAE,EACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CACrB,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,CAAC,uBAAuB,CAC1C,CAAC,EACD,KAAK,EACL,CAAC,SAAS,EAAE,SAAS,CAAC,EACtB,EAAE,WAAW,EAAE,IAAI,EAAE,EACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CACrB,CAAC;QACF,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3D,uDAAuD;YACvD,2CAA2C;
|
|
1
|
+
{"version":3,"file":"upgradeRun.spec.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeRun.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgradeVersionRead.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeVersionRead.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBjE"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
4
|
+
/**
|
|
5
|
+
* Reads the running Daycare package version from package.json.
|
|
6
|
+
* Returns: null when package metadata cannot be read or is invalid.
|
|
7
|
+
*/
|
|
8
|
+
export async function upgradeVersionRead() {
|
|
9
|
+
const currentFile = fileURLToPath(import.meta.url);
|
|
10
|
+
const packageJsonPath = path.resolve(path.dirname(currentFile), "../../../package.json");
|
|
11
|
+
let raw = "";
|
|
12
|
+
try {
|
|
13
|
+
raw = await readFile(packageJsonPath, "utf8");
|
|
14
|
+
}
|
|
15
|
+
catch {
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
let parsed;
|
|
19
|
+
try {
|
|
20
|
+
parsed = JSON.parse(raw);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
if (!parsed || typeof parsed !== "object") {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
const version = parsed.version;
|
|
29
|
+
if (typeof version !== "string" || version.trim().length === 0) {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
return version.trim();
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=upgradeVersionRead.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgradeVersionRead.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeVersionRead.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC,CAAC;IACzF,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAI,MAAgC,CAAC,OAAO,CAAC;IAC1D,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;AACxB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgradeVersionRead.spec.d.ts","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeVersionRead.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { upgradeVersionRead } from "./upgradeVersionRead.js";
|
|
3
|
+
describe("upgradeVersionRead", () => {
|
|
4
|
+
it("reads a semantic version from package metadata", async () => {
|
|
5
|
+
const version = await upgradeVersionRead();
|
|
6
|
+
expect(version).toBeTruthy();
|
|
7
|
+
expect(version).toMatch(/^\d+\.\d+\.\d+/);
|
|
8
|
+
});
|
|
9
|
+
});
|
|
10
|
+
//# sourceMappingURL=upgradeVersionRead.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgradeVersionRead.spec.js","sourceRoot":"","sources":["../../../sources/plugins/upgrade/upgradeVersionRead.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,OAAO,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAE3C,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
## Permissions
|
|
2
2
|
|
|
3
3
|
Workspace is your home. Everything needed is there. Don't read/write outside unless necessary.
|
|
4
|
-
Permissions exist to help you move fast without crossing sensitive boundaries - they're guardrails, not stop signs.
|
|
4
|
+
Permissions exist to help you move fast without crossing sensitive boundaries - they're guardrails, not stop signs. Every `exec` command is running in the sandbox environment that can't be disabled. You can run untrusted (or generated code) with limited permissions. It is not bulletproof but (ie some advanced virus would be able to escape), but it would work for most violent workloads.
|
|
5
5
|
Move fast when possible. Move fast when blocked. Move fast with narrow permission requests.
|
|
6
6
|
Bias toward action. If you can do it, do it. Finish unblocked work first, then request the narrowest permission needed when truly blocked.
|
|
7
7
|
|
|
@@ -7,6 +7,7 @@ Emit at most one Python block per assistant response.
|
|
|
7
7
|
The system executes everything between the first `<run_python>` and last `</run_python>`.
|
|
8
8
|
If you include `<say>` in the same response, all `<say>` blocks must come before `<run_python>`.
|
|
9
9
|
Do not place `<say>` blocks after `<run_python>` in the same response.
|
|
10
|
+
`<say>` is always delivered immediatelly no matter what the other messages or python execution result.
|
|
10
11
|
No escaping is needed.
|
|
11
12
|
Call functions directly (no `await`).
|
|
12
13
|
Use `try/except ToolError` for tool failures.
|
|
@@ -14,7 +15,8 @@ Use `print()` for debug output.
|
|
|
14
15
|
The value of the final expression is returned.
|
|
15
16
|
Put the value you want to return as the final expression line; do not use `print()` for the final return value.
|
|
16
17
|
Execution results are sent back as user messages wrapped in `<python_result>...</python_result>`.
|
|
17
|
-
After receiving `<python_result>`,
|
|
18
|
+
After receiving `<python_result>`, emit `<say>` only if you have new user-facing information.
|
|
19
|
+
If you already emitted `<say>` before `<run_python>`, do not repeat the same message.
|
|
18
20
|
|
|
19
21
|
Available functions:
|
|
20
22
|
```python
|