daycare-cli 2026.2.8 → 2026.2.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.d.ts.map +1 -1
- package/dist/commands/add.js +2 -56
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/doctor.js +2 -2
- package/dist/commands/doctor.js.map +1 -1
- package/dist/config/configResolve.d.ts.map +1 -1
- package/dist/config/configResolve.js +0 -9
- package/dist/config/configResolve.js.map +1 -1
- package/dist/config/configResolve.spec.js +3 -6
- package/dist/config/configResolve.spec.js.map +1 -1
- package/dist/config/configSettingsParse.d.ts.map +1 -1
- package/dist/config/configSettingsParse.js +0 -1
- package/dist/config/configSettingsParse.js.map +1 -1
- package/dist/config/configTypes.d.ts +0 -4
- package/dist/config/configTypes.d.ts.map +1 -1
- package/dist/engine/agents/agent.d.ts +3 -3
- package/dist/engine/agents/agent.d.ts.map +1 -1
- package/dist/engine/agents/agent.js +29 -26
- package/dist/engine/agents/agent.js.map +1 -1
- package/dist/engine/agents/agent.spec.js +13 -31
- package/dist/engine/agents/agent.spec.js.map +1 -1
- package/dist/engine/agents/agentSystem.d.ts +1 -4
- package/dist/engine/agents/agentSystem.d.ts.map +1 -1
- package/dist/engine/agents/agentSystem.js +11 -4
- package/dist/engine/agents/agentSystem.js.map +1 -1
- package/dist/engine/agents/agentSystem.spec.js +3 -5
- package/dist/engine/agents/agentSystem.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentAppFolderPathResolve.d.ts +2 -2
- package/dist/engine/agents/ops/agentAppFolderPathResolve.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentAppFolderPathResolve.js +3 -6
- package/dist/engine/agents/ops/agentAppFolderPathResolve.js.map +1 -1
- package/dist/engine/agents/ops/agentAppFolderPathResolve.spec.js +1 -11
- package/dist/engine/agents/ops/agentAppFolderPathResolve.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentDescriptorWrite.d.ts +2 -2
- package/dist/engine/agents/ops/agentDescriptorWrite.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentDescriptorWrite.js +2 -22
- package/dist/engine/agents/ops/agentDescriptorWrite.js.map +1 -1
- package/dist/engine/agents/ops/agentDescriptorWrite.spec.js +12 -7
- package/dist/engine/agents/ops/agentDescriptorWrite.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentHistoryLoad.spec.js +7 -3
- package/dist/engine/agents/ops/agentHistoryLoad.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentHistoryLoadAll.spec.js +7 -3
- package/dist/engine/agents/ops/agentHistoryLoadAll.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentInferencePromptWrite.spec.js +1 -1
- package/dist/engine/agents/ops/agentInferencePromptWrite.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentLoopRun.d.ts +2 -2
- package/dist/engine/agents/ops/agentLoopRun.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentLoopRun.js +9 -1
- package/dist/engine/agents/ops/agentLoopRun.js.map +1 -1
- package/dist/engine/agents/ops/agentLoopRun.spec.js +107 -72
- package/dist/engine/agents/ops/agentLoopRun.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentPromptFilesEnsure.d.ts +2 -3
- package/dist/engine/agents/ops/agentPromptFilesEnsure.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentPromptFilesEnsure.js +2 -10
- package/dist/engine/agents/ops/agentPromptFilesEnsure.js.map +1 -1
- package/dist/engine/agents/ops/agentPromptPathsResolve.d.ts +3 -3
- package/dist/engine/agents/ops/agentPromptPathsResolve.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentPromptPathsResolve.js +4 -25
- package/dist/engine/agents/ops/agentPromptPathsResolve.js.map +1 -1
- package/dist/engine/agents/ops/agentPromptPathsResolve.spec.js +2 -13
- package/dist/engine/agents/ops/agentPromptPathsResolve.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentStateRead.spec.js +15 -9
- package/dist/engine/agents/ops/agentStateRead.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentSystemPrompt.spec.js +17 -15
- package/dist/engine/agents/ops/agentSystemPrompt.spec.js.map +1 -1
- package/dist/engine/agents/ops/agentSystemPromptSectionMemory.js +6 -6
- package/dist/engine/agents/ops/agentSystemPromptSectionMemory.js.map +1 -1
- package/dist/engine/agents/ops/agentSystemPromptSectionPermissions.d.ts.map +1 -1
- package/dist/engine/agents/ops/agentSystemPromptSectionPermissions.js +7 -15
- package/dist/engine/agents/ops/agentSystemPromptSectionPermissions.js.map +1 -1
- package/dist/engine/agents/ops/agentSystemPromptWrite.spec.js +1 -1
- package/dist/engine/agents/ops/agentSystemPromptWrite.spec.js.map +1 -1
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.d.ts +11 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.d.ts.map +1 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.js +73 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.js.map +1 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.spec.d.ts +2 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.spec.d.ts.map +1 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.spec.js +40 -0
- package/dist/engine/agents/ops/inferenceErrorAnthropicPromptOverflowIs.spec.js.map +1 -0
- package/dist/engine/apps/appExecute.spec.js +2 -2
- package/dist/engine/apps/appExecute.spec.js.map +1 -1
- package/dist/engine/apps/appManager.d.ts +1 -3
- package/dist/engine/apps/appManager.d.ts.map +1 -1
- package/dist/engine/apps/appManager.js +4 -9
- package/dist/engine/apps/appManager.js.map +1 -1
- package/dist/engine/apps/appManager.spec.js +6 -7
- package/dist/engine/apps/appManager.spec.js.map +1 -1
- package/dist/engine/apps/appReviewProvidersResolve.spec.js +2 -4
- package/dist/engine/apps/appReviewProvidersResolve.spec.js.map +1 -1
- package/dist/engine/apps/appRuleToolBuild.spec.js +8 -5
- package/dist/engine/apps/appRuleToolBuild.spec.js.map +1 -1
- package/dist/engine/cron/crons.d.ts.map +1 -1
- package/dist/engine/cron/crons.js +19 -19
- package/dist/engine/cron/crons.js.map +1 -1
- package/dist/engine/cron/ops/cronScheduler.d.ts +2 -2
- package/dist/engine/cron/ops/cronScheduler.d.ts.map +1 -1
- package/dist/engine/cron/ops/cronScheduler.js +4 -4
- package/dist/engine/cron/ops/cronScheduler.js.map +1 -1
- package/dist/engine/cron/ops/cronScheduler.spec.js +11 -11
- package/dist/engine/cron/ops/cronScheduler.spec.js.map +1 -1
- package/dist/engine/engine.d.ts +0 -2
- package/dist/engine/engine.d.ts.map +1 -1
- package/dist/engine/engine.js +30 -16
- package/dist/engine/engine.js.map +1 -1
- package/dist/engine/engine.spec.js +14 -14
- package/dist/engine/engine.spec.js.map +1 -1
- package/dist/engine/expose/exposes.spec.js +2 -4
- package/dist/engine/expose/exposes.spec.js.map +1 -1
- package/dist/engine/files/fileFolder.d.ts +21 -0
- package/dist/engine/files/fileFolder.d.ts.map +1 -0
- package/dist/engine/files/fileFolder.js +48 -0
- package/dist/engine/files/fileFolder.js.map +1 -0
- package/dist/engine/files/fileFolder.spec.d.ts +2 -0
- package/dist/engine/files/fileFolder.spec.d.ts.map +1 -0
- package/dist/engine/files/fileFolder.spec.js +41 -0
- package/dist/engine/files/fileFolder.spec.js.map +1 -0
- package/dist/engine/files/files.d.ts +12 -0
- package/dist/engine/files/files.d.ts.map +1 -0
- package/dist/engine/files/files.js +17 -0
- package/dist/engine/files/files.js.map +1 -0
- package/dist/engine/files/files.spec.d.ts +2 -0
- package/dist/engine/files/files.spec.d.ts.map +1 -0
- package/dist/engine/files/files.spec.js +44 -0
- package/dist/engine/files/files.spec.js.map +1 -0
- package/dist/engine/heartbeat/heartbeatTypes.d.ts +1 -1
- package/dist/engine/heartbeat/heartbeatTypes.d.ts.map +1 -1
- package/dist/engine/heartbeat/heartbeats.d.ts.map +1 -1
- package/dist/engine/heartbeat/heartbeats.js +5 -2
- package/dist/engine/heartbeat/heartbeats.js.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.d.ts +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.d.ts.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.js +4 -4
- package/dist/engine/heartbeat/ops/heartbeatScheduler.js.map +1 -1
- package/dist/engine/heartbeat/ops/heartbeatScheduler.spec.js +8 -8
- package/dist/engine/heartbeat/ops/heartbeatScheduler.spec.js.map +1 -1
- package/dist/engine/modules/executablePrompts/executablePromptExpand.d.ts +6 -1
- package/dist/engine/modules/executablePrompts/executablePromptExpand.d.ts.map +1 -1
- package/dist/engine/modules/executablePrompts/executablePromptExpand.js +12 -3
- package/dist/engine/modules/executablePrompts/executablePromptExpand.js.map +1 -1
- package/dist/engine/modules/executablePrompts/executablePromptExpand.spec.js +37 -4
- package/dist/engine/modules/executablePrompts/executablePromptExpand.spec.js.map +1 -1
- package/dist/engine/modules/images/types.d.ts +2 -2
- package/dist/engine/modules/images/types.d.ts.map +1 -1
- package/dist/engine/modules/rlm/rlmNoToolsPromptBuild.spec.js +1 -1
- package/dist/engine/modules/rlm/rlmNoToolsPromptBuild.spec.js.map +1 -1
- package/dist/engine/modules/rlm/rlmToolDescriptionBuild.spec.js +1 -1
- package/dist/engine/modules/rlm/rlmToolDescriptionBuild.spec.js.map +1 -1
- package/dist/engine/modules/say/sayFileResolve.d.ts +2 -2
- package/dist/engine/modules/say/sayFileResolve.d.ts.map +1 -1
- package/dist/engine/modules/say/sayFileResolve.js +0 -27
- package/dist/engine/modules/say/sayFileResolve.js.map +1 -1
- package/dist/engine/modules/say/sayFileResolve.spec.js +11 -19
- package/dist/engine/modules/say/sayFileResolve.spec.js.map +1 -1
- package/dist/engine/modules/tools/image-generation.d.ts.map +1 -1
- package/dist/engine/modules/tools/image-generation.js +59 -18
- package/dist/engine/modules/tools/image-generation.js.map +1 -1
- package/dist/engine/modules/tools/image-generation.spec.js +7 -5
- package/dist/engine/modules/tools/image-generation.spec.js.map +1 -1
- package/dist/engine/modules/tools/mermaid-png.d.ts.map +1 -1
- package/dist/engine/modules/tools/mermaid-png.js +1 -2
- package/dist/engine/modules/tools/mermaid-png.js.map +1 -1
- package/dist/engine/modules/tools/mermaid-png.spec.js +2 -5
- package/dist/engine/modules/tools/mermaid-png.spec.js.map +1 -1
- package/dist/engine/modules/tools/permanentAgentToolBuild.d.ts +1 -1
- package/dist/engine/modules/tools/permanentAgentToolBuild.d.ts.map +1 -1
- package/dist/engine/modules/tools/permanentAgentToolBuild.js +9 -8
- package/dist/engine/modules/tools/permanentAgentToolBuild.js.map +1 -1
- package/dist/engine/modules/tools/permanentAgentToolBuild.spec.js +10 -9
- package/dist/engine/modules/tools/permanentAgentToolBuild.spec.js.map +1 -1
- package/dist/engine/modules/tools/send-file.d.ts +0 -1
- package/dist/engine/modules/tools/send-file.d.ts.map +1 -1
- package/dist/engine/modules/tools/send-file.js +2 -21
- package/dist/engine/modules/tools/send-file.js.map +1 -1
- package/dist/engine/modules/tools/sessionHistoryToolBuild.spec.js +15 -10
- package/dist/engine/modules/tools/sessionHistoryToolBuild.spec.js.map +1 -1
- package/dist/engine/modules/tools/skillToolBuild.d.ts.map +1 -1
- package/dist/engine/modules/tools/skillToolBuild.js +24 -0
- package/dist/engine/modules/tools/skillToolBuild.js.map +1 -1
- package/dist/engine/modules/tools/skillToolBuild.spec.js +43 -2
- package/dist/engine/modules/tools/skillToolBuild.spec.js.map +1 -1
- package/dist/engine/modules/tools/topologyToolBuild.spec.js +17 -16
- package/dist/engine/modules/tools/topologyToolBuild.spec.js.map +1 -1
- package/dist/engine/modules/tools/types.d.ts +2 -2
- package/dist/engine/modules/tools/types.d.ts.map +1 -1
- package/dist/engine/permissions/permissionBuildUser.d.ts.map +1 -1
- package/dist/engine/permissions/permissionBuildUser.js +3 -2
- package/dist/engine/permissions/permissionBuildUser.js.map +1 -1
- package/dist/engine/permissions/permissionBuildUser.spec.js +3 -2
- package/dist/engine/permissions/permissionBuildUser.spec.js.map +1 -1
- package/dist/engine/permissions.d.ts +0 -3
- package/dist/engine/permissions.d.ts.map +1 -1
- package/dist/engine/permissions.js +0 -11
- package/dist/engine/permissions.js.map +1 -1
- package/dist/engine/plugins/builtins.spec.js +3 -10
- package/dist/engine/plugins/builtins.spec.js.map +1 -1
- package/dist/engine/plugins/loader.spec.js +1 -0
- package/dist/engine/plugins/loader.spec.js.map +1 -1
- package/dist/engine/plugins/manager.d.ts +3 -2
- package/dist/engine/plugins/manager.d.ts.map +1 -1
- package/dist/engine/plugins/manager.js +8 -0
- package/dist/engine/plugins/manager.js.map +1 -1
- package/dist/engine/plugins/manager.spec.js +40 -2
- package/dist/engine/plugins/manager.spec.js.map +1 -1
- package/dist/engine/plugins/types.d.ts +3 -2
- package/dist/engine/plugins/types.d.ts.map +1 -1
- package/dist/engine/plugins/types.js.map +1 -1
- package/dist/engine/skills/skillListUser.d.ts +3 -4
- package/dist/engine/skills/skillListUser.d.ts.map +1 -1
- package/dist/engine/skills/skillListUser.js +6 -14
- package/dist/engine/skills/skillListUser.js.map +1 -1
- package/dist/engine/skills/skillListUser.spec.js +8 -18
- package/dist/engine/skills/skillListUser.spec.js.map +1 -1
- package/dist/engine/skills/skills.js +1 -1
- package/dist/engine/skills/skills.js.map +1 -1
- package/dist/engine/users/userHome.d.ts +2 -0
- package/dist/engine/users/userHome.d.ts.map +1 -1
- package/dist/engine/users/userHome.js +5 -2
- package/dist/engine/users/userHome.js.map +1 -1
- package/dist/engine/users/userHome.spec.js +3 -2
- package/dist/engine/users/userHome.spec.js.map +1 -1
- package/dist/engine/users/userHomeEnsure.d.ts.map +1 -1
- package/dist/engine/users/userHomeEnsure.js +3 -1
- package/dist/engine/users/userHomeEnsure.js.map +1 -1
- package/dist/engine/users/userHomeEnsure.spec.js +4 -3
- package/dist/engine/users/userHomeEnsure.spec.js.map +1 -1
- package/dist/engine/users/userHomeMigrate.d.ts +4 -1
- package/dist/engine/users/userHomeMigrate.d.ts.map +1 -1
- package/dist/engine/users/userHomeMigrate.js +12 -7
- package/dist/engine/users/userHomeMigrate.js.map +1 -1
- package/dist/engine/users/userHomeMigrate.spec.js +19 -12
- package/dist/engine/users/userHomeMigrate.spec.js.map +1 -1
- package/dist/files/types.d.ts +0 -2
- package/dist/files/types.d.ts.map +1 -1
- package/dist/log.spec.js +2 -1
- package/dist/log.spec.js.map +1 -1
- package/dist/paths.d.ts +0 -6
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +0 -6
- package/dist/paths.js.map +1 -1
- package/dist/plugins/dashboard/site/404.html +1 -1
- package/dist/plugins/dashboard/site/agent.html +1 -1
- package/dist/plugins/dashboard/site/agent.txt +1 -1
- package/dist/plugins/dashboard/site/agents.html +1 -1
- package/dist/plugins/dashboard/site/agents.txt +1 -1
- package/dist/plugins/dashboard/site/automations.html +1 -1
- package/dist/plugins/dashboard/site/automations.txt +1 -1
- package/dist/plugins/dashboard/site/connectors.html +1 -1
- package/dist/plugins/dashboard/site/connectors.txt +1 -1
- package/dist/plugins/dashboard/site/index.html +1 -1
- package/dist/plugins/dashboard/site/index.txt +1 -1
- package/dist/plugins/dashboard/site/processes.html +1 -1
- package/dist/plugins/dashboard/site/processes.txt +1 -1
- package/dist/plugins/dashboard/site/providers.html +1 -1
- package/dist/plugins/dashboard/site/providers.txt +1 -1
- package/dist/plugins/dashboard/site/signals.html +1 -1
- package/dist/plugins/dashboard/site/signals.txt +1 -1
- package/dist/plugins/dashboard/site/telemetry.html +1 -1
- package/dist/plugins/dashboard/site/telemetry.txt +1 -1
- package/dist/plugins/dashboard/site/tools.html +1 -1
- package/dist/plugins/dashboard/site/tools.txt +1 -1
- package/dist/plugins/database/__tests__/plugin.spec.js +5 -3
- package/dist/plugins/database/__tests__/plugin.spec.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/nano-banana-pro/__tests__/plugin.integration.spec.js +3 -2
- package/dist/plugins/nano-banana-pro/__tests__/plugin.integration.spec.js.map +1 -1
- package/dist/plugins/nano-banana-pro/plugin.d.ts.map +1 -1
- package/dist/plugins/nano-banana-pro/plugin.js +8 -12
- package/dist/plugins/nano-banana-pro/plugin.js.map +1 -1
- package/dist/plugins/shell/tool.spec.js +2 -1
- package/dist/plugins/shell/tool.spec.js.map +1 -1
- package/dist/plugins/telegram/connector.d.ts +3 -2
- package/dist/plugins/telegram/connector.d.ts.map +1 -1
- package/dist/plugins/telegram/connector.js +18 -2
- package/dist/plugins/telegram/connector.js.map +1 -1
- package/dist/plugins/telegram/connector.spec.js +97 -0
- package/dist/plugins/telegram/connector.spec.js.map +1 -1
- package/dist/plugins/whatsapp/connector.d.ts +2 -2
- package/dist/plugins/whatsapp/connector.d.ts.map +1 -1
- package/dist/plugins/whatsapp/connector.js +0 -1
- package/dist/plugins/whatsapp/connector.js.map +1 -1
- package/dist/prompts/AGENTS.md +3 -14
- package/dist/prompts/PERMISSIONS.md +0 -1
- package/dist/prompts/SYSTEM_MEMORY.md +1 -6
- package/dist/prompts/SYSTEM_PERMISSIONS.md +0 -1
- package/dist/providers/__tests__/inference.integration.spec.js +2 -2
- package/dist/providers/__tests__/inference.integration.spec.js.map +1 -1
- package/dist/providers/manager.d.ts +2 -2
- package/dist/providers/manager.d.ts.map +1 -1
- package/dist/providers/manager.js.map +1 -1
- package/dist/providers/manager.spec.js +3 -3
- package/dist/providers/manager.spec.js.map +1 -1
- package/dist/providers/openai-image.d.ts.map +1 -1
- package/dist/providers/openai-image.js +1 -2
- package/dist/providers/openai-image.js.map +1 -1
- package/dist/providers/types.d.ts +2 -2
- package/dist/providers/types.d.ts.map +1 -1
- package/dist/settings.d.ts +0 -1
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js.map +1 -1
- package/dist/storage/storage.spec.js +8 -4
- package/dist/storage/storage.spec.js.map +1 -1
- package/dist/storage/storageUpgrade.spec.js +1 -2
- package/dist/storage/storageUpgrade.spec.js.map +1 -1
- package/package.json +1 -1
- package/dist/engine/permissions/permissionBuildDefault.d.ts +0 -3
- package/dist/engine/permissions/permissionBuildDefault.d.ts.map +0 -1
- package/dist/engine/permissions/permissionBuildDefault.js +0 -29
- package/dist/engine/permissions/permissionBuildDefault.js.map +0 -1
- package/dist/engine/permissions/permissionBuildDefault.spec.d.ts +0 -2
- package/dist/engine/permissions/permissionBuildDefault.spec.d.ts.map +0 -1
- package/dist/engine/permissions/permissionBuildDefault.spec.js +0 -26
- package/dist/engine/permissions/permissionBuildDefault.spec.js.map +0 -1
- package/dist/files/store.d.ts +0 -24
- package/dist/files/store.d.ts.map +0 -1
- package/dist/files/store.js +0 -74
- package/dist/files/store.js.map +0 -1
- package/dist/files/store.spec.d.ts +0 -2
- package/dist/files/store.spec.d.ts.map +0 -1
- package/dist/files/store.spec.js +0 -27
- package/dist/files/store.spec.js.map +0 -1
- package/dist/plugins/memory/plugin.d.ts +0 -3
- package/dist/plugins/memory/plugin.d.ts.map +0 -1
- package/dist/plugins/memory/plugin.js +0 -30
- package/dist/plugins/memory/plugin.js.map +0 -1
- package/dist/plugins/memory/plugin.json +0 -6
- package/dist/plugins/memory/store.d.ts +0 -30
- package/dist/plugins/memory/store.d.ts.map +0 -1
- package/dist/plugins/memory/store.js +0 -264
- package/dist/plugins/memory/store.js.map +0 -1
- package/dist/plugins/memory/tool.d.ts +0 -6
- package/dist/plugins/memory/tool.d.ts.map +0 -1
- package/dist/plugins/memory/tool.js +0 -161
- package/dist/plugins/memory/tool.js.map +0 -1
- /package/dist/plugins/dashboard/site/_next/static/{2ofcp37OFpSUQ4Jtt6bPH → Qpa35HgGjxQYB6MqQG8XF}/_buildManifest.js +0 -0
- /package/dist/plugins/dashboard/site/_next/static/{2ofcp37OFpSUQ4Jtt6bPH → Qpa35HgGjxQYB6MqQG8XF}/_ssgManifest.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../sources/commands/add.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../sources/commands/add.ts"],"names":[],"mappings":"AA0BA,MAAM,MAAM,UAAU,GAAG;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BnE"}
|
package/dist/commands/add.js
CHANGED
|
@@ -1,20 +1,12 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { AuthStore } from "../auth/store.js";
|
|
3
3
|
import { configLoad } from "../config/configLoad.js";
|
|
4
|
-
import {
|
|
5
|
-
import { Exposes } from "../engine/expose/exposes.js";
|
|
6
|
-
import { EngineEventBus } from "../engine/ipc/events.js";
|
|
4
|
+
import { FileFolder } from "../engine/files/fileFolder.js";
|
|
7
5
|
import { ImageGenerationRegistry } from "../engine/modules/imageGenerationRegistry.js";
|
|
8
|
-
import { InferenceRouter } from "../engine/modules/inference/router.js";
|
|
9
6
|
import { InferenceRegistry } from "../engine/modules/inferenceRegistry.js";
|
|
10
|
-
import { ModuleRegistry } from "../engine/modules/moduleRegistry.js";
|
|
11
7
|
import { buildPluginCatalog } from "../engine/plugins/catalog.js";
|
|
12
8
|
import { resolveExclusivePlugins } from "../engine/plugins/exclusive.js";
|
|
13
9
|
import { PluginModuleLoader } from "../engine/plugins/loader.js";
|
|
14
|
-
import { PluginManager } from "../engine/plugins/manager.js";
|
|
15
|
-
import { PluginRegistry } from "../engine/plugins/registry.js";
|
|
16
|
-
import { Processes } from "../engine/processes/processes.js";
|
|
17
|
-
import { FileStore } from "../files/store.js";
|
|
18
10
|
import { getLogger } from "../log.js";
|
|
19
11
|
import { getProviderDefinition, listProviderDefinitions } from "../providers/catalog.js";
|
|
20
12
|
import { DEFAULT_SETTINGS_PATH, listEnabledPlugins, listProviders, nextPluginInstanceId, updateSettingsFile, upsertPlugin, upsertProviderSettings } from "../settings.js";
|
|
@@ -109,18 +101,6 @@ async function addPlugin(settingsPath, config, authStore) {
|
|
|
109
101
|
else {
|
|
110
102
|
note("No onboarding flow provided; using default settings.", "Plugin");
|
|
111
103
|
}
|
|
112
|
-
try {
|
|
113
|
-
await validatePluginLoad(config, authStore, {
|
|
114
|
-
instanceId,
|
|
115
|
-
pluginId,
|
|
116
|
-
enabled: true,
|
|
117
|
-
settings: settingsConfig
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
catch (error) {
|
|
121
|
-
outro(`Plugin failed to load: ${error.message}`);
|
|
122
|
-
return;
|
|
123
|
-
}
|
|
124
104
|
await updateSettingsFile(settingsPath, (current) => {
|
|
125
105
|
const nextSettings = Object.keys(settingsConfig).length > 0 ? settingsConfig : undefined;
|
|
126
106
|
return {
|
|
@@ -193,40 +173,6 @@ function createPromptHelpers() {
|
|
|
193
173
|
select: promptSelect
|
|
194
174
|
};
|
|
195
175
|
}
|
|
196
|
-
async function validatePluginLoad(config, authStore, pluginConfig) {
|
|
197
|
-
const modules = new ModuleRegistry({
|
|
198
|
-
onMessage: async () => undefined,
|
|
199
|
-
onFatal: () => undefined
|
|
200
|
-
});
|
|
201
|
-
const pluginRegistry = new PluginRegistry(modules);
|
|
202
|
-
const fileStore = new FileStore(config);
|
|
203
|
-
const configModule = new ConfigModule(config);
|
|
204
|
-
const inferenceRouter = new InferenceRouter({
|
|
205
|
-
registry: modules.inference,
|
|
206
|
-
auth: authStore,
|
|
207
|
-
config: configModule
|
|
208
|
-
});
|
|
209
|
-
const pluginManager = new PluginManager({
|
|
210
|
-
config: configModule,
|
|
211
|
-
registry: pluginRegistry,
|
|
212
|
-
auth: authStore,
|
|
213
|
-
fileStore,
|
|
214
|
-
pluginCatalog: buildPluginCatalog(),
|
|
215
|
-
inferenceRouter,
|
|
216
|
-
processes: new Processes(config.dataDir, getLogger("processes.validate"), {
|
|
217
|
-
socketPath: config.socketPath
|
|
218
|
-
}),
|
|
219
|
-
exposes: new Exposes({ config: configModule, eventBus: new EngineEventBus() }),
|
|
220
|
-
mode: "validate"
|
|
221
|
-
});
|
|
222
|
-
await pluginManager.load(pluginConfig);
|
|
223
|
-
try {
|
|
224
|
-
await pluginManager.unload(pluginConfig.instanceId);
|
|
225
|
-
}
|
|
226
|
-
catch (error) {
|
|
227
|
-
note(`Plugin validation unload failed: ${error.message}`, "Plugin");
|
|
228
|
-
}
|
|
229
|
-
}
|
|
230
176
|
async function runProviderOnboarding(definition, authStore) {
|
|
231
177
|
if (!definition.onboarding) {
|
|
232
178
|
return { settings: {} };
|
|
@@ -243,7 +189,7 @@ async function runProviderOnboarding(definition, authStore) {
|
|
|
243
189
|
async function validateProviderLoad(config, authStore, definition, providerSettings) {
|
|
244
190
|
const inferenceRegistry = new InferenceRegistry();
|
|
245
191
|
const imageRegistry = new ImageGenerationRegistry();
|
|
246
|
-
const fileStore = new
|
|
192
|
+
const fileStore = new FileFolder(path.join(config.dataDir, "validate"));
|
|
247
193
|
const logger = getLogger(`provider.validate.${definition.id}`);
|
|
248
194
|
const instance = await Promise.resolve(definition.create({
|
|
249
195
|
settings: providerSettings,
|
package/dist/commands/add.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../sources/commands/add.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAyB,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAEzF,OAAO,EACH,qBAAqB,EACrB,kBAAkB,EAClB,aAAa,EACb,oBAAoB,EAGpB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAMxE,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAmB;IAChD,KAAK,CAAC,aAAa,CAAC,CAAC;IAErB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,qBAAqB,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC;QACjC,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE;YACL,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;YACvC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;SACtC;KACJ,CAAC,CAAC;IAEH,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACrB,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,OAAO;IACX,CAAC;IAED,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACjD,OAAO;IACX,CAAC;IAED,MAAM,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AACvD,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,YAAoB,EAAE,MAAc,EAAE,SAAoB;IAC/E,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC/B,OAAO;IACX,CAAC;IAED,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC;QAChC,OAAO,EAAE,iBAAiB;QAC1B,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE;YAC1B,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;YAC3B,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW;SAC5C,CAAC,CAAC;KACN,CAAC,CAAC;IAEH,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpB,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,OAAO;IACX,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACnC,OAAO;IACX,CAAC;IAED,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE;QAChE,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC,SAAS;KAC7C,CAAC,CAAC;IACH,IAAI,cAAc,GAA4B,EAAE,CAAC;IAEjD,MAAM,cAAc,GAAG,uBAAuB,CAC1C,kBAAkB,CAAC;QACf,GAAG,QAAQ;QACX,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE;YACpC,UAAU;YACV,QAAQ;YACR,OAAO,EAAE,IAAI;SAChB,CAAC;KACL,CAAC,EACF,OAAO,CACV,CAAC;IAEF,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC;QACvD,MAAM,aAAa,GACf,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,WAAW,IAAI,kBAAkB,CAAC;QACpG,KAAK,CACD,iBAAiB,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,aAAa,oEAAoE,CACpI,CAAC;QACF,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,cAAc,UAAU,EAAE,CAAC,CAAC;IAClE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC3D,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;YACnC,UAAU;YACV,QAAQ;YACR,OAAO,EAAE,aAAa;YACtB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,OAAO;YACf,IAAI;SACP,CAAC,CAAC;QACH,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,KAAK,CAAC,YAAY,CAAC,CAAC;YACpB,OAAO;QACX,CAAC;QACD,cAAc,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC3C,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,sDAAsD,EAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,CAAC;QACD,MAAM,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE;YACxC,UAAU;YACV,QAAQ;YACR,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,cAAc;SAC3B,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,KAAK,CAAC,0BAA2B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO;IACX,CAAC;IAED,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE;QAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QACzF,OAAO;YACH,GAAG,OAAO;YACV,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE;gBACnC,UAAU;gBACV,QAAQ;gBACR,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,YAAY;aACzB,CAAC;SACL,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACzD,KAAK,CACD,QAAQ;QACJ,CAAC,CAAC,SAAS,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,qBAAqB;QACzE,CAAC,CAAC,SAAS,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,yCAAyC,CACpG,CAAC;AACN,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,YAAoB,EAAE,MAAc,EAAE,SAAoB;IACjF,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC;IAC5C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACjC,OAAO;IACX,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC;QAClC,OAAO,EAAE,mBAAmB;QAC5B,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC;KAC3C,CAAC,CAAC;IAEH,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACtB,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,OAAO;IACX,CAAC;IAED,MAAM,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACrD,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACrC,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAClE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,OAAO;IACX,CAAC;IAED,MAAM,gBAAgB,GAAqB;QACvC,EAAE,EAAE,UAAU,CAAC,EAAE;QACjB,OAAO,EAAE,IAAI;QACb,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;KAC7B,CAAC;IAEF,IAAI,CAAC;QACD,MAAM,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAChF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,KAAK,CAAC,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,OAAO;IACX,CAAC;IAED,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE;QAC/C,MAAM,aAAa,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACvF,OAAO;YACH,GAAG,OAAO;YACV,SAAS,EAAE,aAAa;SAC3B,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACzD,KAAK,CACD,QAAQ;QACJ,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,oBAAoB;QAC9C,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,wCAAwC,CACzE,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB;IACxB,OAAO;QACH,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE,aAAa;QACtB,MAAM,EAAE,YAAY;KACvB,CAAC;AACN,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC7B,MAA8C,EAC9C,SAAoB,EACpB,YAAoC;IAEpC,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC;QAC/B,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;QAChC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC;QACxC,QAAQ,EAAE,OAAO,CAAC,SAAS;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;QACpC,MAAM,EAAE,YAAY;QACpB,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;QACf,SAAS;QACT,aAAa,EAAE,kBAAkB,EAAE;QACnC,eAAe;QACf,SAAS,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,oBAAoB,CAAC,EAAE;YACtE,UAAU,EAAE,MAAM,CAAC,UAAU;SAChC,CAAC;QACF,OAAO,EAAE,IAAI,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,cAAc,EAAE,EAAE,CAAC;QAC9E,IAAI,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,IAAI,CAAC;QACD,MAAM,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,oCAAqC,KAAe,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;IACnF,CAAC;AACL,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,UAA8B,EAAE,SAAoB;IACrF,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC5B,CAAC;IACD,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC;QACvC,EAAE,EAAE,UAAU,CAAC,EAAE;QACjB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,OAAO;QACf,IAAI;KACP,CAAC,CAAC;IACH,OAAO,MAAM,IAAI,IAAI,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,oBAAoB,CAC/B,MAAc,EACd,SAAoB,EACpB,UAA8B,EAC9B,gBAAkC;IAElC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAClD,MAAM,aAAa,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACpD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,SAAS,CAAC,qBAAqB,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAClC,UAAU,CAAC,MAAM,CAAC;QACd,QAAQ,EAAE,gBAAgB;QAC1B,IAAI,EAAE,SAAS;QACf,SAAS;QACT,iBAAiB;QACjB,aAAa;QACb,MAAM;KACT,CAAC,CACL,CAAC;IACF,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;IACxB,IAAI,CAAC;QACD,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,sCAAuC,KAAe,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAC;IACvF,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,OAA2B;IAC5C,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3F,CAAC;AAID,MAAM,iBAAiB,GAIlB;IACD;QACI,EAAE,EAAE,eAAe;QACnB,KAAK,EAAE,yBAAyB;QAChC,WAAW,EAAE,kDAAkD;KAClE;IACD;QACI,EAAE,EAAE,SAAS;QACb,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE,yBAAyB;KACzC;IACD;QACI,EAAE,EAAE,OAAO;QACX,KAAK,EAAE,4BAA4B;QACnC,WAAW,EAAE,sCAAsC;KACtD;IACD;QACI,EAAE,EAAE,QAAQ;QACZ,KAAK,EAAE,sBAAsB;QAC7B,WAAW,EAAE,sCAAsC;KACtD;CACJ,CAAC;AAEF,MAAM,0BAA0B,GAAsC;IAClE,gBAAgB,EAAE,OAAO;IACzB,eAAe,EAAE,OAAO;IACxB,mBAAmB,EAAE,QAAQ;IAC7B,UAAU,EAAE,QAAQ;CACvB,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAE5D,MAAM,gBAAgB,GAAG;IACrB,WAAW;IACX,cAAc;IACd,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,wBAAwB;IACxB,MAAM;IACN,SAAS;IACT,KAAK;IACL,gBAAgB;IAChB,mBAAmB;IACnB,gBAAgB;IAChB,eAAe;IACf,mBAAmB;IACnB,UAAU;IACV,SAAS;IACT,aAAa;IACb,mBAAmB;IACnB,YAAY;IACZ,oBAAoB;CACvB,CAAC;AAEF,MAAM,eAAe,GAA4D;IAC7E,SAAS,EAAE;QACP,IAAI,EAAE,kCAAkC;QACxC,WAAW,EAAE,uCAAuC;KACvD;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,wBAAwB;QAC9B,WAAW,EAAE,kCAAkC;KAClD;IACD,mBAAmB,EAAE;QACjB,IAAI,EAAE,qCAAqC;QAC3C,WAAW,EAAE,oCAAoC;KACpD;IACD,gBAAgB,EAAE;QACd,WAAW,EAAE,iCAAiC;KACjD;IACD,eAAe,EAAE;QACb,WAAW,EAAE,mCAAmC;KACnD;CACJ,CAAC;AAEF,SAAS,oBAAoB,CAAC,SAA+B;IACzD,MAAM,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IACnE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,OAAO,GAKR,EAAE,CAAC;IAER,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,SAAS;QACb,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,aAAa,OAAO,CAAC,EAAE,EAAE;YAChC,IAAI,EAAE,OAAO,CAAC,KAAK;YACnB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/E,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC;gBACT,KAAK,EAAE,QAAQ,CAAC,EAAE;gBAClB,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;gBACpC,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW;aAC5D,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,sBAAsB,CAAC,QAA4B;IACxD,MAAM,QAAQ,GAAG,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACzD,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACzD,OAAO,eAAe,CAAC;IAC3B,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAqB,EAAE,CAAqB,EAAE,OAA0B;IAC9F,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,SAAS,GAAG,SAAS,CAAC;IACjC,CAAC;IACD,MAAM,WAAW,GAAG,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChD,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,WAAW,GAAG,WAAW,CAAC;IACrC,CAAC;IACD,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,eAAe,CAAC,QAA4B,EAAE,OAA0B;IAC7E,IAAI,OAAO,KAAK,eAAe,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC;IACb,CAAC;IACD,MAAM,KAAK,GAAG,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACzD,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/D,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAkB;IAC7C,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACnD,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1D,CAAC;AAED,SAAS,KAAK,CAAC,OAAe;IAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,KAAK,CAAC,OAAe;IAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,IAAI,CAAC,OAAe,EAAE,KAAc;IACzC,IAAI,KAAK,EAAE,CAAC;QACR,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,OAAO,EAAE,CAAC,CAAC;QACpC,OAAO;IACX,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../sources/commands/add.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/doctor.js
CHANGED
|
@@ -3,10 +3,10 @@ import { AuthStore } from "../auth/store.js";
|
|
|
3
3
|
import { configLoad } from "../config/configLoad.js";
|
|
4
4
|
import { configResolve } from "../config/configResolve.js";
|
|
5
5
|
import { ConfigModule } from "../engine/config/configModule.js";
|
|
6
|
+
import { FileFolder } from "../engine/files/fileFolder.js";
|
|
6
7
|
import { ImageGenerationRegistry } from "../engine/modules/imageGenerationRegistry.js";
|
|
7
8
|
import { InferenceRouter } from "../engine/modules/inference/router.js";
|
|
8
9
|
import { InferenceRegistry } from "../engine/modules/inferenceRegistry.js";
|
|
9
|
-
import { FileStore } from "../files/store.js";
|
|
10
10
|
import { getLogger } from "../log.js";
|
|
11
11
|
import { getProviderDefinition } from "../providers/catalog.js";
|
|
12
12
|
import { DEFAULT_SETTINGS_PATH, listProviders } from "../settings.js";
|
|
@@ -20,7 +20,7 @@ export async function doctorCommand(options) {
|
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
22
|
const auth = new AuthStore(config);
|
|
23
|
-
const fileStore = new
|
|
23
|
+
const fileStore = new FileFolder(path.join(config.dataDir, "validate"));
|
|
24
24
|
let failed = 0;
|
|
25
25
|
let skipped = 0;
|
|
26
26
|
for (const providerSettings of configuredProviders) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../sources/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../sources/commands/doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configResolve.d.ts","sourceRoot":"","sources":["../../sources/config/configResolve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configResolve.d.ts","sourceRoot":"","sources":["../../sources/config/configResolve.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAA0B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE7E,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,GAAE,eAAoB,GAAG,MAAM,CA0BrH"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { resolveEngineSocketPath } from "../engine/ipc/socket.js";
|
|
3
|
-
import { permissionBuildDefault } from "../engine/permissions/permissionBuildDefault.js";
|
|
4
|
-
import { resolveWorkspaceDir } from "../engine/permissions.js";
|
|
5
3
|
import { DEFAULT_DAYCARE_DIR } from "../paths.js";
|
|
6
4
|
import { freezeDeep } from "../util/freezeDeep.js";
|
|
7
5
|
/**
|
|
@@ -13,16 +11,12 @@ export function configResolve(settings, settingsPath, overrides = {}) {
|
|
|
13
11
|
const resolvedSettingsPath = path.resolve(settingsPath);
|
|
14
12
|
const configDir = path.dirname(resolvedSettingsPath);
|
|
15
13
|
const dataDir = path.resolve(resolvedSettings.engine?.dataDir ?? DEFAULT_DAYCARE_DIR);
|
|
16
|
-
const workspaceDir = resolveWorkspaceDir(configDir, resolvedSettings.assistant ?? null);
|
|
17
14
|
const agentsDir = path.join(dataDir, "agents");
|
|
18
15
|
const usersDir = path.join(dataDir, "users");
|
|
19
16
|
const dbPath = path.resolve(resolvedSettings.engine?.dbPath ?? path.join(dataDir, "daycare.db"));
|
|
20
|
-
const filesDir = path.join(workspaceDir, "files");
|
|
21
17
|
const authPath = path.join(dataDir, "auth.json");
|
|
22
18
|
const socketPath = resolveEngineSocketPath(resolvedSettings.engine?.socketPath);
|
|
23
|
-
const defaultPermissions = permissionBuildDefault(workspaceDir, configDir);
|
|
24
19
|
const frozenSettings = freezeDeep(structuredClone(resolvedSettings));
|
|
25
|
-
const frozenPermissions = freezeDeep(defaultPermissions);
|
|
26
20
|
const verbose = overrides.verbose ?? false;
|
|
27
21
|
return freezeDeep({
|
|
28
22
|
settingsPath: resolvedSettingsPath,
|
|
@@ -31,13 +25,10 @@ export function configResolve(settings, settingsPath, overrides = {}) {
|
|
|
31
25
|
agentsDir,
|
|
32
26
|
usersDir,
|
|
33
27
|
dbPath,
|
|
34
|
-
filesDir,
|
|
35
28
|
authPath,
|
|
36
29
|
socketPath,
|
|
37
|
-
workspaceDir,
|
|
38
30
|
features: frozenSettings.features,
|
|
39
31
|
settings: frozenSettings,
|
|
40
|
-
defaultPermissions: frozenPermissions,
|
|
41
32
|
verbose
|
|
42
33
|
});
|
|
43
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configResolve.js","sourceRoot":"","sources":["../../sources/config/configResolve.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"configResolve.js","sourceRoot":"","sources":["../../sources/config/configResolve.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,QAAwB,EAAE,YAAoB,EAAE,YAA6B,EAAE;IACzG,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,IAAI,mBAAmB,CAAC,CAAC;IACtF,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IACjG,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAChF,MAAM,cAAc,GAAG,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC;IAE3C,OAAO,UAAU,CAAC;QACd,YAAY,EAAE,oBAAoB;QAClC,SAAS;QACT,OAAO;QACP,SAAS;QACT,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,UAAU;QACV,QAAQ,EAAE,cAAc,CAAC,QAAQ;QACjC,QAAQ,EAAE,cAAc;QACxB,OAAO;KACV,CAAC,CAAC;AACP,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAwB;IACrD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,MAAM,EAAE,qBAAqB,IAAI,OAAO,CAAC;IAChF,MAAM,kBAAkB,GAAG,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,IAAI,KAAK,CAAC;IAC1E,OAAO;QACH,GAAG,QAAQ;QACX,MAAM,EAAE;YACJ,GAAG,QAAQ,CAAC,MAAM;YAClB,qBAAqB;SACxB;QACD,QAAQ,EAAE;YACN,GAAG,QAAQ,CAAC,QAAQ;YACpB,kBAAkB;SACrB;QACD,QAAQ,EAAE;YACN,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,GAAG,IAAI,KAAK;YACpC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,GAAG,IAAI,KAAK;YACpC,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,IAAI,KAAK;SAC/C;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -2,18 +2,15 @@ import path from "node:path";
|
|
|
2
2
|
import { describe, expect, it } from "vitest";
|
|
3
3
|
import { configResolve } from "./configResolve.js";
|
|
4
4
|
describe("configResolve", () => {
|
|
5
|
-
it("resolves
|
|
5
|
+
it("resolves runtime directories under dataDir", () => {
|
|
6
6
|
const configPath = path.join("/tmp/daycare", "settings.json");
|
|
7
7
|
const config = configResolve({
|
|
8
|
-
assistant: {
|
|
9
|
-
workspaceDir: "/tmp/daycare/workspace"
|
|
10
|
-
},
|
|
11
8
|
engine: {
|
|
12
9
|
dataDir: "/tmp/daycare/.daycare"
|
|
13
10
|
}
|
|
14
11
|
}, configPath);
|
|
15
|
-
expect(config.
|
|
16
|
-
expect(config.
|
|
12
|
+
expect(config.dataDir).toBe(path.resolve("/tmp/daycare/.daycare"));
|
|
13
|
+
expect(config.agentsDir).toBe(path.resolve("/tmp/daycare/.daycare/agents"));
|
|
17
14
|
expect(config.usersDir).toBe(path.resolve("/tmp/daycare/.daycare/users"));
|
|
18
15
|
expect(config.dbPath).toBe(path.resolve("/tmp/daycare/.daycare/daycare.db"));
|
|
19
16
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configResolve.spec.js","sourceRoot":"","sources":["../../sources/config/configResolve.spec.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"configResolve.spec.js","sourceRoot":"","sources":["../../sources/config/configResolve.spec.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CACxB;YACI,MAAM,EAAE;gBACJ,OAAO,EAAE,uBAAuB;aACnC;SACJ,EACD,UAAU,CACb,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CACxB;YACI,MAAM,EAAE;gBACJ,OAAO,EAAE,uBAAuB;gBAChC,MAAM,EAAE,gCAAgC;aAC3C;SACJ,EACD,UAAU,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACtF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSettingsParse.d.ts","sourceRoot":"","sources":["../../sources/config/configSettingsParse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"configSettingsParse.d.ts","sourceRoot":"","sources":["../../sources/config/configSettingsParse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAqGhE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSettingsParse.js","sourceRoot":"","sources":["../../sources/config/configSettingsParse.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"configSettingsParse.js","sourceRoot":"","sources":["../../sources/config/configSettingsParse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { SessionPermissions } from "../engine/permissions.js";
|
|
2
1
|
import type { ResolvedFeaturesConfig, ResolvedSettingsConfig } from "../settings.js";
|
|
3
2
|
export type Config = {
|
|
4
3
|
settingsPath: string;
|
|
@@ -7,13 +6,10 @@ export type Config = {
|
|
|
7
6
|
agentsDir: string;
|
|
8
7
|
usersDir: string;
|
|
9
8
|
dbPath: string;
|
|
10
|
-
filesDir: string;
|
|
11
9
|
authPath: string;
|
|
12
10
|
socketPath: string;
|
|
13
|
-
workspaceDir: string;
|
|
14
11
|
features: ResolvedFeaturesConfig;
|
|
15
12
|
settings: ResolvedSettingsConfig;
|
|
16
|
-
defaultPermissions: SessionPermissions;
|
|
17
13
|
verbose: boolean;
|
|
18
14
|
};
|
|
19
15
|
export type ConfigOverrides = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../../sources/config/configTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../../sources/config/configTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAErF,MAAM,MAAM,MAAM,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}
|
|
@@ -15,18 +15,18 @@ export declare class Agent {
|
|
|
15
15
|
private started;
|
|
16
16
|
private inferenceAbortController;
|
|
17
17
|
private readonly userHome;
|
|
18
|
-
private readonly
|
|
18
|
+
private readonly files;
|
|
19
19
|
private constructor();
|
|
20
20
|
/**
|
|
21
21
|
* Creates a new agent and persists descriptor + state + initial session row.
|
|
22
22
|
* Expects: agentId is a cuid2 value; descriptor is validated.
|
|
23
23
|
*/
|
|
24
|
-
static create(agentId: string, descriptor: AgentDescriptor, userId: string, inbox: AgentInbox, agentSystem: AgentSystem, userHome
|
|
24
|
+
static create(agentId: string, descriptor: AgentDescriptor, userId: string, inbox: AgentInbox, agentSystem: AgentSystem, userHome: UserHome): Promise<Agent>;
|
|
25
25
|
/**
|
|
26
26
|
* Rehydrates an agent from persisted descriptor + state.
|
|
27
27
|
* Expects: state and descriptor already validated.
|
|
28
28
|
*/
|
|
29
|
-
static restore(agentId: string, userId: string, descriptor: AgentDescriptor, state: AgentState, inbox: AgentInbox, agentSystem: AgentSystem, userHome
|
|
29
|
+
static restore(agentId: string, userId: string, descriptor: AgentDescriptor, state: AgentState, inbox: AgentInbox, agentSystem: AgentSystem, userHome: UserHome): Agent;
|
|
30
30
|
start(): void;
|
|
31
31
|
isProcessing(): boolean;
|
|
32
32
|
/**
|
|
@@ -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":"AAgCA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAOrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAOtD,OAAO,KAAK,EAWR,UAAU,EACb,MAAM,qBAAqB,CAAC;AAQ7B,qBAAa,KAAK;IACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,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;IAChE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAE9B,OAAO;IAsBP;;;OAGG;WACU,MAAM,CACf,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,eAAe,EAC3B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,GACnB,OAAO,CAAC,KAAK,CAAC;IAqCjB;;;OAGG;IACH,MAAM,CAAC,OAAO,CACV,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,GACnB,KAAK;IAIR,KAAK,IAAI,IAAI;IAab,YAAY,IAAI,OAAO;IAIvB;;;OAGG;IACH,cAAc,IAAI,OAAO;YASX,OAAO;IAoCrB;;;OAGG;YACW,cAAc;YAcd,eAAe;YAuCf,mBAAmB;YAmBnB,aAAa;YAmQb,mBAAmB;YAmFnB,YAAY;YA0BZ,WAAW;YAgDX,gBAAgB;IAqB9B;;;OAGG;YACW,oBAAoB;YAoCpB,aAAa;YAab,mBAAmB;IAkDjC,OAAO,CAAC,oBAAoB;IAkB5B;;;OAGG;YACW,wBAAwB;IA8GtC,OAAO,CAAC,sBAAsB;IAoB9B;;;OAGG;IACG,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B3E;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;YAUnC,qBAAqB;YAsBrB,gBAAgB;IA6B9B,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAe5B;;;OAGG;IACH,OAAO,CAAC,8BAA8B;YAYxB,mBAAmB;YAInB,sBAAsB;CA+BvC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { createId } from "@paralleldrive/cuid2";
|
|
3
|
-
import { FileStore } from "../../files/store.js";
|
|
4
3
|
import { getLogger } from "../../log.js";
|
|
5
4
|
import { listActiveInferenceProviders } from "../../providers/catalog.js";
|
|
6
5
|
import { tagExtractAll } from "../../util/tagExtract.js";
|
|
7
6
|
import { cuid2Is } from "../../utils/cuid2Is.js";
|
|
8
7
|
import { channelMessageBuild, channelSignalDataParse } from "../channels/channelMessageBuild.js";
|
|
8
|
+
import { Files } from "../files/files.js";
|
|
9
9
|
import { messageBuildSystemSilentText } from "../messages/messageBuildSystemSilentText.js";
|
|
10
10
|
import { messageBuildSystemText } from "../messages/messageBuildSystemText.js";
|
|
11
11
|
import { messageBuildUser } from "../messages/messageBuildUser.js";
|
|
@@ -22,9 +22,6 @@ import { rlmToolDescriptionBuild } from "../modules/rlm/rlmToolDescriptionBuild.
|
|
|
22
22
|
import { rlmToolResultBuild } from "../modules/rlm/rlmToolResultBuild.js";
|
|
23
23
|
import { toolListContextBuild } from "../modules/tools/toolListContextBuild.js";
|
|
24
24
|
import { permissionBuildUser } from "../permissions/permissionBuildUser.js";
|
|
25
|
-
import { permissionClone } from "../permissions/permissionClone.js";
|
|
26
|
-
import { permissionEnsureDefaultFile } from "../permissions/permissionEnsureDefaultFile.js";
|
|
27
|
-
import { permissionMergeDefault } from "../permissions/permissionMergeDefault.js";
|
|
28
25
|
import { permissionTagsApply } from "../permissions/permissionTagsApply.js";
|
|
29
26
|
import { signalMessageBuild } from "../signals/signalMessageBuild.js";
|
|
30
27
|
import { Skills } from "../skills/skills.js";
|
|
@@ -62,16 +59,19 @@ export class Agent {
|
|
|
62
59
|
started = false;
|
|
63
60
|
inferenceAbortController = null;
|
|
64
61
|
userHome;
|
|
65
|
-
|
|
62
|
+
files;
|
|
66
63
|
constructor(id, userId, descriptor, state, inbox, agentSystem, userHome) {
|
|
64
|
+
if (!userHome) {
|
|
65
|
+
throw new Error("Agent user home is required.");
|
|
66
|
+
}
|
|
67
67
|
this.id = id;
|
|
68
68
|
this.userId = userId;
|
|
69
69
|
this.descriptor = descriptor;
|
|
70
70
|
this.state = state;
|
|
71
71
|
this.inbox = inbox;
|
|
72
72
|
this.agentSystem = agentSystem;
|
|
73
|
-
this.userHome = userHome
|
|
74
|
-
this.
|
|
73
|
+
this.userHome = userHome;
|
|
74
|
+
this.files = new Files(this.userHome.home);
|
|
75
75
|
}
|
|
76
76
|
/**
|
|
77
77
|
* Creates a new agent and persists descriptor + state + initial session row.
|
|
@@ -81,17 +81,14 @@ export class Agent {
|
|
|
81
81
|
if (!cuid2Is(agentId)) {
|
|
82
82
|
throw new Error("Agent id must be a cuid2 value.");
|
|
83
83
|
}
|
|
84
|
-
|
|
85
|
-
await userHomeEnsure(userHome);
|
|
86
|
-
}
|
|
84
|
+
await userHomeEnsure(userHome);
|
|
87
85
|
const now = Date.now();
|
|
86
|
+
const basePermissions = permissionBuildUser(userHome);
|
|
88
87
|
const state = {
|
|
89
88
|
context: { messages: [] },
|
|
90
89
|
activeSessionId: null,
|
|
91
90
|
inferenceSessionId: createId(),
|
|
92
|
-
permissions:
|
|
93
|
-
? permissionBuildUser(userHome)
|
|
94
|
-
: permissionClone(agentSystem.config.current.defaultPermissions),
|
|
91
|
+
permissions: basePermissions,
|
|
95
92
|
tokens: null,
|
|
96
93
|
stats: {},
|
|
97
94
|
createdAt: now,
|
|
@@ -99,7 +96,7 @@ export class Agent {
|
|
|
99
96
|
state: "active"
|
|
100
97
|
};
|
|
101
98
|
const agent = new Agent(agentId, userId, descriptor, state, inbox, agentSystem, userHome);
|
|
102
|
-
await agentDescriptorWrite(agentSystem.storage, agentId, descriptor, userId,
|
|
99
|
+
await agentDescriptorWrite(agentSystem.storage, agentId, descriptor, userId, basePermissions);
|
|
103
100
|
await agentStateWrite(agentSystem.storage, agentId, state);
|
|
104
101
|
state.activeSessionId = await agentSystem.storage.sessions.create({
|
|
105
102
|
agentId,
|
|
@@ -282,14 +279,12 @@ export class Agent {
|
|
|
282
279
|
const skills = new Skills({
|
|
283
280
|
configRoot: configSkillsRoot,
|
|
284
281
|
pluginManager,
|
|
285
|
-
userRoot: this.userHome
|
|
282
|
+
userRoot: this.userHome.skills
|
|
286
283
|
});
|
|
287
284
|
const agentKind = this.resolveAgentKind();
|
|
288
285
|
const allowCronTools = agentDescriptorIsCron(this.descriptor);
|
|
289
|
-
const defaultPermissions = this.agentSystem.config.current.defaultPermissions;
|
|
290
286
|
if (agentDescriptorIsHeartbeat(this.descriptor)) {
|
|
291
|
-
this.state.permissions =
|
|
292
|
-
permissionEnsureDefaultFile(this.state.permissions, defaultPermissions);
|
|
287
|
+
this.state.permissions = permissionBuildUser(this.userHome);
|
|
293
288
|
}
|
|
294
289
|
const permissionTags = [...(entry.context.permissionTags ?? [])];
|
|
295
290
|
if (permissionTags.length > 0) {
|
|
@@ -307,7 +302,7 @@ export class Agent {
|
|
|
307
302
|
const rlmToolDescription = this.agentSystem.config.current.features.rlm && !noToolsModeEnabled
|
|
308
303
|
? await rlmToolDescriptionBuild(availableTools)
|
|
309
304
|
: undefined;
|
|
310
|
-
await agentPromptFilesEnsure(agentPromptPathsResolve(this.
|
|
305
|
+
await agentPromptFilesEnsure(agentPromptPathsResolve(this.userHome));
|
|
311
306
|
logger.debug(`event: handleMessage building system prompt agentId=${this.id}`);
|
|
312
307
|
const systemPrompt = await agentSystemPrompt({
|
|
313
308
|
provider: providerSettings?.id,
|
|
@@ -315,7 +310,7 @@ export class Agent {
|
|
|
315
310
|
permissions: this.state.permissions,
|
|
316
311
|
descriptor: this.descriptor,
|
|
317
312
|
agentSystem: this.agentSystem,
|
|
318
|
-
userHome: this.userHome
|
|
313
|
+
userHome: this.userHome
|
|
319
314
|
});
|
|
320
315
|
try {
|
|
321
316
|
const wrote = await agentSystemPromptWrite(this.agentSystem.config.current, this.id, systemPrompt);
|
|
@@ -426,7 +421,7 @@ export class Agent {
|
|
|
426
421
|
connectorRegistry: this.agentSystem.connectorRegistry,
|
|
427
422
|
inferenceRouter: this.agentSystem.inferenceRouter,
|
|
428
423
|
toolResolver,
|
|
429
|
-
fileStore: this.
|
|
424
|
+
fileStore: this.files.downloads,
|
|
430
425
|
authStore: this.agentSystem.authStore,
|
|
431
426
|
eventBus: this.agentSystem.eventBus,
|
|
432
427
|
assistant: this.agentSystem.config.current.settings.assistant ?? null,
|
|
@@ -491,10 +486,19 @@ export class Agent {
|
|
|
491
486
|
else {
|
|
492
487
|
const startedAt = Date.now();
|
|
493
488
|
const runPythonTagCount = tagExtractAll(systemText, "run_python").length;
|
|
494
|
-
|
|
489
|
+
const expandResult = await executablePromptExpand(systemText, {
|
|
495
490
|
...this.rlmRestoreContextBuild(item.origin ?? "system"),
|
|
496
491
|
messageContext: item.context ?? {}
|
|
497
492
|
}, this.agentSystem.toolResolver);
|
|
493
|
+
if (expandResult.skipTurn) {
|
|
494
|
+
logger.info({
|
|
495
|
+
agentId: this.id,
|
|
496
|
+
origin: item.origin ?? "system",
|
|
497
|
+
durationMs: Date.now() - startedAt
|
|
498
|
+
}, "event: Executable system message skipped via skip()");
|
|
499
|
+
return null;
|
|
500
|
+
}
|
|
501
|
+
systemText = expandResult.expanded;
|
|
498
502
|
const errorTagCount = tagExtractAll(systemText, "exec_error").length;
|
|
499
503
|
logger.info({
|
|
500
504
|
agentId: this.id,
|
|
@@ -837,7 +841,7 @@ export class Agent {
|
|
|
837
841
|
rlmRestoreContextBuild(source) {
|
|
838
842
|
return {
|
|
839
843
|
connectorRegistry: this.agentSystem.connectorRegistry,
|
|
840
|
-
fileStore: this.
|
|
844
|
+
fileStore: this.files.downloads,
|
|
841
845
|
auth: this.agentSystem.authStore,
|
|
842
846
|
logger,
|
|
843
847
|
assistant: this.agentSystem.config.current.settings.assistant ?? null,
|
|
@@ -896,13 +900,13 @@ export class Agent {
|
|
|
896
900
|
}
|
|
897
901
|
async messageFilesNormalize(files) {
|
|
898
902
|
const copied = toFileReferences(files);
|
|
899
|
-
if (
|
|
903
|
+
if (copied.length === 0) {
|
|
900
904
|
return copied;
|
|
901
905
|
}
|
|
902
906
|
const relocated = [];
|
|
903
907
|
for (const file of copied) {
|
|
904
908
|
try {
|
|
905
|
-
relocated.push(await fileStoreCopyIfNeeded(this.
|
|
909
|
+
relocated.push(await fileStoreCopyIfNeeded(this.files.downloads, this.userHome.downloads, file));
|
|
906
910
|
}
|
|
907
911
|
catch (error) {
|
|
908
912
|
logger.warn({ agentId: this.id, filePath: file.path, error }, "warn: Failed to route file to user home");
|
|
@@ -1009,7 +1013,6 @@ async function fileStoreCopyIfNeeded(fileStore, targetDir, file) {
|
|
|
1009
1013
|
const stored = await fileStore.saveFromPath({
|
|
1010
1014
|
name: file.name,
|
|
1011
1015
|
mimeType: file.mimeType,
|
|
1012
|
-
source: "connector",
|
|
1013
1016
|
path: resolvedPath
|
|
1014
1017
|
});
|
|
1015
1018
|
return {
|