daycare-cli 0.0.7 → 0.0.9
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/commands/add.js +3 -1
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/event.js +2 -2
- package/dist/commands/event.js.map +1 -1
- package/dist/commands/event.spec.js +7 -7
- package/dist/commands/event.spec.js.map +1 -1
- package/dist/commands/start.js +9 -9
- package/dist/commands/start.js.map +1 -1
- package/dist/engine/agents/agent.d.ts.map +1 -1
- package/dist/engine/agents/agent.js +52 -41
- package/dist/engine/agents/agent.js.map +1 -1
- package/dist/engine/agents/agentSystem.d.ts.map +1 -1
- package/dist/engine/agents/agentSystem.js +23 -24
- package/dist/engine/agents/agentSystem.js.map +1 -1
- package/dist/engine/agents/ops/agentLoopRun.js +45 -45
- package/dist/engine/agents/ops/agentLoopRun.js.map +1 -1
- package/dist/engine/agents/ops/agentPromptFilesEnsure.d.ts +1 -1
- package/dist/engine/agents/ops/agentPromptFilesEnsure.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentPromptFilesEnsure.js +3 -2
- package/dist/engine/agents/ops/agentPromptFilesEnsure.js.map +1 -1
- package/dist/engine/agents/ops/agentRestoreContextResolve.d.ts +7 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.d.ts.map +1 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.js +11 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.js.map +1 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.spec.d.ts +2 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.spec.d.ts.map +1 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.spec.js +22 -0
- package/dist/engine/agents/ops/agentRestoreContextResolve.spec.js.map +1 -0
- package/dist/engine/agents/ops/agentStateRead.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentStateRead.js +10 -2
- package/dist/engine/agents/ops/agentStateRead.js.map +1 -1
- package/dist/engine/agents/ops/agentStateRead.spec.d.ts +2 -0
- package/dist/engine/agents/ops/agentStateRead.spec.d.ts.map +1 -0
- package/dist/engine/agents/ops/agentStateRead.spec.js +67 -0
- package/dist/engine/agents/ops/agentStateRead.spec.js.map +1 -0
- package/dist/engine/agents/ops/agentStateWrite.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentStateWrite.js +1 -0
- package/dist/engine/agents/ops/agentStateWrite.js.map +1 -1
- package/dist/engine/agents/ops/contextCompact.js +2 -2
- package/dist/engine/agents/ops/contextCompact.js.map +1 -1
- package/dist/engine/cron/crons.js +4 -3
- package/dist/engine/cron/crons.js.map +1 -1
- package/dist/engine/cron/ops/cronScheduler.d.ts.map +1 -1
- package/dist/engine/cron/ops/cronScheduler.js +27 -26
- package/dist/engine/cron/ops/cronScheduler.js.map +1 -1
- package/dist/engine/cron/ops/cronScheduler.spec.js +2 -1
- package/dist/engine/cron/ops/cronScheduler.spec.js.map +1 -1
- package/dist/engine/cron/ops/cronStore.js +10 -10
- package/dist/engine/cron/ops/cronStore.js.map +1 -1
- package/dist/engine/engine.d.ts.map +1 -1
- package/dist/engine/engine.js +33 -33
- package/dist/engine/engine.js.map +1 -1
- package/dist/engine/heartbeat/heartbeats.js +5 -5
- package/dist/engine/heartbeat/heartbeats.js.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.d.ts.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.js +14 -13
- package/dist/engine/heartbeat/ops/heartbeatScheduler.js.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.spec.js +2 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.spec.js.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatStore.js +4 -4
- package/dist/engine/heartbeat/ops/heartbeatStore.js.map +1 -1
- package/dist/engine/ipc/client.d.ts +2 -0
- package/dist/engine/ipc/client.d.ts.map +1 -1
- package/dist/engine/ipc/client.js +13 -0
- package/dist/engine/ipc/client.js.map +1 -1
- package/dist/engine/ipc/server.js +61 -61
- package/dist/engine/ipc/server.js.map +1 -1
- package/dist/engine/modules/connectorRegistry.js +16 -16
- package/dist/engine/modules/connectorRegistry.js.map +1 -1
- package/dist/engine/modules/connectors/types.d.ts +3 -1
- package/dist/engine/modules/connectors/types.d.ts.map +1 -1
- package/dist/engine/modules/imageGenerationRegistry.js +5 -5
- package/dist/engine/modules/imageGenerationRegistry.js.map +1 -1
- package/dist/engine/modules/inference/router.js +13 -13
- package/dist/engine/modules/inference/router.js.map +1 -1
- package/dist/engine/modules/inferenceRegistry.js +6 -6
- package/dist/engine/modules/inferenceRegistry.js.map +1 -1
- package/dist/engine/modules/toolResolver.js +12 -12
- package/dist/engine/modules/toolResolver.js.map +1 -1
- package/dist/engine/modules/tools/background.spec.js +1 -0
- package/dist/engine/modules/tools/background.spec.js.map +1 -1
- package/dist/engine/modules/tools/image-generation.spec.js +2 -1
- package/dist/engine/modules/tools/image-generation.spec.js.map +1 -1
- package/dist/engine/modules/tools/mermaid-png.spec.js +2 -1
- package/dist/engine/modules/tools/mermaid-png.spec.js.map +1 -1
- package/dist/engine/modules/tools/permanentAgentToolBuild.spec.js +1 -0
- package/dist/engine/modules/tools/permanentAgentToolBuild.spec.js.map +1 -1
- package/dist/engine/modules/tools/permissions.js +4 -1
- package/dist/engine/modules/tools/permissions.js.map +1 -1
- package/dist/engine/modules/tools/signal.spec.js +2 -1
- package/dist/engine/modules/tools/signal.spec.js.map +1 -1
- package/dist/engine/modules/tools/signalSubscribeToolBuild.spec.js +2 -1
- package/dist/engine/modules/tools/signalSubscribeToolBuild.spec.js.map +1 -1
- package/dist/engine/modules/tools/signalUnsubscribeToolBuild.spec.js +2 -1
- package/dist/engine/modules/tools/signalUnsubscribeToolBuild.spec.js.map +1 -1
- package/dist/engine/permissions/permissionAccessAllows.d.ts +1 -1
- package/dist/engine/permissions/permissionAccessAllows.d.ts.map +1 -1
- package/dist/engine/permissions/permissionAccessAllows.js +4 -1
- package/dist/engine/permissions/permissionAccessAllows.js.map +1 -1
- package/dist/engine/permissions/permissionAccessAllows.spec.js +10 -6
- package/dist/engine/permissions/permissionAccessAllows.spec.js.map +1 -1
- package/dist/engine/permissions/permissionAccessApply.d.ts.map +1 -1
- package/dist/engine/permissions/permissionAccessApply.js +4 -0
- package/dist/engine/permissions/permissionAccessApply.js.map +1 -1
- package/dist/engine/permissions/permissionAccessApply.spec.js +8 -1
- package/dist/engine/permissions/permissionAccessApply.spec.js.map +1 -1
- package/dist/engine/permissions/permissionAccessParse.d.ts +1 -1
- package/dist/engine/permissions/permissionAccessParse.d.ts.map +1 -1
- package/dist/engine/permissions/permissionAccessParse.js +5 -2
- package/dist/engine/permissions/permissionAccessParse.js.map +1 -1
- package/dist/engine/permissions/permissionAccessParse.spec.js +2 -1
- package/dist/engine/permissions/permissionAccessParse.spec.js.map +1 -1
- package/dist/engine/permissions/permissionApply.spec.js +14 -1
- package/dist/engine/permissions/permissionApply.spec.js.map +1 -1
- package/dist/engine/permissions/permissionBuildCron.d.ts.map +1 -1
- package/dist/engine/permissions/permissionBuildCron.js +2 -1
- package/dist/engine/permissions/permissionBuildCron.js.map +1 -1
- package/dist/engine/permissions/permissionBuildCron.spec.js +3 -1
- package/dist/engine/permissions/permissionBuildCron.spec.js.map +1 -1
- package/dist/engine/permissions/permissionBuildDefault.d.ts.map +1 -1
- package/dist/engine/permissions/permissionBuildDefault.js +4 -2
- package/dist/engine/permissions/permissionBuildDefault.js.map +1 -1
- package/dist/engine/permissions/permissionBuildDefault.spec.js +3 -1
- package/dist/engine/permissions/permissionBuildDefault.spec.js.map +1 -1
- package/dist/engine/permissions/permissionClone.spec.js +2 -1
- package/dist/engine/permissions/permissionClone.spec.js.map +1 -1
- package/dist/engine/permissions/permissionDescribeDecision.d.ts.map +1 -1
- package/dist/engine/permissions/permissionDescribeDecision.js +3 -0
- package/dist/engine/permissions/permissionDescribeDecision.js.map +1 -1
- package/dist/engine/permissions/permissionDescribeDecision.spec.js +3 -0
- package/dist/engine/permissions/permissionDescribeDecision.spec.js.map +1 -1
- package/dist/engine/permissions/permissionEnsureDefaultFile.spec.js +2 -1
- package/dist/engine/permissions/permissionEnsureDefaultFile.spec.js.map +1 -1
- package/dist/engine/permissions/permissionFormatTag.d.ts.map +1 -1
- package/dist/engine/permissions/permissionFormatTag.js +3 -0
- package/dist/engine/permissions/permissionFormatTag.js.map +1 -1
- package/dist/engine/permissions/permissionFormatTag.spec.js +3 -0
- package/dist/engine/permissions/permissionFormatTag.spec.js.map +1 -1
- package/dist/engine/permissions/permissionMergeDefault.d.ts.map +1 -1
- package/dist/engine/permissions/permissionMergeDefault.js +2 -1
- package/dist/engine/permissions/permissionMergeDefault.js.map +1 -1
- package/dist/engine/permissions/permissionMergeDefault.spec.js +13 -6
- package/dist/engine/permissions/permissionMergeDefault.spec.js.map +1 -1
- package/dist/engine/permissions/permissionTagsApply.d.ts +1 -1
- package/dist/engine/permissions/permissionTagsApply.js +1 -1
- package/dist/engine/permissions/permissionTagsApply.spec.js +4 -2
- package/dist/engine/permissions/permissionTagsApply.spec.js.map +1 -1
- package/dist/engine/permissions/permissionTagsNormalize.d.ts +1 -1
- package/dist/engine/permissions/permissionTagsNormalize.d.ts.map +1 -1
- package/dist/engine/permissions/permissionTagsNormalize.js +11 -4
- package/dist/engine/permissions/permissionTagsNormalize.js.map +1 -1
- package/dist/engine/permissions/permissionTagsNormalize.spec.js +2 -1
- package/dist/engine/permissions/permissionTagsNormalize.spec.js.map +1 -1
- package/dist/engine/permissions/permissionTagsValidate.d.ts +1 -1
- package/dist/engine/permissions/permissionTagsValidate.js +1 -1
- package/dist/engine/permissions/permissionTagsValidate.spec.js +27 -6
- package/dist/engine/permissions/permissionTagsValidate.spec.js.map +1 -1
- package/dist/engine/permissions.d.ts +1 -0
- package/dist/engine/permissions.d.ts.map +1 -1
- package/dist/engine/permissions.js +8 -2
- package/dist/engine/permissions.js.map +1 -1
- package/dist/engine/plugins/descriptor.d.ts +2 -2
- package/dist/engine/plugins/inference.js +1 -1
- package/dist/engine/plugins/inference.js.map +1 -1
- package/dist/engine/plugins/manager.js +44 -44
- package/dist/engine/plugins/manager.js.map +1 -1
- package/dist/engine/processes/processes.d.ts +2 -0
- package/dist/engine/processes/processes.d.ts.map +1 -1
- package/dist/engine/processes/processes.js +18 -11
- package/dist/engine/processes/processes.js.map +1 -1
- package/dist/engine/processes/processes.spec.js +30 -4
- package/dist/engine/processes/processes.spec.js.map +1 -1
- package/dist/engine/scheduling/execGateCheck.d.ts +1 -0
- package/dist/engine/scheduling/execGateCheck.d.ts.map +1 -1
- package/dist/engine/scheduling/execGateCheck.js +4 -2
- package/dist/engine/scheduling/execGateCheck.js.map +1 -1
- package/dist/engine/scheduling/gatePermissionsCheck.d.ts +1 -1
- package/dist/engine/scheduling/gatePermissionsCheck.js +5 -2
- package/dist/engine/scheduling/gatePermissionsCheck.js.map +1 -1
- package/dist/engine/scheduling/gatePermissionsCheck.spec.js +13 -2
- package/dist/engine/scheduling/gatePermissionsCheck.spec.js.map +1 -1
- package/dist/engine/signals/delayedSignals.js +2 -2
- package/dist/engine/signals/delayedSignals.js.map +1 -1
- package/dist/engine/signals/signals.js +2 -2
- package/dist/engine/signals/signals.js.map +1 -1
- package/dist/engine/skills/skillListFromRoot.js +2 -2
- package/dist/engine/skills/skillListFromRoot.js.map +1 -1
- package/dist/engine/skills/skillResolve.js +2 -2
- package/dist/engine/skills/skillResolve.js.map +1 -1
- package/dist/log.d.ts +8 -0
- package/dist/log.d.ts.map +1 -1
- package/dist/log.js +191 -3
- package/dist/log.js.map +1 -1
- package/dist/log.spec.d.ts +2 -0
- package/dist/log.spec.d.ts.map +1 -0
- package/dist/log.spec.js +54 -0
- package/dist/log.spec.js.map +1 -0
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/paths.d.ts +1 -0
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +1 -0
- package/dist/paths.js.map +1 -1
- package/dist/plugins/database/__tests__/plugin.spec.js +2 -1
- package/dist/plugins/database/__tests__/plugin.spec.js.map +1 -1
- package/dist/plugins/memory/store.js +2 -2
- package/dist/plugins/memory/store.js.map +1 -1
- package/dist/plugins/monty-python/tool.spec.js +2 -1
- package/dist/plugins/monty-python/tool.spec.js.map +1 -1
- package/dist/plugins/shell/processTools.js +3 -2
- package/dist/plugins/shell/processTools.js.map +1 -1
- package/dist/plugins/shell/processTools.spec.js +18 -9
- package/dist/plugins/shell/processTools.spec.js.map +1 -1
- package/dist/plugins/shell/tool.d.ts.map +1 -1
- package/dist/plugins/shell/tool.js +8 -4
- package/dist/plugins/shell/tool.js.map +1 -1
- package/dist/plugins/shell/tool.spec.js +7 -3
- package/dist/plugins/shell/tool.spec.js.map +1 -1
- package/dist/plugins/telegram/connector.js +69 -64
- package/dist/plugins/telegram/connector.js.map +1 -1
- package/dist/plugins/telegram/plugin.js +1 -1
- package/dist/plugins/telegram/plugin.js.map +1 -1
- package/dist/plugins/whatsapp/authenticate.js +3 -3
- package/dist/plugins/whatsapp/authenticate.js.map +1 -1
- package/dist/plugins/whatsapp/connector.js +25 -20
- package/dist/plugins/whatsapp/connector.js.map +1 -1
- package/dist/plugins/whatsapp/plugin.js +2 -2
- package/dist/plugins/whatsapp/plugin.js.map +1 -1
- package/dist/prompts/AGENTS.md +183 -0
- package/dist/prompts/MEMORY.md +1 -0
- package/dist/prompts/PERMISSIONS.md +4 -2
- package/dist/prompts/SYSTEM.md +8 -2
- package/dist/providers/manager.js +14 -14
- package/dist/providers/manager.js.map +1 -1
- package/dist/sandbox/runtime.js +1 -1
- package/dist/sandbox/runtime.js.map +1 -1
- package/dist/sandbox/sandboxCanRead.spec.js +2 -1
- package/dist/sandbox/sandboxCanRead.spec.js.map +1 -1
- package/dist/sandbox/sandboxCanWrite.spec.js +2 -1
- package/dist/sandbox/sandboxCanWrite.spec.js.map +1 -1
- package/dist/sandbox/sandboxFilesystemPolicyBuild.spec.js +2 -1
- package/dist/sandbox/sandboxFilesystemPolicyBuild.spec.js.map +1 -1
- package/dist/util/shutdown.js +7 -7
- package/dist/util/shutdown.js.map +1 -1
- package/dist/util/time.d.ts.map +1 -1
- package/dist/util/time.js +3 -1
- package/dist/util/time.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/add.js
CHANGED
|
@@ -211,7 +211,9 @@ async function validatePluginLoad(config, authStore, pluginConfig) {
|
|
|
211
211
|
fileStore,
|
|
212
212
|
pluginCatalog: buildPluginCatalog(),
|
|
213
213
|
inferenceRouter,
|
|
214
|
-
processes: new Processes(config.dataDir, getLogger("processes.validate")
|
|
214
|
+
processes: new Processes(config.dataDir, getLogger("processes.validate"), {
|
|
215
|
+
socketPath: config.socketPath
|
|
216
|
+
}),
|
|
215
217
|
mode: "validate"
|
|
216
218
|
});
|
|
217
219
|
await pluginManager.load(pluginConfig);
|
package/dist/commands/add.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../sources/commands/add.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../sources/commands/add.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/event.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { sendEngineSignal } from "../engine/ipc/client.js";
|
|
2
2
|
export async function eventCommand(type, payloadJson) {
|
|
3
3
|
intro("daycare event");
|
|
4
4
|
try {
|
|
5
5
|
const payload = eventPayloadParse(payloadJson);
|
|
6
|
-
await
|
|
6
|
+
await sendEngineSignal(type, payload, { type: "process", id: "daycare-cli" });
|
|
7
7
|
outro(`Sent event ${type}.`);
|
|
8
8
|
}
|
|
9
9
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../sources/commands/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../sources/commands/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,WAAoB;IACnE,KAAK,CAAC,eAAe,CAAC,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC/C,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9E,KAAK,CAAC,cAAc,IAAI,GAAG,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;IACpD,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAoB;IAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAY,CAAC;IAC5C,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,OAAe;IAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,KAAK,CAAC,OAAe;IAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
-
import {
|
|
2
|
+
import { sendEngineSignal } from "../engine/ipc/client.js";
|
|
3
3
|
import { eventCommand } from "./event.js";
|
|
4
4
|
vi.mock("../engine/ipc/client.js", () => ({
|
|
5
|
-
|
|
5
|
+
sendEngineSignal: vi.fn()
|
|
6
6
|
}));
|
|
7
7
|
describe("eventCommand", () => {
|
|
8
|
-
const
|
|
8
|
+
const sendEngineSignalMock = vi.mocked(sendEngineSignal);
|
|
9
9
|
beforeEach(() => {
|
|
10
|
-
|
|
10
|
+
sendEngineSignalMock.mockReset();
|
|
11
11
|
process.exitCode = undefined;
|
|
12
12
|
vi.spyOn(console, "log").mockImplementation(() => undefined);
|
|
13
13
|
vi.spyOn(console, "error").mockImplementation(() => undefined);
|
|
@@ -17,18 +17,18 @@ describe("eventCommand", () => {
|
|
|
17
17
|
});
|
|
18
18
|
it("sends the provided event type and parsed payload", async () => {
|
|
19
19
|
await eventCommand("demo.event", "{\"ok\":true}");
|
|
20
|
-
expect(
|
|
20
|
+
expect(sendEngineSignalMock).toHaveBeenCalledWith("demo.event", { ok: true }, { type: "process", id: "daycare-cli" });
|
|
21
21
|
expect(process.exitCode).toBeUndefined();
|
|
22
22
|
});
|
|
23
23
|
it("sets a non-zero exit code when socket send fails", async () => {
|
|
24
|
-
|
|
24
|
+
sendEngineSignalMock.mockRejectedValueOnce(new Error("connect ENOENT"));
|
|
25
25
|
await eventCommand("demo.event");
|
|
26
26
|
expect(process.exitCode).toBe(1);
|
|
27
27
|
expect(console.error).toHaveBeenCalledWith(expect.stringContaining("Failed to send event: connect ENOENT"));
|
|
28
28
|
});
|
|
29
29
|
it("sets a non-zero exit code when payload is invalid JSON", async () => {
|
|
30
30
|
await eventCommand("demo.event", "{not-json");
|
|
31
|
-
expect(
|
|
31
|
+
expect(sendEngineSignalMock).not.toHaveBeenCalled();
|
|
32
32
|
expect(process.exitCode).toBe(1);
|
|
33
33
|
expect(console.error).toHaveBeenCalledWith("Failed to send event: Payload must be valid JSON.");
|
|
34
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.spec.js","sourceRoot":"","sources":["../../sources/commands/event.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"event.spec.js","sourceRoot":"","sources":["../../sources/commands/event.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;CAC1B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,oBAAoB,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAEzD,UAAU,CAAC,GAAG,EAAE;QACd,oBAAoB,CAAC,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC7B,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC7D,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAElD,MAAM,CAAC,oBAAoB,CAAC,CAAC,oBAAoB,CAC/C,YAAY,EACZ,EAAE,EAAE,EAAE,IAAI,EAAE,EACZ,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,aAAa,EAAE,CACvC,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAExE,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;QAEjC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,oBAAoB,CACxC,MAAM,CAAC,gBAAgB,CAAC,sCAAsC,CAAC,CAChE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,YAAY,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAE9C,MAAM,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACpD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,oBAAoB,CACxC,mDAAmD,CACpD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/commands/start.js
CHANGED
|
@@ -13,7 +13,7 @@ const logger = getLogger("command.start");
|
|
|
13
13
|
export async function startCommand(options) {
|
|
14
14
|
const settingsPath = path.resolve(options.settings ?? DEFAULT_SETTINGS_PATH);
|
|
15
15
|
const config = await configLoad(settingsPath, { verbose: options.verbose ?? false });
|
|
16
|
-
logger.info({ settings: config.settingsPath }, "Starting Daycare");
|
|
16
|
+
logger.info({ settings: config.settingsPath }, "start: Starting Daycare");
|
|
17
17
|
const eventBus = new EngineEventBus();
|
|
18
18
|
const socketPath = config.socketPath;
|
|
19
19
|
const pidPath = path.join(config.configDir, "engine.pid");
|
|
@@ -24,7 +24,7 @@ export async function startCommand(options) {
|
|
|
24
24
|
const running = socketResponsive || pidRunning;
|
|
25
25
|
if (running) {
|
|
26
26
|
if (!socketResponsive && pidRunning) {
|
|
27
|
-
logger.warn({ pid: existingPid }, "Engine process detected but socket unresponsive.");
|
|
27
|
+
logger.warn({ pid: existingPid }, "event: Engine process detected but socket unresponsive.");
|
|
28
28
|
}
|
|
29
29
|
const shouldRestart = options.force === true
|
|
30
30
|
? true
|
|
@@ -33,17 +33,17 @@ export async function startCommand(options) {
|
|
|
33
33
|
default: false
|
|
34
34
|
});
|
|
35
35
|
if (shouldRestart !== true) {
|
|
36
|
-
logger.info("Engine already running; leaving it in place.");
|
|
36
|
+
logger.info("event: Engine already running; leaving it in place.");
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
39
|
const requested = await requestEngineShutdown(socketPath);
|
|
40
40
|
if (!requested) {
|
|
41
|
-
logger.warn("Failed to request engine shutdown. Aborting start.");
|
|
41
|
+
logger.warn("error: Failed to request engine shutdown. Aborting start.");
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
const stopped = await waitForEngineShutdown(socketPath, existingPid, 2000);
|
|
45
45
|
if (!stopped) {
|
|
46
|
-
logger.warn("Engine did not shut down in time. Aborting start.");
|
|
46
|
+
logger.warn("start: Engine did not shut down in time. Aborting start.");
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
49
|
await removeStaleFile(socketPath);
|
|
@@ -68,7 +68,7 @@ export async function startCommand(options) {
|
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
catch (error) {
|
|
71
|
-
logger.warn({ error }, "Engine server failed to start");
|
|
71
|
+
logger.warn({ error }, "error: Engine server failed to start");
|
|
72
72
|
}
|
|
73
73
|
if (engineServer) {
|
|
74
74
|
await writePidFile(pidPath);
|
|
@@ -80,13 +80,13 @@ export async function startCommand(options) {
|
|
|
80
80
|
if (engineServer) {
|
|
81
81
|
onShutdown("engine-server", () => {
|
|
82
82
|
void engineServer?.close().catch((error) => {
|
|
83
|
-
logger.warn({ error }, "Engine server shutdown failed");
|
|
83
|
+
logger.warn({ error }, "error: Engine server shutdown failed");
|
|
84
84
|
});
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
|
-
logger.info("Ready. Listening for messages.");
|
|
87
|
+
logger.info("ready: Ready. Listening for messages.");
|
|
88
88
|
const signal = await awaitShutdown();
|
|
89
|
-
logger.info({ signal }, "Shutdown complete");
|
|
89
|
+
logger.info({ signal }, "event: Shutdown complete");
|
|
90
90
|
process.exit(0);
|
|
91
91
|
}
|
|
92
92
|
async function ensureConfigDir(configDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../sources/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;AAQ1C,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAqB;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,qBAAqB,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;IACrF,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../sources/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../sources/engine/agents/agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../sources/engine/agents/agent.ts"],"names":[],"mappings":"AA8CA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAWV,UAAU,EACX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAQjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKpD,qBAAa,KAAK;IAChB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,wBAAwB,CAAgC;IAEhE,OAAO;IAcP;;;OAGG;WACU,MAAM,CACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,KAAK,CAAC;IA+BjB;;;OAGG;IACH,MAAM,CAAC,OAAO,CACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,GACvB,KAAK;IAIR,KAAK,IAAI,IAAI;IAeb,YAAY,IAAI,OAAO;IAIvB;;;OAGG;IACH,cAAc,IAAI,OAAO;YASX,OAAO;IAwCrB;;;OAGG;YACW,cAAc;YAcd,eAAe;YAuCf,mBAAmB;YAsBnB,aAAa;YAwTb,mBAAmB;YAuCnB,YAAY;YAoBZ,WAAW;IA8CzB;;;OAGG;YACW,oBAAoB;YAmCpB,aAAa;YAeb,gBAAgB;IAqD9B;;;OAGG;IACG,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B3E;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAUjD,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;YAiBd,mBAAmB;IAiEjC;;;OAGG;YACW,iBAAiB;CAgHhC"}
|
|
@@ -4,7 +4,7 @@ import path from "node:path";
|
|
|
4
4
|
import { createId } from "@paralleldrive/cuid2";
|
|
5
5
|
import Handlebars from "handlebars";
|
|
6
6
|
import { getLogger } from "../../log.js";
|
|
7
|
-
import { DEFAULT_ACTORS_PATH, DEFAULT_MEMORY_PATH, DEFAULT_SOUL_PATH, DEFAULT_TOOLS_PATH, DEFAULT_USER_PATH } from "../../paths.js";
|
|
7
|
+
import { DEFAULT_AGENTS_PATH, DEFAULT_ACTORS_PATH, DEFAULT_MEMORY_PATH, DEFAULT_SOUL_PATH, DEFAULT_TOOLS_PATH, DEFAULT_USER_PATH } from "../../paths.js";
|
|
8
8
|
import { listActiveInferenceProviders } from "../../providers/catalog.js";
|
|
9
9
|
import { cuid2Is } from "../../utils/cuid2Is.js";
|
|
10
10
|
import { agentPromptBundledRead } from "./ops/agentPromptBundledRead.js";
|
|
@@ -39,6 +39,7 @@ import { agentHistoryLoad } from "./ops/agentHistoryLoad.js";
|
|
|
39
39
|
import { agentStateWrite } from "./ops/agentStateWrite.js";
|
|
40
40
|
import { agentDescriptorWrite } from "./ops/agentDescriptorWrite.js";
|
|
41
41
|
import { agentSystemPromptWrite } from "./ops/agentSystemPromptWrite.js";
|
|
42
|
+
import { agentRestoreContextResolve } from "./ops/agentRestoreContextResolve.js";
|
|
42
43
|
import { signalMessageBuild } from "../signals/signalMessageBuild.js";
|
|
43
44
|
import { systemAgentPromptResolve } from "./system/systemAgentPromptResolve.js";
|
|
44
45
|
const logger = getLogger("engine.agent");
|
|
@@ -103,11 +104,11 @@ export class Agent {
|
|
|
103
104
|
return;
|
|
104
105
|
}
|
|
105
106
|
this.started = true;
|
|
106
|
-
logger.debug(`Agent loop starting agentId=${this.id} type=${this.descriptor.type}`);
|
|
107
|
+
logger.debug(`start: Agent loop starting agentId=${this.id} type=${this.descriptor.type}`);
|
|
107
108
|
void this.runLoop().catch((error) => {
|
|
108
109
|
this.started = false;
|
|
109
110
|
this.agentSystem.markStopped(this.id, error);
|
|
110
|
-
logger.warn({ agentId: this.id, error }, "Agent loop exited unexpectedly");
|
|
111
|
+
logger.warn({ agentId: this.id, error }, "event: Agent loop exited unexpectedly");
|
|
111
112
|
});
|
|
112
113
|
}
|
|
113
114
|
isProcessing() {
|
|
@@ -130,7 +131,7 @@ export class Agent {
|
|
|
130
131
|
try {
|
|
131
132
|
for (;;) {
|
|
132
133
|
const entry = await this.inbox.next();
|
|
133
|
-
logger.debug(`Agent inbox item dequeued agentId=${this.id} type=${entry.item.type}`);
|
|
134
|
+
logger.debug(`event: Agent inbox item dequeued agentId=${this.id} type=${entry.item.type}`);
|
|
134
135
|
this.processing = true;
|
|
135
136
|
try {
|
|
136
137
|
const result = await this.agentSystem.inReadLock(async () => this.handleInboxItem(entry.item));
|
|
@@ -145,7 +146,7 @@ export class Agent {
|
|
|
145
146
|
errorName: failure.name,
|
|
146
147
|
errorMessage: failure.message,
|
|
147
148
|
errorStack: failure.stack
|
|
148
|
-
}, `Agent inbox item failed: ${failure.message}`);
|
|
149
|
+
}, `error: Agent inbox item failed: ${failure.message}`);
|
|
149
150
|
entry.completion?.reject(failure);
|
|
150
151
|
if (entry.item.type === "message") {
|
|
151
152
|
await this.sendUnexpectedError(entry.item);
|
|
@@ -221,7 +222,7 @@ export class Agent {
|
|
|
221
222
|
}
|
|
222
223
|
catch (error) {
|
|
223
224
|
const failure = error instanceof Error ? error : new Error(String(error));
|
|
224
|
-
logger.warn({ agentId: this.id, error: failure }, "Failed to send unexpected error message");
|
|
225
|
+
logger.warn({ agentId: this.id, error: failure }, "error: Failed to send unexpected error message");
|
|
225
226
|
}
|
|
226
227
|
}
|
|
227
228
|
async handleMessage(item) {
|
|
@@ -239,7 +240,7 @@ export class Agent {
|
|
|
239
240
|
: this.descriptor.type === "system"
|
|
240
241
|
? this.descriptor.tag
|
|
241
242
|
: this.descriptor.type;
|
|
242
|
-
logger.debug(`handleMessage start agentId=${this.id} source=${source} textLength=${entry.message.text?.length ?? 0} fileCount=${entry.message.files?.length ?? 0}`);
|
|
243
|
+
logger.debug(`start: handleMessage start agentId=${this.id} source=${source} textLength=${entry.message.text?.length ?? 0} fileCount=${entry.message.files?.length ?? 0}`);
|
|
243
244
|
this.state.updatedAt = receivedAt;
|
|
244
245
|
const rawText = entry.message.rawText ?? entry.message.text ?? "";
|
|
245
246
|
const files = toFileReferences(entry.message.files ?? []);
|
|
@@ -269,11 +270,11 @@ export class Agent {
|
|
|
269
270
|
}
|
|
270
271
|
: { connector: source };
|
|
271
272
|
const pluginManager = this.agentSystem.pluginManager;
|
|
272
|
-
logger.debug(`handleMessage loading plugin prompts agentId=${this.id}`);
|
|
273
|
+
logger.debug(`load: handleMessage loading plugin prompts agentId=${this.id}`);
|
|
273
274
|
const pluginPrompts = await pluginManager.getSystemPrompts();
|
|
274
275
|
const pluginPrompt = pluginPrompts.length > 0 ? pluginPrompts.join("\n\n") : "";
|
|
275
276
|
const configSkillsRoot = path.join(this.agentSystem.config.current.configDir, "skills");
|
|
276
|
-
logger.debug(`handleMessage loading available skills agentId=${this.id}`);
|
|
277
|
+
logger.debug(`load: handleMessage loading available skills agentId=${this.id}`);
|
|
277
278
|
const [coreSkills, configSkills, pluginSkills] = await Promise.all([
|
|
278
279
|
skillListCore(),
|
|
279
280
|
skillListConfig(configSkillsRoot),
|
|
@@ -308,21 +309,22 @@ export class Agent {
|
|
|
308
309
|
permissionTagsApply(this.state.permissions, permissionTags);
|
|
309
310
|
}
|
|
310
311
|
catch (error) {
|
|
311
|
-
logger.warn({ agentId: this.id, error }, "Failed to apply task permissions");
|
|
312
|
+
logger.warn({ agentId: this.id, error }, "error: Failed to apply task permissions");
|
|
312
313
|
}
|
|
313
314
|
}
|
|
314
|
-
logger.debug(`handleMessage ensuring prompt files agentId=${this.id}`);
|
|
315
|
+
logger.debug(`event: handleMessage ensuring prompt files agentId=${this.id}`);
|
|
315
316
|
await agentPromptFilesEnsure();
|
|
316
317
|
const providerSettings = providerId
|
|
317
318
|
? providers.find((provider) => provider.id === providerId)
|
|
318
319
|
: providers[0];
|
|
319
|
-
logger.debug(`handleMessage building system prompt agentId=${this.id}`);
|
|
320
|
+
logger.debug(`event: handleMessage building system prompt agentId=${this.id}`);
|
|
320
321
|
const systemPrompt = await this.buildSystemPrompt({
|
|
321
322
|
provider: providerSettings?.id,
|
|
322
323
|
model: providerSettings?.model,
|
|
323
324
|
workspace: this.state.permissions.workingDir,
|
|
324
325
|
writeDirs: this.state.permissions.writeDirs,
|
|
325
326
|
network: this.state.permissions.network,
|
|
327
|
+
events: this.state.permissions.events,
|
|
326
328
|
connector: descriptorContext.connector,
|
|
327
329
|
canSendFiles: fileSendModes.length > 0,
|
|
328
330
|
fileSendModes: fileSendModes.length > 0 ? fileSendModes.join(", ") : "",
|
|
@@ -337,6 +339,7 @@ export class Agent {
|
|
|
337
339
|
soulPath: DEFAULT_SOUL_PATH,
|
|
338
340
|
userPath: DEFAULT_USER_PATH,
|
|
339
341
|
actorsPath: DEFAULT_ACTORS_PATH,
|
|
342
|
+
agentsPath: DEFAULT_AGENTS_PATH,
|
|
340
343
|
toolsPath: DEFAULT_TOOLS_PATH,
|
|
341
344
|
memoryPath: DEFAULT_MEMORY_PATH,
|
|
342
345
|
pluginPrompt,
|
|
@@ -353,11 +356,11 @@ export class Agent {
|
|
|
353
356
|
try {
|
|
354
357
|
const wrote = await agentSystemPromptWrite(this.agentSystem.config.current, this.id, systemPrompt);
|
|
355
358
|
if (wrote) {
|
|
356
|
-
logger.debug(`System prompt snapshot written agentId=${this.id}`);
|
|
359
|
+
logger.debug(`event: System prompt snapshot written agentId=${this.id}`);
|
|
357
360
|
}
|
|
358
361
|
}
|
|
359
362
|
catch (error) {
|
|
360
|
-
logger.warn({ agentId: this.id, error }, "Failed to write system prompt snapshot");
|
|
363
|
+
logger.warn({ agentId: this.id, error }, "error: Failed to write system prompt snapshot");
|
|
361
364
|
}
|
|
362
365
|
const history = await agentHistoryLoad(this.agentSystem.config.current, this.id);
|
|
363
366
|
const extraTokens = Math.ceil((systemPrompt.length + rawText.length) / 4);
|
|
@@ -409,7 +412,7 @@ export class Agent {
|
|
|
409
412
|
}
|
|
410
413
|
}
|
|
411
414
|
catch (error) {
|
|
412
|
-
logger.warn({ agentId: this.id, error }, "Context compaction failed; continuing with full context");
|
|
415
|
+
logger.warn({ agentId: this.id, error }, "error: Context compaction failed; continuing with full context");
|
|
413
416
|
}
|
|
414
417
|
}
|
|
415
418
|
if (pendingUserRecord) {
|
|
@@ -430,13 +433,13 @@ export class Agent {
|
|
|
430
433
|
if (!contextForRun.messages) {
|
|
431
434
|
contextForRun.messages = [];
|
|
432
435
|
}
|
|
433
|
-
logger.debug(`handleMessage building user message agentId=${this.id}`);
|
|
436
|
+
logger.debug(`event: handleMessage building user message agentId=${this.id}`);
|
|
434
437
|
const userMessage = await messageBuildUser(entry);
|
|
435
438
|
contextForRun.messages.push(userMessage);
|
|
436
439
|
const providersForAgent = providerId
|
|
437
440
|
? providers.filter((provider) => provider.id === providerId)
|
|
438
441
|
: [];
|
|
439
|
-
logger.debug(`handleMessage invoking inference loop agentId=${this.id}`);
|
|
442
|
+
logger.debug(`event: handleMessage invoking inference loop agentId=${this.id}`);
|
|
440
443
|
const inferenceAbortController = new AbortController();
|
|
441
444
|
this.inferenceAbortController = inferenceAbortController;
|
|
442
445
|
const result = await (async () => {
|
|
@@ -470,7 +473,7 @@ export class Agent {
|
|
|
470
473
|
}
|
|
471
474
|
})();
|
|
472
475
|
if (result.contextOverflow) {
|
|
473
|
-
logger.warn({ agentId: this.id }, "Inference context overflow; resetting session");
|
|
476
|
+
logger.warn({ agentId: this.id }, "event: Inference context overflow; resetting session");
|
|
474
477
|
await this.handleEmergencyReset(entry, source);
|
|
475
478
|
return null;
|
|
476
479
|
}
|
|
@@ -598,7 +601,7 @@ export class Agent {
|
|
|
598
601
|
});
|
|
599
602
|
}
|
|
600
603
|
catch (error) {
|
|
601
|
-
logger.warn({ agentId: this.id, error }, "Reset confirmation send failed");
|
|
604
|
+
logger.warn({ agentId: this.id, error }, "error: Reset confirmation send failed");
|
|
602
605
|
}
|
|
603
606
|
return true;
|
|
604
607
|
}
|
|
@@ -631,13 +634,15 @@ export class Agent {
|
|
|
631
634
|
});
|
|
632
635
|
}
|
|
633
636
|
catch (error) {
|
|
634
|
-
logger.warn({ agentId: this.id, error }, "Failed to notify user about emergency reset");
|
|
637
|
+
logger.warn({ agentId: this.id, error }, "error: Failed to notify user about emergency reset");
|
|
635
638
|
}
|
|
636
639
|
}
|
|
637
640
|
async handleRestore(_item) {
|
|
638
641
|
const history = await agentHistoryLoad(this.agentSystem.config.current, this.id);
|
|
639
|
-
const
|
|
640
|
-
this.state.context = {
|
|
642
|
+
const historyMessages = await this.buildHistoryContext(history);
|
|
643
|
+
this.state.context = {
|
|
644
|
+
messages: agentRestoreContextResolve(this.state.context.messages ?? [], historyMessages)
|
|
645
|
+
};
|
|
641
646
|
this.state.updatedAt = Date.now();
|
|
642
647
|
await agentStateWrite(this.agentSystem.config.current, this.id, this.state);
|
|
643
648
|
this.agentSystem.eventBus.emit("agent.restored", { agentId: this.id });
|
|
@@ -654,11 +659,11 @@ export class Agent {
|
|
|
654
659
|
const permissionTag = permissionFormatTag(decision.access);
|
|
655
660
|
const permissionLabel = permissionDescribeDecision(decision.access);
|
|
656
661
|
if (!decision.approved) {
|
|
657
|
-
logger.info({ source, permission: permissionTag, agentId: this.id }, "Permission denied");
|
|
662
|
+
logger.info({ source, permission: permissionTag, agentId: this.id }, "event: Permission denied");
|
|
658
663
|
}
|
|
659
664
|
if (decision.approved && (decision.access.kind === "read" || decision.access.kind === "write")) {
|
|
660
665
|
if (!path.isAbsolute(decision.access.path)) {
|
|
661
|
-
logger.warn({ agentId: this.id, permission: permissionTag }, "Permission path not absolute");
|
|
666
|
+
logger.warn({ agentId: this.id, permission: permissionTag }, "event: Permission path not absolute");
|
|
662
667
|
if (connector && target) {
|
|
663
668
|
await connector.sendMessage(target.targetId, {
|
|
664
669
|
text: `Permission ignored (path must be absolute): ${permissionLabel}.`,
|
|
@@ -698,7 +703,7 @@ export class Agent {
|
|
|
698
703
|
}
|
|
699
704
|
const parentAgentId = this.descriptor.parentAgentId ?? null;
|
|
700
705
|
if (!parentAgentId) {
|
|
701
|
-
logger.warn({ agentId: this.id }, "Subagent missing parent agent");
|
|
706
|
+
logger.warn({ agentId: this.id }, "event: Subagent missing parent agent");
|
|
702
707
|
return;
|
|
703
708
|
}
|
|
704
709
|
const name = this.descriptor.name ?? "subagent";
|
|
@@ -712,7 +717,7 @@ export class Agent {
|
|
|
712
717
|
});
|
|
713
718
|
}
|
|
714
719
|
catch (sendError) {
|
|
715
|
-
logger.warn({ agentId: this.id, parentAgentId, error: sendError }, "Subagent failure notification failed");
|
|
720
|
+
logger.warn({ agentId: this.id, parentAgentId, error: sendError }, "error: Subagent failure notification failed");
|
|
716
721
|
}
|
|
717
722
|
}
|
|
718
723
|
/**
|
|
@@ -828,25 +833,28 @@ export class Agent {
|
|
|
828
833
|
const soulPath = context.soulPath ?? DEFAULT_SOUL_PATH;
|
|
829
834
|
const userPath = context.userPath ?? DEFAULT_USER_PATH;
|
|
830
835
|
const actorsPath = context.actorsPath ?? DEFAULT_ACTORS_PATH;
|
|
836
|
+
const agentsPath = context.agentsPath ?? DEFAULT_AGENTS_PATH;
|
|
831
837
|
const toolsPath = context.toolsPath ?? DEFAULT_TOOLS_PATH;
|
|
832
838
|
const memoryPath = context.memoryPath ?? DEFAULT_MEMORY_PATH;
|
|
833
|
-
logger.debug(`buildSystemPrompt reading soul prompt path=${soulPath}`);
|
|
839
|
+
logger.debug(`event: buildSystemPrompt reading soul prompt path=${soulPath}`);
|
|
834
840
|
const soul = await promptFileRead(soulPath, "SOUL.md");
|
|
835
|
-
logger.debug(`buildSystemPrompt reading user prompt path=${userPath}`);
|
|
841
|
+
logger.debug(`event: buildSystemPrompt reading user prompt path=${userPath}`);
|
|
836
842
|
const user = await promptFileRead(userPath, "USER.md");
|
|
837
|
-
logger.debug(`buildSystemPrompt reading actors prompt path=${actorsPath}`);
|
|
843
|
+
logger.debug(`event: buildSystemPrompt reading actors prompt path=${actorsPath}`);
|
|
838
844
|
const actors = await promptFileRead(actorsPath, "ACTORS.md");
|
|
839
|
-
logger.debug(`buildSystemPrompt reading
|
|
845
|
+
logger.debug(`event: buildSystemPrompt reading agents prompt path=${agentsPath}`);
|
|
846
|
+
const agents = await promptFileRead(agentsPath, "AGENTS.md");
|
|
847
|
+
logger.debug(`event: buildSystemPrompt reading tools prompt path=${toolsPath}`);
|
|
840
848
|
const tools = await promptFileRead(toolsPath, "TOOLS.md");
|
|
841
|
-
logger.debug(`buildSystemPrompt reading memory prompt path=${memoryPath}`);
|
|
849
|
+
logger.debug(`event: buildSystemPrompt reading memory prompt path=${memoryPath}`);
|
|
842
850
|
const memory = await promptFileRead(memoryPath, "MEMORY.md");
|
|
843
|
-
logger.debug("buildSystemPrompt reading system template");
|
|
851
|
+
logger.debug("event: buildSystemPrompt reading system template");
|
|
844
852
|
const systemTemplate = await agentPromptBundledRead("SYSTEM.md");
|
|
845
|
-
logger.debug("buildSystemPrompt reading permissions template");
|
|
853
|
+
logger.debug("event: buildSystemPrompt reading permissions template");
|
|
846
854
|
const permissionsTemplate = (await agentPromptBundledRead("PERMISSIONS.md")).trim();
|
|
847
|
-
logger.debug("buildSystemPrompt reading agentic template");
|
|
855
|
+
logger.debug("event: buildSystemPrompt reading agentic template");
|
|
848
856
|
const agenticTemplate = (await agentPromptBundledRead("AGENTIC.md")).trim();
|
|
849
|
-
const additionalWriteDirs = resolveAdditionalWriteDirs(context.writeDirs ?? [], context.workspace ?? "", soulPath, userPath, actorsPath, toolsPath, memoryPath);
|
|
857
|
+
const additionalWriteDirs = resolveAdditionalWriteDirs(context.writeDirs ?? [], context.workspace ?? "", soulPath, userPath, actorsPath, agentsPath, toolsPath, memoryPath);
|
|
850
858
|
const isForeground = context.agentKind !== "background";
|
|
851
859
|
const skillsPath = context.skillsPath ?? (context.configDir ? `${context.configDir}/skills` : "");
|
|
852
860
|
// Build shared context for both permissions and main templates
|
|
@@ -858,6 +866,7 @@ export class Agent {
|
|
|
858
866
|
provider: context.provider ?? "unknown",
|
|
859
867
|
workspace: context.workspace ?? "unknown",
|
|
860
868
|
network: context.network ?? false,
|
|
869
|
+
events: context.events ?? false,
|
|
861
870
|
connector: context.connector ?? "unknown",
|
|
862
871
|
canSendFiles: context.canSendFiles ?? false,
|
|
863
872
|
fileSendModes: context.fileSendModes ?? "",
|
|
@@ -872,6 +881,7 @@ export class Agent {
|
|
|
872
881
|
soulPath,
|
|
873
882
|
userPath,
|
|
874
883
|
actorsPath,
|
|
884
|
+
agentsPath,
|
|
875
885
|
toolsPath,
|
|
876
886
|
memoryPath,
|
|
877
887
|
pluginPrompt: context.pluginPrompt ?? "",
|
|
@@ -883,6 +893,7 @@ export class Agent {
|
|
|
883
893
|
soul,
|
|
884
894
|
user,
|
|
885
895
|
actors,
|
|
896
|
+
agents,
|
|
886
897
|
tools,
|
|
887
898
|
memory,
|
|
888
899
|
additionalWriteDirs,
|
|
@@ -890,13 +901,13 @@ export class Agent {
|
|
|
890
901
|
agentPrompt: context.agentPrompt ?? ""
|
|
891
902
|
};
|
|
892
903
|
// Render permissions template first (it contains Handlebars expressions)
|
|
893
|
-
logger.debug("buildSystemPrompt compiling permissions template");
|
|
904
|
+
logger.debug("event: buildSystemPrompt compiling permissions template");
|
|
894
905
|
const permissions = Handlebars.compile(permissionsTemplate)(templateContext);
|
|
895
|
-
logger.debug("buildSystemPrompt compiling agentic template");
|
|
906
|
+
logger.debug("event: buildSystemPrompt compiling agentic template");
|
|
896
907
|
const agentic = Handlebars.compile(agenticTemplate)(templateContext);
|
|
897
|
-
logger.debug("buildSystemPrompt compiling main template");
|
|
908
|
+
logger.debug("event: buildSystemPrompt compiling main template");
|
|
898
909
|
const template = Handlebars.compile(systemTemplate);
|
|
899
|
-
logger.debug("buildSystemPrompt rendering template");
|
|
910
|
+
logger.debug("event: buildSystemPrompt rendering template");
|
|
900
911
|
const rendered = template({
|
|
901
912
|
...templateContext,
|
|
902
913
|
permissions,
|
|
@@ -905,8 +916,8 @@ export class Agent {
|
|
|
905
916
|
return rendered.trim();
|
|
906
917
|
}
|
|
907
918
|
}
|
|
908
|
-
function resolveAdditionalWriteDirs(writeDirs, workspace, soulPath, userPath, actorsPath, toolsPath, memoryPath) {
|
|
909
|
-
const excluded = new Set([workspace, soulPath, userPath, actorsPath, toolsPath, memoryPath]
|
|
919
|
+
function resolveAdditionalWriteDirs(writeDirs, workspace, soulPath, userPath, actorsPath, agentsPath, toolsPath, memoryPath) {
|
|
920
|
+
const excluded = new Set([workspace, soulPath, userPath, actorsPath, agentsPath, toolsPath, memoryPath]
|
|
910
921
|
.filter((entry) => entry && entry.trim().length > 0)
|
|
911
922
|
.map((entry) => path.resolve(entry)));
|
|
912
923
|
const filtered = writeDirs
|