@terreno/ai 57.9.0 → 57.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/bunfig.toml +1 -1
- package/dist/aiApp.d.ts +8 -2
- package/dist/aiApp.js +12 -6
- package/dist/harness/adminScreens.d.ts +6 -0
- package/dist/harness/adminScreens.js +11 -0
- package/dist/harness/agentLoop.d.ts +61 -0
- package/dist/harness/agentLoop.js +798 -0
- package/dist/harness/agentTaskNames.d.ts +4 -0
- package/dist/harness/agentTaskNames.js +7 -0
- package/dist/harness/approvalPolicy.d.ts +3 -0
- package/dist/harness/approvalPolicy.js +23 -0
- package/dist/harness/approvals.d.ts +101 -0
- package/dist/harness/approvals.js +468 -0
- package/dist/harness/commit.d.ts +238 -0
- package/dist/harness/commit.js +678 -0
- package/dist/harness/conversation.d.ts +75 -0
- package/dist/harness/conversation.js +397 -0
- package/dist/harness/defineAgent.d.ts +9 -0
- package/dist/harness/defineAgent.js +65 -0
- package/dist/harness/defineTask.d.ts +11 -0
- package/dist/harness/defineTask.js +59 -0
- package/dist/harness/defineTool.d.ts +7 -0
- package/dist/harness/defineTool.js +36 -0
- package/dist/harness/definitionError.d.ts +8 -0
- package/dist/harness/definitionError.js +15 -0
- package/dist/harness/errors.d.ts +133 -0
- package/dist/harness/errors.js +107 -0
- package/dist/harness/eventHub.d.ts +45 -0
- package/dist/harness/eventHub.js +135 -0
- package/dist/harness/events.d.ts +95 -0
- package/dist/harness/events.js +267 -0
- package/dist/harness/executionEnv.d.ts +31 -0
- package/dist/harness/executionEnv.js +2 -0
- package/dist/harness/extensions.d.ts +82 -0
- package/dist/harness/extensions.js +274 -0
- package/dist/harness/harness.d.ts +163 -0
- package/dist/harness/harness.js +522 -0
- package/dist/harness/harnessApp.d.ts +44 -0
- package/dist/harness/harnessApp.js +62 -0
- package/dist/harness/internalRuntime.d.ts +16 -0
- package/dist/harness/internalRuntime.js +18 -0
- package/dist/harness/leases.d.ts +35 -0
- package/dist/harness/leases.js +86 -0
- package/dist/harness/memo.d.ts +24 -0
- package/dist/harness/memo.js +78 -0
- package/dist/harness/modelCall.d.ts +45 -0
- package/dist/harness/modelCall.js +147 -0
- package/dist/harness/models/harnessApproval.d.ts +2 -0
- package/dist/harness/models/harnessApproval.js +100 -0
- package/dist/harness/models/harnessConversation.d.ts +2 -0
- package/dist/harness/models/harnessConversation.js +117 -0
- package/dist/harness/models/harnessEvent.d.ts +3 -0
- package/dist/harness/models/harnessEvent.js +73 -0
- package/dist/harness/models/harnessInboxEvent.d.ts +2 -0
- package/dist/harness/models/harnessInboxEvent.js +58 -0
- package/dist/harness/models/harnessMemo.d.ts +2 -0
- package/dist/harness/models/harnessMemo.js +42 -0
- package/dist/harness/models/harnessMessage.d.ts +2 -0
- package/dist/harness/models/harnessMessage.js +73 -0
- package/dist/harness/models/harnessOwner.d.ts +2 -0
- package/dist/harness/models/harnessOwner.js +36 -0
- package/dist/harness/models/harnessTask.d.ts +2 -0
- package/dist/harness/models/harnessTask.js +191 -0
- package/dist/harness/ownership.d.ts +89 -0
- package/dist/harness/ownership.js +438 -0
- package/dist/harness/registry.d.ts +29 -0
- package/dist/harness/registry.js +93 -0
- package/dist/harness/retryBackoff.d.ts +31 -0
- package/dist/harness/retryBackoff.js +50 -0
- package/dist/harness/routes/approvals.d.ts +13 -0
- package/dist/harness/routes/approvals.js +93 -0
- package/dist/harness/routes/conversations.d.ts +11 -0
- package/dist/harness/routes/conversations.js +66 -0
- package/dist/harness/routes/events.d.ts +19 -0
- package/dist/harness/routes/events.js +215 -0
- package/dist/harness/routes/tasks.d.ts +11 -0
- package/dist/harness/routes/tasks.js +108 -0
- package/dist/harness/runners/inProcessRunner.d.ts +64 -0
- package/dist/harness/runners/inProcessRunner.js +227 -0
- package/dist/harness/runners/jobsRunner.d.ts +62 -0
- package/dist/harness/runners/jobsRunner.js +212 -0
- package/dist/harness/runtime.d.ts +52 -0
- package/dist/harness/runtime.js +604 -0
- package/dist/harness/subagent.d.ts +53 -0
- package/dist/harness/subagent.js +134 -0
- package/dist/harness/suspend.d.ts +8 -0
- package/dist/harness/suspend.js +16 -0
- package/dist/harness/transaction.d.ts +3 -0
- package/dist/harness/transaction.js +22 -0
- package/dist/harness/waits.d.ts +100 -0
- package/dist/harness/waits.js +214 -0
- package/dist/index.d.ts +19 -1
- package/dist/index.js +45 -2
- package/dist/models/aiDataset.d.ts +2 -0
- package/dist/models/aiDataset.js +67 -0
- package/dist/models/aiRequest.js +1 -1
- package/dist/models/gptHistory.js +73 -0
- package/dist/observability/adminScreens.d.ts +5 -0
- package/dist/observability/adminScreens.js +32 -0
- package/dist/observability/compileTemplate.d.ts +1 -0
- package/dist/observability/compileTemplate.js +13 -0
- package/dist/observability/datasetImport.d.ts +11 -0
- package/dist/observability/datasetImport.js +185 -0
- package/dist/observability/evaluate.d.ts +31 -0
- package/dist/observability/evaluate.js +200 -0
- package/dist/observability/evaluatorTemplates.d.ts +17 -0
- package/dist/observability/evaluatorTemplates.js +111 -0
- package/dist/observability/jsonPath.d.ts +2 -0
- package/dist/observability/jsonPath.js +57 -0
- package/dist/observability/local/datasetStore.d.ts +87 -0
- package/dist/observability/local/datasetStore.js +326 -0
- package/dist/observability/local/evaluatorStore.d.ts +44 -0
- package/dist/observability/local/evaluatorStore.js +182 -0
- package/dist/observability/local/experimentRunner.d.ts +96 -0
- package/dist/observability/local/experimentRunner.js +419 -0
- package/dist/observability/local/localPlugin.d.ts +22 -0
- package/dist/observability/local/localPlugin.js +76 -0
- package/dist/observability/local/models/obsDataset.d.ts +2 -0
- package/dist/observability/local/models/obsDataset.js +37 -0
- package/dist/observability/local/models/obsDatasetItem.d.ts +2 -0
- package/dist/observability/local/models/obsDatasetItem.js +76 -0
- package/dist/observability/local/models/obsEvaluator.d.ts +2 -0
- package/dist/observability/local/models/obsEvaluator.js +98 -0
- package/dist/observability/local/models/obsExperiment.d.ts +2 -0
- package/dist/observability/local/models/obsExperiment.js +87 -0
- package/dist/observability/local/models/obsExperimentItem.d.ts +2 -0
- package/dist/observability/local/models/obsExperimentItem.js +45 -0
- package/dist/observability/local/models/obsPrompt.d.ts +2 -0
- package/dist/observability/local/models/obsPrompt.js +42 -0
- package/dist/observability/local/models/obsPromptLabel.d.ts +2 -0
- package/dist/observability/local/models/obsPromptLabel.js +39 -0
- package/dist/observability/local/models/obsPromptVersion.d.ts +2 -0
- package/dist/observability/local/models/obsPromptVersion.js +96 -0
- package/dist/observability/local/models/obsReviewItem.d.ts +2 -0
- package/dist/observability/local/models/obsReviewItem.js +75 -0
- package/dist/observability/local/models/obsScore.d.ts +2 -0
- package/dist/observability/local/models/obsScore.js +58 -0
- package/dist/observability/local/models/obsSpan.d.ts +2 -0
- package/dist/observability/local/models/obsSpan.js +64 -0
- package/dist/observability/local/models/obsTrace.d.ts +2 -0
- package/dist/observability/local/models/obsTrace.js +93 -0
- package/dist/observability/local/promptStore.d.ts +180 -0
- package/dist/observability/local/promptStore.js +444 -0
- package/dist/observability/local/reviewStore.d.ts +50 -0
- package/dist/observability/local/reviewStore.js +203 -0
- package/dist/observability/local/traceStore.d.ts +103 -0
- package/dist/observability/local/traceStore.js +325 -0
- package/dist/observability/observabilityApp.d.ts +24 -0
- package/dist/observability/observabilityApp.js +157 -0
- package/dist/observability/observabilityAppRegistry.d.ts +14 -0
- package/dist/observability/observabilityAppRegistry.js +16 -0
- package/dist/observability/permissions.d.ts +7 -0
- package/dist/observability/permissions.js +60 -0
- package/dist/observability/reviewPanels.d.ts +18 -0
- package/dist/observability/reviewPanels.js +46 -0
- package/dist/observability/routes/datasets.d.ts +7 -0
- package/dist/observability/routes/datasets.js +149 -0
- package/dist/observability/routes/evaluators.d.ts +7 -0
- package/dist/observability/routes/evaluators.js +123 -0
- package/dist/observability/routes/experiments.d.ts +7 -0
- package/dist/observability/routes/experiments.js +95 -0
- package/dist/observability/routes/observabilityRouteAccess.d.ts +13 -0
- package/dist/observability/routes/observabilityRouteAccess.js +67 -0
- package/dist/observability/routes/prompts.d.ts +12 -0
- package/dist/observability/routes/prompts.js +172 -0
- package/dist/observability/routes/requestAiService.d.ts +13 -0
- package/dist/observability/routes/requestAiService.js +21 -0
- package/dist/observability/routes/review.d.ts +7 -0
- package/dist/observability/routes/review.js +79 -0
- package/dist/observability/routes/status.d.ts +5 -0
- package/dist/observability/routes/status.js +31 -0
- package/dist/observability/routes/testMultiStage.d.ts +9 -0
- package/dist/observability/routes/testMultiStage.js +67 -0
- package/dist/observability/routes/traces.d.ts +7 -0
- package/dist/observability/routes/traces.js +129 -0
- package/dist/observability/schemaValidation.d.ts +5 -0
- package/dist/observability/schemaValidation.js +26 -0
- package/dist/observability/sopThresholds.d.ts +2 -0
- package/dist/observability/sopThresholds.js +21 -0
- package/dist/observability/status.d.ts +23 -0
- package/dist/observability/status.js +34 -0
- package/dist/observability/testMultiStageSchemas.d.ts +10 -0
- package/dist/observability/testMultiStageSchemas.js +79 -0
- package/dist/observability/testMultiStageWorkflow.d.ts +20 -0
- package/dist/observability/testMultiStageWorkflow.js +218 -0
- package/dist/observability/types.d.ts +159 -0
- package/dist/observability/types.js +67 -0
- package/dist/routes/files.js +18 -7
- package/dist/routes/gpt.js +79 -689
- package/dist/routes/gptActions.d.ts +9 -0
- package/dist/routes/gptActions.js +212 -0
- package/dist/routes/gptDatasets.d.ts +5 -0
- package/dist/routes/gptDatasets.js +94 -0
- package/dist/routes/gptHistories.d.ts +3 -1
- package/dist/routes/gptHistories.js +188 -2
- package/dist/service/aiDatasets.d.ts +57 -0
- package/dist/service/aiDatasets.js +253 -0
- package/dist/service/aiService.d.ts +50 -1
- package/dist/service/aiService.js +426 -77
- package/dist/service/askFiles.d.ts +49 -0
- package/dist/service/askFiles.js +162 -0
- package/dist/service/asks.d.ts +76 -0
- package/dist/service/asks.js +284 -0
- package/dist/service/chatTurn.d.ts +128 -0
- package/dist/service/chatTurn.js +1674 -0
- package/dist/service/fileStorage.d.ts +4 -0
- package/dist/service/fileStorage.js +7 -2
- package/dist/service/fillActionIds.d.ts +6 -0
- package/dist/service/fillActionIds.js +79 -0
- package/dist/service/jsonFenceModel.d.ts +7 -0
- package/dist/service/jsonFenceModel.js +45 -0
- package/dist/service/prompts.d.ts +52 -0
- package/dist/service/prompts.js +96 -1
- package/dist/service/sanitizeHtml.d.ts +11 -0
- package/dist/service/sanitizeHtml.js +108 -0
- package/dist/types/harness.d.ts +952 -0
- package/dist/types/harness.js +133 -0
- package/dist/types/index.d.ts +192 -14
- package/dist/types/index.js +2 -0
- package/dist/types/observability.d.ts +288 -0
- package/dist/types/observability.js +2 -0
- package/package.json +28 -5
- package/src/aiApp.test.ts +207 -1
- package/src/aiApp.ts +19 -6
- package/src/harness/adminScreens.test.ts +34 -0
- package/src/harness/adminScreens.ts +11 -0
- package/src/harness/agentLoop.test.ts +1034 -0
- package/src/harness/agentLoop.ts +1082 -0
- package/src/harness/agentRecovery.test.ts +380 -0
- package/src/harness/agentTaskNames.ts +4 -0
- package/src/harness/approvalPolicy.ts +28 -0
- package/src/harness/approvals.test.ts +1094 -0
- package/src/harness/approvals.ts +644 -0
- package/src/harness/commit.ts +1049 -0
- package/src/harness/concurrency.test.ts +155 -0
- package/src/harness/conversation.ts +503 -0
- package/src/harness/defineAgent.test.ts +92 -0
- package/src/harness/defineAgent.ts +82 -0
- package/src/harness/defineTask.test.ts +59 -0
- package/src/harness/defineTask.ts +76 -0
- package/src/harness/defineTool.ts +45 -0
- package/src/harness/definitionError.ts +13 -0
- package/src/harness/errors.test.ts +90 -0
- package/src/harness/errors.ts +125 -0
- package/src/harness/eventHub.test.ts +124 -0
- package/src/harness/eventHub.ts +159 -0
- package/src/harness/events.test.ts +769 -0
- package/src/harness/events.ts +384 -0
- package/src/harness/executionEnv.ts +34 -0
- package/src/harness/extensions.test.ts +1218 -0
- package/src/harness/extensions.ts +382 -0
- package/src/harness/harness.test.ts +693 -0
- package/src/harness/harness.ts +778 -0
- package/src/harness/harnessApp.ts +76 -0
- package/src/harness/internalRuntime.ts +44 -0
- package/src/harness/leases.ts +132 -0
- package/src/harness/memo.ts +107 -0
- package/src/harness/modelCall.test.ts +134 -0
- package/src/harness/modelCall.ts +200 -0
- package/src/harness/models/harnessApproval.ts +109 -0
- package/src/harness/models/harnessConversation.ts +142 -0
- package/src/harness/models/harnessEvent.ts +92 -0
- package/src/harness/models/harnessInboxEvent.ts +73 -0
- package/src/harness/models/harnessMemo.ts +43 -0
- package/src/harness/models/harnessMessage.ts +85 -0
- package/src/harness/models/harnessModels.test.ts +60 -0
- package/src/harness/models/harnessOwner.ts +40 -0
- package/src/harness/models/harnessTask.ts +206 -0
- package/src/harness/ownership.test.ts +1087 -0
- package/src/harness/ownership.ts +618 -0
- package/src/harness/recovery.test.ts +907 -0
- package/src/harness/registry.ts +124 -0
- package/src/harness/retries.test.ts +292 -0
- package/src/harness/retryBackoff.test.ts +100 -0
- package/src/harness/retryBackoff.ts +77 -0
- package/src/harness/routes/approvals.ts +123 -0
- package/src/harness/routes/conversations.test.ts +518 -0
- package/src/harness/routes/conversations.ts +102 -0
- package/src/harness/routes/events.ts +280 -0
- package/src/harness/routes/tasks.test.ts +198 -0
- package/src/harness/routes/tasks.ts +146 -0
- package/src/harness/runners/inProcessRunner.test.ts +530 -0
- package/src/harness/runners/inProcessRunner.ts +260 -0
- package/src/harness/runners/jobsRunner.test.ts +709 -0
- package/src/harness/runners/jobsRunner.ts +252 -0
- package/src/harness/runtime.ts +802 -0
- package/src/harness/subagent.test.ts +696 -0
- package/src/harness/subagent.ts +192 -0
- package/src/harness/suspend.ts +13 -0
- package/src/harness/transaction.ts +17 -0
- package/src/harness/versioning.test.ts +288 -0
- package/src/harness/waits.test.ts +693 -0
- package/src/harness/waits.ts +356 -0
- package/src/index.test.ts +13 -0
- package/src/index.ts +70 -0
- package/src/isolated/adminScreensConfig.isolated.ts +143 -0
- package/src/models/aiDataset.test.ts +34 -0
- package/src/models/aiDataset.ts +78 -0
- package/src/models/aiRequest.ts +2 -1
- package/src/models/gptHistory.test.ts +156 -0
- package/src/models/gptHistory.ts +89 -1
- package/src/observability/adminScreens.test.ts +71 -0
- package/src/observability/adminScreens.ts +42 -0
- package/src/observability/compileTemplate.test.ts +14 -0
- package/src/observability/compileTemplate.ts +10 -0
- package/src/observability/datasetImport.test.ts +95 -0
- package/src/observability/datasetImport.ts +220 -0
- package/src/observability/evaluate.test.ts +549 -0
- package/src/observability/evaluate.ts +254 -0
- package/src/observability/evaluatorTemplates.ts +124 -0
- package/src/observability/jsonPath.test.ts +52 -0
- package/src/observability/jsonPath.ts +60 -0
- package/src/observability/local/datasetStore.test.ts +230 -0
- package/src/observability/local/datasetStore.ts +452 -0
- package/src/observability/local/evaluatorStore.test.ts +138 -0
- package/src/observability/local/evaluatorStore.ts +224 -0
- package/src/observability/local/experimentRunner.test.ts +489 -0
- package/src/observability/local/experimentRunner.ts +548 -0
- package/src/observability/local/localPlugin.ts +88 -0
- package/src/observability/local/models/obsDataset.ts +38 -0
- package/src/observability/local/models/obsDatasetItem.ts +80 -0
- package/src/observability/local/models/obsEvaluator.ts +102 -0
- package/src/observability/local/models/obsExperiment.ts +91 -0
- package/src/observability/local/models/obsExperimentItem.ts +52 -0
- package/src/observability/local/models/obsPrompt.ts +43 -0
- package/src/observability/local/models/obsPromptLabel.ts +43 -0
- package/src/observability/local/models/obsPromptVersion.ts +107 -0
- package/src/observability/local/models/obsReviewItem.ts +79 -0
- package/src/observability/local/models/obsScore.ts +59 -0
- package/src/observability/local/models/obsSpan.ts +65 -0
- package/src/observability/local/models/obsTrace.ts +94 -0
- package/src/observability/local/obsModels.test.ts +119 -0
- package/src/observability/local/promptStore.test.ts +351 -0
- package/src/observability/local/promptStore.ts +665 -0
- package/src/observability/local/reviewStore.test.ts +164 -0
- package/src/observability/local/reviewStore.ts +264 -0
- package/src/observability/local/traceStore.test.ts +264 -0
- package/src/observability/local/traceStore.ts +440 -0
- package/src/observability/observabilityApp.test.ts +92 -0
- package/src/observability/observabilityApp.ts +185 -0
- package/src/observability/observabilityAppRegistry.test.ts +30 -0
- package/src/observability/observabilityAppRegistry.ts +35 -0
- package/src/observability/permissions.test.ts +96 -0
- package/src/observability/permissions.ts +78 -0
- package/src/observability/reviewPanels.test.ts +35 -0
- package/src/observability/reviewPanels.ts +64 -0
- package/src/observability/routes/datasets.test.ts +176 -0
- package/src/observability/routes/datasets.ts +252 -0
- package/src/observability/routes/evaluators.test.ts +119 -0
- package/src/observability/routes/evaluators.ts +207 -0
- package/src/observability/routes/experiments.test.ts +282 -0
- package/src/observability/routes/experiments.ts +152 -0
- package/src/observability/routes/observabilityRbac.test.ts +767 -0
- package/src/observability/routes/observabilityRouteAccess.ts +106 -0
- package/src/observability/routes/prompts.test.ts +320 -0
- package/src/observability/routes/prompts.ts +263 -0
- package/src/observability/routes/requestAiService.ts +36 -0
- package/src/observability/routes/review.test.ts +120 -0
- package/src/observability/routes/review.ts +125 -0
- package/src/observability/routes/status.test.ts +116 -0
- package/src/observability/routes/status.ts +47 -0
- package/src/observability/routes/testMultiStage.test.ts +214 -0
- package/src/observability/routes/testMultiStage.ts +96 -0
- package/src/observability/routes/traces.test.ts +167 -0
- package/src/observability/routes/traces.ts +172 -0
- package/src/observability/schemaValidation.ts +29 -0
- package/src/observability/sopThresholds.ts +20 -0
- package/src/observability/status.test.ts +38 -0
- package/src/observability/status.ts +56 -0
- package/src/observability/testMultiStageSchemas.ts +95 -0
- package/src/observability/testMultiStageWorkflow.test.ts +114 -0
- package/src/observability/testMultiStageWorkflow.ts +307 -0
- package/src/observability/types.ts +262 -0
- package/src/routes/files.test.ts +63 -9
- package/src/routes/files.ts +21 -7
- package/src/routes/gpt.test.ts +3279 -0
- package/src/routes/gpt.ts +91 -816
- package/src/routes/gptActions.test.ts +241 -0
- package/src/routes/gptActions.ts +255 -0
- package/src/routes/gptApprovals.test.ts +762 -0
- package/src/routes/gptDatasets.test.ts +86 -0
- package/src/routes/gptDatasets.ts +104 -0
- package/src/routes/gptFiles.test.ts +589 -0
- package/src/routes/gptHistories.test.ts +933 -0
- package/src/routes/gptHistories.ts +266 -5
- package/src/routes/routes.test.ts +222 -2
- package/src/service/aiDatasets.test.ts +123 -0
- package/src/service/aiDatasets.ts +316 -0
- package/src/service/aiService.test.ts +593 -0
- package/src/service/aiService.ts +568 -111
- package/src/service/askFiles.test.ts +96 -0
- package/src/service/askFiles.ts +222 -0
- package/src/service/asks.test.ts +946 -0
- package/src/service/asks.ts +423 -0
- package/src/service/chatTurn.ts +2287 -0
- package/src/service/fileStorage.test.ts +11 -0
- package/src/service/fileStorage.ts +10 -2
- package/src/service/fillActionIds.test.ts +65 -0
- package/src/service/fillActionIds.ts +98 -0
- package/src/service/jsonFenceModel.test.ts +47 -0
- package/src/service/jsonFenceModel.ts +53 -0
- package/src/service/prompts.test.ts +21 -0
- package/src/service/prompts.ts +147 -0
- package/src/service/sanitizeHtml.test.ts +61 -0
- package/src/service/sanitizeHtml.ts +109 -0
- package/src/tests/bunSetup.test.ts +7 -4
- package/src/tests/bunSetup.ts +7 -7
- package/src/tests/chatHarness.ts +478 -0
- package/src/tests/generateStream.ts +49 -0
- package/src/tests/harnessErrors.ts +22 -0
- package/src/tests/harnessStreaming.ts +227 -0
- package/src/tests/helpers.ts +9 -2
- package/src/types/harness.ts +1119 -0
- package/src/types/index.ts +209 -13
- package/src/types/observability.ts +344 -0
- package/src/types/sanitize-html.d.ts +25 -0
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import {afterEach, beforeAll, beforeEach, describe, expect, it} from "bun:test";
|
|
2
|
+
|
|
3
|
+
import {createLocalObservabilityPlugin} from "../observability/local/localPlugin";
|
|
4
|
+
import {registerObsSpan} from "../observability/local/models/obsSpan";
|
|
5
|
+
import {registerObsTrace} from "../observability/local/models/obsTrace";
|
|
6
|
+
import type {ObsSpanModel, ObsTraceModel} from "../types/observability";
|
|
7
|
+
import {type AnyHarnessTaskDefinition, defineTask, Harness, InProcessRunner} from "./harness";
|
|
8
|
+
import {registerHarnessOwner} from "./models/harnessOwner";
|
|
9
|
+
import {registerHarnessTask} from "./models/harnessTask";
|
|
10
|
+
|
|
11
|
+
const TaskModel = registerHarnessTask();
|
|
12
|
+
const OwnerModel = registerHarnessOwner();
|
|
13
|
+
let SpanModel: ObsSpanModel;
|
|
14
|
+
let TraceModel: ObsTraceModel;
|
|
15
|
+
|
|
16
|
+
const pause = (ms: number): Promise<void> => new Promise((done) => setTimeout(done, ms));
|
|
17
|
+
|
|
18
|
+
const openHarnesses: Harness[] = [];
|
|
19
|
+
const releases: Array<() => void> = [];
|
|
20
|
+
|
|
21
|
+
const openHarness = async ({
|
|
22
|
+
concurrency,
|
|
23
|
+
registry,
|
|
24
|
+
}: {
|
|
25
|
+
concurrency: number;
|
|
26
|
+
registry: ReadonlyArray<AnyHarnessTaskDefinition>;
|
|
27
|
+
}): Promise<Harness> => {
|
|
28
|
+
const harness = await Harness.open({
|
|
29
|
+
registry,
|
|
30
|
+
runner: new InProcessRunner({concurrency, pollInterval: {milliseconds: 20}}),
|
|
31
|
+
});
|
|
32
|
+
openHarnesses.push(harness);
|
|
33
|
+
await harness.start();
|
|
34
|
+
return harness;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
describe("InProcessRunner concurrency against Mongo", () => {
|
|
38
|
+
beforeAll(() => {
|
|
39
|
+
createLocalObservabilityPlugin();
|
|
40
|
+
SpanModel = registerObsSpan();
|
|
41
|
+
TraceModel = registerObsTrace();
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
beforeEach(async () => {
|
|
45
|
+
await Promise.all([
|
|
46
|
+
TaskModel.deleteMany({}),
|
|
47
|
+
OwnerModel.deleteMany({}),
|
|
48
|
+
SpanModel.deleteMany({}),
|
|
49
|
+
TraceModel.deleteMany({}),
|
|
50
|
+
]);
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
afterEach(async () => {
|
|
54
|
+
for (const release of releases.splice(0)) {
|
|
55
|
+
release();
|
|
56
|
+
}
|
|
57
|
+
await Promise.all(openHarnesses.splice(0).map((harness) => harness.stop()));
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it("completes a second task while the first is blocked on a gate", async () => {
|
|
61
|
+
let releaseGate: () => void = () => {};
|
|
62
|
+
const gated = new Promise<void>((done) => {
|
|
63
|
+
releaseGate = done;
|
|
64
|
+
});
|
|
65
|
+
releases.push(releaseGate);
|
|
66
|
+
const definition = defineTask<{blocked: boolean}, Record<string, never>, {status: string}>({
|
|
67
|
+
initial: () => ({phase: "work", state: {}}),
|
|
68
|
+
name: "test.concurrencyGate",
|
|
69
|
+
phases: {
|
|
70
|
+
work: {
|
|
71
|
+
run: async (task, rt) => {
|
|
72
|
+
if (task.input.blocked) {
|
|
73
|
+
await gated;
|
|
74
|
+
}
|
|
75
|
+
await rt.commit({terminal: {result: {status: "done"}, status: "completed"}});
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
version: 1,
|
|
80
|
+
}) as unknown as AnyHarnessTaskDefinition;
|
|
81
|
+
const harness = await openHarness({concurrency: 2, registry: [definition]});
|
|
82
|
+
|
|
83
|
+
const blocked = await harness.createTask(definition as never, {blocked: true});
|
|
84
|
+
const free = await harness.createTask(definition as never, {blocked: false});
|
|
85
|
+
const freeDone = await harness.waitForTask(free._id, {timeout: {seconds: 5}});
|
|
86
|
+
|
|
87
|
+
expect(freeDone.status).toBe("completed");
|
|
88
|
+
expect((await TaskModel.findExactlyOne({_id: blocked._id})).status).toBe("running");
|
|
89
|
+
releaseGate();
|
|
90
|
+
expect((await harness.waitForTask(blocked._id, {timeout: {seconds: 5}})).status).toBe(
|
|
91
|
+
"completed"
|
|
92
|
+
);
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
it("never runs one task twice at once and never exceeds the concurrency", async () => {
|
|
96
|
+
const activeByTask = new Map<string, number>();
|
|
97
|
+
let active = 0;
|
|
98
|
+
let peak = 0;
|
|
99
|
+
let peakPerTask = 0;
|
|
100
|
+
const enter = (taskId: string): void => {
|
|
101
|
+
active += 1;
|
|
102
|
+
peak = Math.max(peak, active);
|
|
103
|
+
const count = (activeByTask.get(taskId) ?? 0) + 1;
|
|
104
|
+
activeByTask.set(taskId, count);
|
|
105
|
+
peakPerTask = Math.max(peakPerTask, count);
|
|
106
|
+
};
|
|
107
|
+
const leave = (taskId: string): void => {
|
|
108
|
+
active -= 1;
|
|
109
|
+
activeByTask.set(taskId, (activeByTask.get(taskId) ?? 1) - 1);
|
|
110
|
+
};
|
|
111
|
+
// The first phase holds until three run at once (or 2 s pass), so the peak does not
|
|
112
|
+
// depend on how fast CI Mongo claims.
|
|
113
|
+
const fullHouse = async (): Promise<void> => {
|
|
114
|
+
for (let i = 0; i < 200 && active < 3; i++) {
|
|
115
|
+
await pause(10);
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
const definition = defineTask<{n: number}, Record<string, never>, {status: string}>({
|
|
119
|
+
initial: () => ({phase: "first", state: {}}),
|
|
120
|
+
name: "test.concurrencyPeak",
|
|
121
|
+
phases: {
|
|
122
|
+
first: {
|
|
123
|
+
run: async (task, rt) => {
|
|
124
|
+
enter(task.id);
|
|
125
|
+
await fullHouse();
|
|
126
|
+
await pause(30);
|
|
127
|
+
leave(task.id);
|
|
128
|
+
await rt.commit({phase: "second"});
|
|
129
|
+
},
|
|
130
|
+
},
|
|
131
|
+
second: {
|
|
132
|
+
run: async (task, rt) => {
|
|
133
|
+
enter(task.id);
|
|
134
|
+
await pause(30);
|
|
135
|
+
leave(task.id);
|
|
136
|
+
await rt.commit({terminal: {result: {status: "done"}, status: "completed"}});
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
version: 1,
|
|
141
|
+
}) as unknown as AnyHarnessTaskDefinition;
|
|
142
|
+
const harness = await openHarness({concurrency: 3, registry: [definition]});
|
|
143
|
+
|
|
144
|
+
const created = await Promise.all(
|
|
145
|
+
[1, 2, 3, 4, 5, 6, 7].map((n) => harness.createTask(definition as never, {n}))
|
|
146
|
+
);
|
|
147
|
+
const done = await Promise.all(
|
|
148
|
+
created.map((task) => harness.waitForTask(task._id, {timeout: {seconds: 10}}))
|
|
149
|
+
);
|
|
150
|
+
|
|
151
|
+
expect(done.map((task) => task.status)).toEqual(Array(7).fill("completed"));
|
|
152
|
+
expect(peakPerTask).toBe(1);
|
|
153
|
+
expect(peak).toBe(3);
|
|
154
|
+
});
|
|
155
|
+
});
|
|
@@ -0,0 +1,503 @@
|
|
|
1
|
+
import {APIError} from "@terreno/api";
|
|
2
|
+
import {DateTime} from "luxon";
|
|
3
|
+
import type mongoose from "mongoose";
|
|
4
|
+
|
|
5
|
+
import type {
|
|
6
|
+
HarnessAgentDefinition,
|
|
7
|
+
HarnessConversationDocument,
|
|
8
|
+
HarnessExtensionDefinition,
|
|
9
|
+
HarnessMessageDocument,
|
|
10
|
+
HarnessSendOptions,
|
|
11
|
+
HarnessSubmitOptions,
|
|
12
|
+
HarnessSubmitResult,
|
|
13
|
+
HarnessTaskDefinition,
|
|
14
|
+
HarnessTaskDocument,
|
|
15
|
+
HarnessWhenBusy,
|
|
16
|
+
} from "../types/harness";
|
|
17
|
+
import {
|
|
18
|
+
HARNESS_CONVERSATION_STATUSES,
|
|
19
|
+
HARNESS_EVENT_TYPES,
|
|
20
|
+
HARNESS_MESSAGE_ROLES,
|
|
21
|
+
HARNESS_SUBMIT_DISPOSITIONS,
|
|
22
|
+
HARNESS_TERMINAL_STATUSES,
|
|
23
|
+
HARNESS_WHEN_BUSY,
|
|
24
|
+
} from "../types/harness";
|
|
25
|
+
import type {AgentTurnInput} from "./agentLoop";
|
|
26
|
+
import {createTaskRecords, type HarnessModels} from "./commit";
|
|
27
|
+
import {HARNESS_ERRORS, harnessError} from "./errors";
|
|
28
|
+
import {appendEvents, insertMessages} from "./events";
|
|
29
|
+
import {resolveExtensions, resolveTools} from "./extensions";
|
|
30
|
+
import {inTransaction} from "./transaction";
|
|
31
|
+
|
|
32
|
+
/** A turn is already running and the submission did not say what to do (`submit`). */
|
|
33
|
+
export class HarnessConversationBusyError extends APIError {
|
|
34
|
+
readonly activeTurnTaskId?: string;
|
|
35
|
+
readonly conversationId: string;
|
|
36
|
+
|
|
37
|
+
constructor(conversationId: string, activeTurnTaskId?: string) {
|
|
38
|
+
super({
|
|
39
|
+
...HARNESS_ERRORS.conversationBusy,
|
|
40
|
+
detail: `Conversation ${conversationId} is busy with turn task ${activeTurnTaskId ?? "(unknown)"}; wait for it to finish, or send with whenBusy "queue" or "steer"`,
|
|
41
|
+
});
|
|
42
|
+
this.activeTurnTaskId = activeTurnTaskId;
|
|
43
|
+
this.conversationId = conversationId;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** A subagent conversation: only the `rt.runAgent` call that owns it runs its turns. */
|
|
48
|
+
export class HarnessConversationOwnedError extends APIError {
|
|
49
|
+
readonly conversationId: string;
|
|
50
|
+
|
|
51
|
+
constructor(conversationId: string, ownerTaskId: string) {
|
|
52
|
+
super({
|
|
53
|
+
...HARNESS_ERRORS.conversationOwned,
|
|
54
|
+
detail: `Conversation ${conversationId} belongs to task ${ownerTaskId}; only rt.runAgent runs its turns`,
|
|
55
|
+
});
|
|
56
|
+
this.conversationId = conversationId;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Claims a submission tries before giving up on a conversation other writers keep winning. */
|
|
61
|
+
const SUBMIT_CLAIM_ATTEMPTS = 3;
|
|
62
|
+
|
|
63
|
+
/** Thrown inside the submit transaction when another submit claimed the conversation first. */
|
|
64
|
+
class LostClaimSignal extends Error {
|
|
65
|
+
constructor() {
|
|
66
|
+
super("Another submit claimed the conversation first");
|
|
67
|
+
this.name = "LostClaimSignal";
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/** What a conversation handle needs from its harness. */
|
|
72
|
+
export interface ConversationContext {
|
|
73
|
+
models: HarnessModels;
|
|
74
|
+
turn: HarnessTaskDefinition;
|
|
75
|
+
/** Tell the runner a new turn is runnable. */
|
|
76
|
+
wake: () => void;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** Turn `requestId`s are namespaced so two conversations can reuse a caller's key. */
|
|
80
|
+
const turnRequestId = (conversationId: string, requestId: string): string =>
|
|
81
|
+
`harness-conversation:${conversationId}:${requestId}`;
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Snapshot an agent's serializable config onto a new conversation: its extension names
|
|
85
|
+
* (the agent's, unless `extensionNames` replaces them) and every tool name they resolve to.
|
|
86
|
+
*/
|
|
87
|
+
export const conversationAgentSnapshot = ({
|
|
88
|
+
agent,
|
|
89
|
+
extensionNames = agent.extensions,
|
|
90
|
+
extensions,
|
|
91
|
+
}: {
|
|
92
|
+
agent: HarnessAgentDefinition;
|
|
93
|
+
extensionNames?: ReadonlyArray<string>;
|
|
94
|
+
extensions: Map<string, HarnessExtensionDefinition>;
|
|
95
|
+
}): HarnessConversationDocument["agent"] => ({
|
|
96
|
+
extensions: [...extensionNames],
|
|
97
|
+
fallbackModels: (agent.fallbackModels ?? []).map(({modelId, provider}) => ({
|
|
98
|
+
modelId,
|
|
99
|
+
provider,
|
|
100
|
+
})),
|
|
101
|
+
instructions: agent.instructions,
|
|
102
|
+
maxSteps: agent.maxSteps,
|
|
103
|
+
model: {modelId: agent.model.modelId, provider: agent.model.provider},
|
|
104
|
+
name: agent.name,
|
|
105
|
+
tools: [...resolveTools(agent, resolveExtensions(extensions, extensionNames)).keys()],
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
const assertSubmission = ({content, requestId}: HarnessSubmitOptions): void => {
|
|
109
|
+
if (typeof content !== "string" || !content.trim()) {
|
|
110
|
+
throw harnessError({detail: "submit requires non-empty content", kind: "invalidRequest"});
|
|
111
|
+
}
|
|
112
|
+
if (typeof requestId !== "string" || !requestId.trim()) {
|
|
113
|
+
throw harnessError({detail: "submit requires a requestId", kind: "invalidRequest"});
|
|
114
|
+
}
|
|
115
|
+
};
|
|
116
|
+
|
|
117
|
+
/**
|
|
118
|
+
* Start a turn for one user message: create the turn task, claim the idle conversation,
|
|
119
|
+
* and insert the message, in one transaction. A direct start is fenced on an empty queue
|
|
120
|
+
* (queued submissions run first); a queued start on its entry being first in line, which
|
|
121
|
+
* it removes. Throws `LostClaimSignal` when another writer changed the conversation first.
|
|
122
|
+
*/
|
|
123
|
+
const startTurnRecords = async ({
|
|
124
|
+
content,
|
|
125
|
+
context,
|
|
126
|
+
conversation,
|
|
127
|
+
isQueued,
|
|
128
|
+
requestId,
|
|
129
|
+
}: {
|
|
130
|
+
content: string;
|
|
131
|
+
context: ConversationContext;
|
|
132
|
+
conversation: HarnessConversationDocument;
|
|
133
|
+
isQueued: boolean;
|
|
134
|
+
requestId: string;
|
|
135
|
+
}): Promise<HarnessTaskDocument> => {
|
|
136
|
+
const {models, turn} = context;
|
|
137
|
+
const conversationId = conversation._id;
|
|
138
|
+
const input: AgentTurnInput = {conversationId: String(conversationId)};
|
|
139
|
+
return createTaskRecords({
|
|
140
|
+
definition: turn,
|
|
141
|
+
input,
|
|
142
|
+
models,
|
|
143
|
+
options: {
|
|
144
|
+
requestId: turnRequestId(String(conversationId), requestId),
|
|
145
|
+
userId: conversation.userId,
|
|
146
|
+
},
|
|
147
|
+
ownership: {id: conversationId, kind: "conversation"},
|
|
148
|
+
writes: async ({session, task}) => {
|
|
149
|
+
const claimed = await models.conversation.findOneAndUpdate(
|
|
150
|
+
{
|
|
151
|
+
_id: conversationId,
|
|
152
|
+
status: HARNESS_CONVERSATION_STATUSES.idle,
|
|
153
|
+
...(isQueued ? {"queued.0.requestId": requestId} : {"queued.0": {$exists: false}}),
|
|
154
|
+
},
|
|
155
|
+
{
|
|
156
|
+
$inc: {seq: 1},
|
|
157
|
+
$set: {activeTurnTaskId: task._id, status: HARNESS_CONVERSATION_STATUSES.busy},
|
|
158
|
+
...(isQueued ? {$pull: {queued: {requestId}}} : {}),
|
|
159
|
+
},
|
|
160
|
+
{returnDocument: "after", session}
|
|
161
|
+
);
|
|
162
|
+
if (!claimed) {
|
|
163
|
+
throw new LostClaimSignal();
|
|
164
|
+
}
|
|
165
|
+
await insertMessages({
|
|
166
|
+
messages: [
|
|
167
|
+
{
|
|
168
|
+
conversationId,
|
|
169
|
+
parts: [{text: content, type: "text"}],
|
|
170
|
+
requestId,
|
|
171
|
+
role: HARNESS_MESSAGE_ROLES.user,
|
|
172
|
+
seq: claimed.seq,
|
|
173
|
+
turnTaskId: task._id,
|
|
174
|
+
},
|
|
175
|
+
],
|
|
176
|
+
models,
|
|
177
|
+
session,
|
|
178
|
+
});
|
|
179
|
+
},
|
|
180
|
+
});
|
|
181
|
+
};
|
|
182
|
+
|
|
183
|
+
/**
|
|
184
|
+
* Start the oldest queued submission as a new turn when the conversation is idle. Called
|
|
185
|
+
* whenever a turn ends and after every `send` that queues. Returns the started turn, or
|
|
186
|
+
* null when the conversation is busy or has nothing queued.
|
|
187
|
+
*/
|
|
188
|
+
export const startNextQueuedTurn = async ({
|
|
189
|
+
context,
|
|
190
|
+
conversationId,
|
|
191
|
+
}: {
|
|
192
|
+
context: ConversationContext;
|
|
193
|
+
conversationId: mongoose.Types.ObjectId | string;
|
|
194
|
+
}): Promise<HarnessTaskDocument | null> => {
|
|
195
|
+
const {models, wake} = context;
|
|
196
|
+
for (let attempt = 1; attempt <= SUBMIT_CLAIM_ATTEMPTS; attempt++) {
|
|
197
|
+
const conversation = await models.conversation.findOneOrNone({_id: conversationId});
|
|
198
|
+
const entry = conversation?.queued[0];
|
|
199
|
+
if (!conversation || conversation.status !== HARNESS_CONVERSATION_STATUSES.idle || !entry) {
|
|
200
|
+
return null;
|
|
201
|
+
}
|
|
202
|
+
const requestId = entry.requestId ?? "";
|
|
203
|
+
// An entry whose message already exists was a duplicate append; drop it.
|
|
204
|
+
const delivered = requestId
|
|
205
|
+
? await models.message.findOneOrNone({conversationId: conversation._id, requestId})
|
|
206
|
+
: null;
|
|
207
|
+
if (!requestId || delivered) {
|
|
208
|
+
await models.conversation.updateOne(
|
|
209
|
+
{_id: conversation._id, "queued.0.requestId": entry.requestId ?? null},
|
|
210
|
+
{$pop: {queued: -1}}
|
|
211
|
+
);
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
try {
|
|
215
|
+
const task = await startTurnRecords({
|
|
216
|
+
content: String(entry.content ?? ""),
|
|
217
|
+
context,
|
|
218
|
+
conversation,
|
|
219
|
+
isQueued: true,
|
|
220
|
+
requestId,
|
|
221
|
+
});
|
|
222
|
+
wake();
|
|
223
|
+
return task;
|
|
224
|
+
} catch (error: unknown) {
|
|
225
|
+
if (!(error instanceof LostClaimSignal)) {
|
|
226
|
+
throw error;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return null;
|
|
231
|
+
};
|
|
232
|
+
|
|
233
|
+
/**
|
|
234
|
+
* A conversation: its stored config and transcript, plus `submit` / `send` to start a
|
|
235
|
+
* turn. Get one from `harness.createConversation` or `harness.conversation(id)`.
|
|
236
|
+
*/
|
|
237
|
+
export class HarnessConversationHandle {
|
|
238
|
+
/** The conversation as loaded; call `harness.conversation(id)` again for a fresh copy. */
|
|
239
|
+
readonly document: HarnessConversationDocument;
|
|
240
|
+
private readonly context: ConversationContext;
|
|
241
|
+
|
|
242
|
+
constructor(context: ConversationContext, document: HarnessConversationDocument) {
|
|
243
|
+
this.context = context;
|
|
244
|
+
this.document = document;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
get id(): string {
|
|
248
|
+
return String(this.document._id);
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
/** Every message, in `seq` order. */
|
|
252
|
+
async messages(): Promise<HarnessMessageDocument[]> {
|
|
253
|
+
return this.context.models.message.find({conversationId: this.document._id}).sort({seq: 1});
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
/**
|
|
257
|
+
* Append a user message and start a turn task, in one transaction. A repeated
|
|
258
|
+
* `requestId` returns the turn it started and appends nothing. Throws
|
|
259
|
+
* `HarnessConversationBusyError` while another turn is running (or submissions are
|
|
260
|
+
* queued); use `send` to queue or steer instead.
|
|
261
|
+
*/
|
|
262
|
+
async submit(options: HarnessSubmitOptions): Promise<HarnessTaskDocument> {
|
|
263
|
+
assertSubmission(options);
|
|
264
|
+
const {content, requestId} = options;
|
|
265
|
+
const {models, wake} = this.context;
|
|
266
|
+
const conversationId = this.document._id;
|
|
267
|
+
const findRepeat = (): Promise<HarnessTaskDocument | null> =>
|
|
268
|
+
models.task.findOneOrNone({
|
|
269
|
+
deleted: {$in: [false, true]},
|
|
270
|
+
requestId: turnRequestId(this.id, requestId),
|
|
271
|
+
});
|
|
272
|
+
// A lost claim means another submit won the conversation. That turn may already be
|
|
273
|
+
// over (fast models), so look again and retry instead of reporting a stale "busy".
|
|
274
|
+
for (let attempt = 1; attempt <= SUBMIT_CLAIM_ATTEMPTS; attempt++) {
|
|
275
|
+
const existing = await findRepeat();
|
|
276
|
+
if (existing) {
|
|
277
|
+
return existing;
|
|
278
|
+
}
|
|
279
|
+
const conversation = await this.load();
|
|
280
|
+
if (!(await releaseFinishedTurn({conversation, models}))) {
|
|
281
|
+
throw new HarnessConversationBusyError(this.id, String(conversation.activeTurnTaskId));
|
|
282
|
+
}
|
|
283
|
+
if (conversation.queued.length > 0) {
|
|
284
|
+
await startNextQueuedTurn({context: this.context, conversationId});
|
|
285
|
+
continue;
|
|
286
|
+
}
|
|
287
|
+
try {
|
|
288
|
+
const task = await startTurnRecords({
|
|
289
|
+
content,
|
|
290
|
+
context: this.context,
|
|
291
|
+
conversation,
|
|
292
|
+
isQueued: false,
|
|
293
|
+
requestId,
|
|
294
|
+
});
|
|
295
|
+
wake();
|
|
296
|
+
return task;
|
|
297
|
+
} catch (error: unknown) {
|
|
298
|
+
if (!(error instanceof LostClaimSignal)) {
|
|
299
|
+
throw error;
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
const current = await models.conversation.findExactlyOne({_id: conversationId});
|
|
304
|
+
throw new HarnessConversationBusyError(
|
|
305
|
+
this.id,
|
|
306
|
+
current.activeTurnTaskId ? String(current.activeTurnTaskId) : undefined
|
|
307
|
+
);
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
/**
|
|
311
|
+
* Submit a user message whatever the conversation is doing. Idle with nothing queued:
|
|
312
|
+
* start a turn now (`started`). Otherwise, by `whenBusy`: `queue` runs it as its own turn
|
|
313
|
+
* after the active turn and every earlier queued submission (`queued`); `steer` adds it
|
|
314
|
+
* to the active turn, whose next model request includes it (`steered`). A steer that
|
|
315
|
+
* arrives after the turn's last model request runs as the next turn instead. Idempotent
|
|
316
|
+
* on `requestId`: a repeat reports where the first submission is now and adds nothing.
|
|
317
|
+
*/
|
|
318
|
+
async send(options: HarnessSendOptions): Promise<HarnessSubmitResult> {
|
|
319
|
+
assertSubmission(options);
|
|
320
|
+
const {content, requestId, whenBusy} = options;
|
|
321
|
+
if (!Object.values(HARNESS_WHEN_BUSY).includes(whenBusy)) {
|
|
322
|
+
throw harnessError({
|
|
323
|
+
detail: `send whenBusy must be one of ${Object.values(HARNESS_WHEN_BUSY).join(", ")}`,
|
|
324
|
+
kind: "invalidRequest",
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
const {models, wake} = this.context;
|
|
328
|
+
for (let attempt = 1; attempt <= SUBMIT_CLAIM_ATTEMPTS; attempt++) {
|
|
329
|
+
const repeat = await this.findSubmission(requestId);
|
|
330
|
+
if (repeat) {
|
|
331
|
+
return repeat;
|
|
332
|
+
}
|
|
333
|
+
const conversation = await this.load();
|
|
334
|
+
const isFree = await releaseFinishedTurn({conversation, models});
|
|
335
|
+
if (isFree && conversation.queued.length === 0) {
|
|
336
|
+
try {
|
|
337
|
+
const task = await startTurnRecords({
|
|
338
|
+
content,
|
|
339
|
+
context: this.context,
|
|
340
|
+
conversation,
|
|
341
|
+
isQueued: false,
|
|
342
|
+
requestId,
|
|
343
|
+
});
|
|
344
|
+
wake();
|
|
345
|
+
return this.result(HARNESS_SUBMIT_DISPOSITIONS.started, requestId, task._id);
|
|
346
|
+
} catch (error: unknown) {
|
|
347
|
+
if (!(error instanceof LostClaimSignal)) {
|
|
348
|
+
throw error;
|
|
349
|
+
}
|
|
350
|
+
continue;
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
await this.enqueue({
|
|
354
|
+
content,
|
|
355
|
+
requestId,
|
|
356
|
+
// Behind a backlog on an idle conversation there is no turn to steer.
|
|
357
|
+
whenBusy: isFree ? HARNESS_WHEN_BUSY.queue : whenBusy,
|
|
358
|
+
});
|
|
359
|
+
// The turn may have ended meanwhile; start the backlog if nothing runs it.
|
|
360
|
+
await startNextQueuedTurn({context: this.context, conversationId: conversation._id});
|
|
361
|
+
const recorded = await this.findSubmission(requestId);
|
|
362
|
+
if (recorded) {
|
|
363
|
+
return recorded;
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
const settled = await this.findSubmission(requestId);
|
|
367
|
+
if (!settled) {
|
|
368
|
+
throw harnessError({
|
|
369
|
+
detail: `Conversation ${this.id}: could not record submission ${requestId}`,
|
|
370
|
+
kind: "internal",
|
|
371
|
+
});
|
|
372
|
+
}
|
|
373
|
+
return settled;
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
/** Where the submission with `requestId` is now, or null when there is none. */
|
|
377
|
+
private async findSubmission(requestId: string): Promise<HarnessSubmitResult | null> {
|
|
378
|
+
const {models} = this.context;
|
|
379
|
+
const message = await models.message.findOneOrNone({
|
|
380
|
+
conversationId: this.document._id,
|
|
381
|
+
requestId,
|
|
382
|
+
});
|
|
383
|
+
const key = turnRequestId(this.id, requestId);
|
|
384
|
+
if (message?.turnTaskId) {
|
|
385
|
+
const turn = await models.task.findOneOrNone({
|
|
386
|
+
_id: message.turnTaskId,
|
|
387
|
+
deleted: {$in: [false, true]},
|
|
388
|
+
});
|
|
389
|
+
const disposition =
|
|
390
|
+
turn?.requestId === key
|
|
391
|
+
? HARNESS_SUBMIT_DISPOSITIONS.started
|
|
392
|
+
: HARNESS_SUBMIT_DISPOSITIONS.steered;
|
|
393
|
+
return this.result(disposition, requestId, message.turnTaskId);
|
|
394
|
+
}
|
|
395
|
+
const conversation = await this.load();
|
|
396
|
+
const entry = conversation.queued.find((queued) => queued.requestId === requestId);
|
|
397
|
+
if (entry) {
|
|
398
|
+
const isSteering =
|
|
399
|
+
entry.whenBusy === HARNESS_WHEN_BUSY.steer &&
|
|
400
|
+
conversation.status === HARNESS_CONVERSATION_STATUSES.busy;
|
|
401
|
+
return isSteering
|
|
402
|
+
? this.result(HARNESS_SUBMIT_DISPOSITIONS.steered, requestId, conversation.activeTurnTaskId)
|
|
403
|
+
: this.result(HARNESS_SUBMIT_DISPOSITIONS.queued, requestId);
|
|
404
|
+
}
|
|
405
|
+
// A turn started by `submit` before messages carried their requestId.
|
|
406
|
+
const turn = await models.task.findOneOrNone({deleted: {$in: [false, true]}, requestId: key});
|
|
407
|
+
return turn ? this.result(HARNESS_SUBMIT_DISPOSITIONS.started, requestId, turn._id) : null;
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
/** Add a submission to the queue and announce it, unless its requestId is already there. */
|
|
411
|
+
private async enqueue({
|
|
412
|
+
content,
|
|
413
|
+
requestId,
|
|
414
|
+
whenBusy,
|
|
415
|
+
}: {
|
|
416
|
+
content: string;
|
|
417
|
+
requestId: string;
|
|
418
|
+
whenBusy: HarnessWhenBusy;
|
|
419
|
+
}): Promise<void> {
|
|
420
|
+
const {models} = this.context;
|
|
421
|
+
const conversationId = this.document._id;
|
|
422
|
+
await inTransaction(async (session) => {
|
|
423
|
+
if ((await models.message.countDocuments({conversationId, requestId}, {session})) > 0) {
|
|
424
|
+
return;
|
|
425
|
+
}
|
|
426
|
+
const appended = await models.conversation.updateOne(
|
|
427
|
+
{_id: conversationId, "queued.requestId": {$ne: requestId}},
|
|
428
|
+
{
|
|
429
|
+
$push: {
|
|
430
|
+
queued: {content, requestId, submittedAt: DateTime.now().toJSDate(), whenBusy},
|
|
431
|
+
},
|
|
432
|
+
},
|
|
433
|
+
{session}
|
|
434
|
+
);
|
|
435
|
+
if (appended.modifiedCount === 0) {
|
|
436
|
+
return;
|
|
437
|
+
}
|
|
438
|
+
await appendEvents({
|
|
439
|
+
events: [
|
|
440
|
+
{payload: {content, requestId, whenBusy}, type: HARNESS_EVENT_TYPES.messageQueued},
|
|
441
|
+
],
|
|
442
|
+
models,
|
|
443
|
+
session,
|
|
444
|
+
streamId: conversationId,
|
|
445
|
+
});
|
|
446
|
+
});
|
|
447
|
+
}
|
|
448
|
+
|
|
449
|
+
private async load(): Promise<HarnessConversationDocument> {
|
|
450
|
+
const conversation = await this.context.models.conversation.findExactlyOne({
|
|
451
|
+
_id: this.document._id,
|
|
452
|
+
});
|
|
453
|
+
if (conversation.ownership?.kind === "task") {
|
|
454
|
+
throw new HarnessConversationOwnedError(this.id, String(conversation.ownership.id));
|
|
455
|
+
}
|
|
456
|
+
return conversation;
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
private result(
|
|
460
|
+
disposition: HarnessSubmitResult["disposition"],
|
|
461
|
+
requestId: string,
|
|
462
|
+
turnTaskId?: mongoose.Types.ObjectId | string
|
|
463
|
+
): HarnessSubmitResult {
|
|
464
|
+
return {
|
|
465
|
+
conversationId: this.id,
|
|
466
|
+
disposition,
|
|
467
|
+
requestId,
|
|
468
|
+
...(turnTaskId ? {turnTaskId: String(turnTaskId)} : {}),
|
|
469
|
+
};
|
|
470
|
+
}
|
|
471
|
+
}
|
|
472
|
+
|
|
473
|
+
/**
|
|
474
|
+
* Whether the conversation can take a new turn. A `busy` conversation whose active turn
|
|
475
|
+
* is already terminal (or gone) is set back to `idle`: the runner releases conversations
|
|
476
|
+
* as turns finish, and this covers a release lost to a crash between the turn's commit
|
|
477
|
+
* and that write.
|
|
478
|
+
*/
|
|
479
|
+
const releaseFinishedTurn = async ({
|
|
480
|
+
conversation,
|
|
481
|
+
models,
|
|
482
|
+
}: {
|
|
483
|
+
conversation: HarnessConversationDocument;
|
|
484
|
+
models: HarnessModels;
|
|
485
|
+
}): Promise<boolean> => {
|
|
486
|
+
if (conversation.status !== HARNESS_CONVERSATION_STATUSES.busy) {
|
|
487
|
+
return true;
|
|
488
|
+
}
|
|
489
|
+
const activeId = conversation.activeTurnTaskId as mongoose.Types.ObjectId | undefined;
|
|
490
|
+
const active = activeId ? await models.task.findOneOrNone({_id: activeId}) : null;
|
|
491
|
+
if (active && !HARNESS_TERMINAL_STATUSES.has(active.status)) {
|
|
492
|
+
return false;
|
|
493
|
+
}
|
|
494
|
+
await models.conversation.updateOne(
|
|
495
|
+
{
|
|
496
|
+
_id: conversation._id,
|
|
497
|
+
activeTurnTaskId: activeId ?? null,
|
|
498
|
+
status: HARNESS_CONVERSATION_STATUSES.busy,
|
|
499
|
+
},
|
|
500
|
+
{$set: {status: HARNESS_CONVERSATION_STATUSES.idle}, $unset: {activeTurnTaskId: 1}}
|
|
501
|
+
);
|
|
502
|
+
return true;
|
|
503
|
+
};
|