@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,123 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type ActionContext,
|
|
3
|
+
type ModelRouterOptions,
|
|
4
|
+
modelRouter,
|
|
5
|
+
type PermissionMethod,
|
|
6
|
+
Permissions,
|
|
7
|
+
z,
|
|
8
|
+
} from "@terreno/api";
|
|
9
|
+
import type express from "express";
|
|
10
|
+
|
|
11
|
+
import type {HarnessApprovalDocument} from "../../types/harness";
|
|
12
|
+
import {HARNESS_APPROVAL_STATUSES} from "../../types/harness";
|
|
13
|
+
import {harnessError} from "../errors";
|
|
14
|
+
import type {Harness} from "../harness";
|
|
15
|
+
import {registerHarnessApproval} from "../models/harnessApproval";
|
|
16
|
+
|
|
17
|
+
const approveBody = z
|
|
18
|
+
.object({reason: z.string().trim().min(1).optional()})
|
|
19
|
+
.strict()
|
|
20
|
+
.describe("Optional reason recorded with the approval");
|
|
21
|
+
|
|
22
|
+
const rejectBody = z
|
|
23
|
+
.object({reason: z.string().trim().min(1)})
|
|
24
|
+
.strict()
|
|
25
|
+
.describe("Why the approval is rejected; required");
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* Mount `/harness/approvals` on `router`: list and read the approvals the caller may
|
|
29
|
+
* decide, and `approve` / `reject` instance actions. Approvers come from `harness`'s
|
|
30
|
+
* registry at request time.
|
|
31
|
+
*/
|
|
32
|
+
export const addHarnessApprovalRoutes = (
|
|
33
|
+
router: express.Application,
|
|
34
|
+
{basePath, harness, openApi}: {basePath: string; harness: Harness; openApi?: unknown}
|
|
35
|
+
): void => {
|
|
36
|
+
const model = registerHarnessApproval();
|
|
37
|
+
|
|
38
|
+
// Without a document (the pre-check) defer to the document check, like IsOwner.
|
|
39
|
+
const canApprove: PermissionMethod<HarnessApprovalDocument> = (method, user, approval) =>
|
|
40
|
+
approval ? harness.mayApprove({approval, method, user}) : true;
|
|
41
|
+
|
|
42
|
+
const decide =
|
|
43
|
+
(approved: boolean) =>
|
|
44
|
+
async ({
|
|
45
|
+
body,
|
|
46
|
+
doc,
|
|
47
|
+
user,
|
|
48
|
+
}: ActionContext<
|
|
49
|
+
HarnessApprovalDocument,
|
|
50
|
+
unknown,
|
|
51
|
+
unknown
|
|
52
|
+
>): Promise<HarnessApprovalDocument> => {
|
|
53
|
+
// HarnessApprovalConflictError is already a 409 APIError.
|
|
54
|
+
return harness.decideApproval(doc._id, {
|
|
55
|
+
approved,
|
|
56
|
+
// Validated by the action's zod body schema.
|
|
57
|
+
reason: (body as {reason?: string} | undefined)?.reason,
|
|
58
|
+
userId: user?.id,
|
|
59
|
+
});
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
router.use(
|
|
63
|
+
`${basePath}/approvals`,
|
|
64
|
+
modelRouter(model, {
|
|
65
|
+
...(openApi
|
|
66
|
+
? {openApi: openApi as ModelRouterOptions<HarnessApprovalDocument>["openApi"]}
|
|
67
|
+
: {}),
|
|
68
|
+
instanceActions: {
|
|
69
|
+
approve: {
|
|
70
|
+
body: approveBody,
|
|
71
|
+
description: "Approve a pending approval; wakes the task waiting on it.",
|
|
72
|
+
handler: decide(true),
|
|
73
|
+
method: "POST",
|
|
74
|
+
permissions: [Permissions.IsAuthenticated, canApprove as PermissionMethod<unknown>],
|
|
75
|
+
summary: "Approve a harness approval",
|
|
76
|
+
tag: "harness",
|
|
77
|
+
},
|
|
78
|
+
reject: {
|
|
79
|
+
body: rejectBody,
|
|
80
|
+
description: "Reject a pending approval with a reason; wakes the task waiting on it.",
|
|
81
|
+
handler: decide(false),
|
|
82
|
+
method: "POST",
|
|
83
|
+
permissions: [Permissions.IsAuthenticated, canApprove as PermissionMethod<unknown>],
|
|
84
|
+
summary: "Reject a harness approval",
|
|
85
|
+
tag: "harness",
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
permissions: {
|
|
89
|
+
create: [],
|
|
90
|
+
delete: [],
|
|
91
|
+
list: [Permissions.IsAuthenticated],
|
|
92
|
+
read: [Permissions.IsAuthenticated, canApprove],
|
|
93
|
+
update: [],
|
|
94
|
+
},
|
|
95
|
+
queryFields: ["rootTaskId", "taskId"],
|
|
96
|
+
// Approvers are code, so the inbox is filtered in memory; pagination runs after it.
|
|
97
|
+
queryFilter: async (user) => {
|
|
98
|
+
if (!user) {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
const approvable = await harness.approvableApprovals({user});
|
|
102
|
+
if (approvable.length === 0) {
|
|
103
|
+
return null;
|
|
104
|
+
}
|
|
105
|
+
return {
|
|
106
|
+
_id: {$in: approvable.map((approval) => approval._id)},
|
|
107
|
+
status: HARNESS_APPROVAL_STATUSES.pending,
|
|
108
|
+
};
|
|
109
|
+
},
|
|
110
|
+
sort: "created _id",
|
|
111
|
+
})
|
|
112
|
+
);
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
export const assertValidBasePath = (basePath: string): string => {
|
|
116
|
+
if (!basePath.startsWith("/") || basePath.endsWith("/")) {
|
|
117
|
+
throw harnessError({
|
|
118
|
+
detail: `HarnessApp basePath must start with "/" and not end with "/": "${basePath}"`,
|
|
119
|
+
kind: "configInvalid",
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
return basePath;
|
|
123
|
+
};
|
|
@@ -0,0 +1,518 @@
|
|
|
1
|
+
import {afterEach, beforeAll, beforeEach, describe, expect, it, setDefaultTimeout} from "bun:test";
|
|
2
|
+
import {TerrenoApp, z} from "@terreno/api";
|
|
3
|
+
import type {LanguageModel} from "ai";
|
|
4
|
+
import type express from "express";
|
|
5
|
+
import {DateTime} from "luxon";
|
|
6
|
+
import supertest from "supertest";
|
|
7
|
+
import type TestAgent from "supertest/lib/agent";
|
|
8
|
+
|
|
9
|
+
import {createLocalObservabilityPlugin} from "../../observability/local/localPlugin";
|
|
10
|
+
import {registerObsSpan} from "../../observability/local/models/obsSpan";
|
|
11
|
+
import {registerObsTrace} from "../../observability/local/models/obsTrace";
|
|
12
|
+
import {gatedStreamingModel} from "../../tests/harnessStreaming";
|
|
13
|
+
import {ensureTestUsers, UserModel} from "../../tests/helpers";
|
|
14
|
+
import type {ObsSpanModel, ObsTraceModel} from "../../types/observability";
|
|
15
|
+
import {defineAgent, defineTool, Harness, HarnessApp, InProcessRunner} from "../harness";
|
|
16
|
+
import {registerHarnessConversation} from "../models/harnessConversation";
|
|
17
|
+
import {registerHarnessEvent, registerHarnessEventStream} from "../models/harnessEvent";
|
|
18
|
+
import {registerHarnessMessage} from "../models/harnessMessage";
|
|
19
|
+
import {registerHarnessOwner} from "../models/harnessOwner";
|
|
20
|
+
import {registerHarnessTask} from "../models/harnessTask";
|
|
21
|
+
|
|
22
|
+
setDefaultTimeout(30_000);
|
|
23
|
+
|
|
24
|
+
const TaskModel = registerHarnessTask();
|
|
25
|
+
const OwnerModel = registerHarnessOwner();
|
|
26
|
+
const ConversationModel = registerHarnessConversation();
|
|
27
|
+
const MessageModel = registerHarnessMessage();
|
|
28
|
+
const EventModel = registerHarnessEvent();
|
|
29
|
+
const EventStreamModel = registerHarnessEventStream();
|
|
30
|
+
let SpanModel: ObsSpanModel;
|
|
31
|
+
let TraceModel: ObsTraceModel;
|
|
32
|
+
|
|
33
|
+
const OWNER = {admin: false, email: "owner@example.com", name: "Owner", password: "pw-owner"};
|
|
34
|
+
const OTHER = {admin: false, email: "other@example.com", name: "Other", password: "pw-other"};
|
|
35
|
+
const ADMIN = {admin: true, email: "admin@example.com", name: "Admin", password: "pw-admin"};
|
|
36
|
+
|
|
37
|
+
const pause = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
|
|
38
|
+
|
|
39
|
+
const waitUntil = async (predicate: () => Promise<boolean>, label: string): Promise<void> => {
|
|
40
|
+
for (let i = 0; i < 500; i++) {
|
|
41
|
+
if (await predicate()) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
await pause(10);
|
|
45
|
+
}
|
|
46
|
+
throw new Error(`waitUntil timed out: ${label}`);
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
/** A tool the test releases: the turn sits in its `tools` phase until then. */
|
|
50
|
+
const toolGate = () => {
|
|
51
|
+
let release: () => void = () => {};
|
|
52
|
+
const released = new Promise<void>((resolve) => {
|
|
53
|
+
release = resolve;
|
|
54
|
+
});
|
|
55
|
+
let started = false;
|
|
56
|
+
const tool = defineTool({
|
|
57
|
+
description: "Wait for the test",
|
|
58
|
+
execute: async () => {
|
|
59
|
+
started = true;
|
|
60
|
+
await released;
|
|
61
|
+
return {ok: true};
|
|
62
|
+
},
|
|
63
|
+
name: "hold",
|
|
64
|
+
parameters: z.object({}),
|
|
65
|
+
});
|
|
66
|
+
return {isStarted: () => started, release, tool};
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
const openHarnesses: Harness[] = [];
|
|
70
|
+
const openGates: Array<() => void> = [];
|
|
71
|
+
|
|
72
|
+
const setup = async () => {
|
|
73
|
+
const gated = gatedStreamingModel();
|
|
74
|
+
const gate = toolGate();
|
|
75
|
+
openGates.push(gate.release);
|
|
76
|
+
const agent = defineAgent({
|
|
77
|
+
instructions: "Answer briefly.",
|
|
78
|
+
model: {modelId: "gated-model", provider: "mock"},
|
|
79
|
+
modelRetry: {backoffMs: 1, maxBackoffMs: 2},
|
|
80
|
+
name: "test.chat",
|
|
81
|
+
tools: [gate.tool],
|
|
82
|
+
});
|
|
83
|
+
const harness = await Harness.open({
|
|
84
|
+
models: () => gated.model as unknown as LanguageModel,
|
|
85
|
+
registry: [agent],
|
|
86
|
+
runner: new InProcessRunner({pollInterval: {milliseconds: 20}}),
|
|
87
|
+
testHooks: {random: () => 0},
|
|
88
|
+
});
|
|
89
|
+
openHarnesses.push(harness);
|
|
90
|
+
await harness.start();
|
|
91
|
+
const app: express.Application = new TerrenoApp({skipListen: true, userModel: UserModel})
|
|
92
|
+
.register(new HarnessApp({harness}))
|
|
93
|
+
.build();
|
|
94
|
+
const login = async ({email, password}: {email: string; password: string}) => {
|
|
95
|
+
const agentClient = supertest.agent(app);
|
|
96
|
+
const res = await agentClient.post("/auth/login").send({email, password}).expect(200);
|
|
97
|
+
agentClient.set("authorization", `Bearer ${res.body.data.token}`);
|
|
98
|
+
return agentClient as unknown as TestAgent;
|
|
99
|
+
};
|
|
100
|
+
const ownerId = String((await UserModel.find({email: OWNER.email}).lean())[0]?._id);
|
|
101
|
+
const conversation = await harness.createConversation({agent, userId: ownerId});
|
|
102
|
+
return {agent, app, conversation, gate, gated, harness, login, ownerId};
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
const transcript = async (conversationId: string) =>
|
|
106
|
+
(await MessageModel.find({conversationId}).sort({seq: 1}).lean()).map((message) => {
|
|
107
|
+
const part = message.parts[0] as {text?: string; toolName?: string; type: string};
|
|
108
|
+
return `${message.seq} ${message.role} ${part.text ?? part.toolName ?? part.type}`;
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
const conversationStatus = async (id: string) =>
|
|
112
|
+
(await ConversationModel.findExactlyOne({_id: id})).status;
|
|
113
|
+
|
|
114
|
+
describe("Harness conversation routes", () => {
|
|
115
|
+
beforeAll(async () => {
|
|
116
|
+
createLocalObservabilityPlugin();
|
|
117
|
+
SpanModel = registerObsSpan();
|
|
118
|
+
TraceModel = registerObsTrace();
|
|
119
|
+
await ensureTestUsers([OWNER, OTHER, ADMIN]);
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
beforeEach(async () => {
|
|
123
|
+
await Promise.all(
|
|
124
|
+
[
|
|
125
|
+
TaskModel,
|
|
126
|
+
OwnerModel,
|
|
127
|
+
ConversationModel,
|
|
128
|
+
MessageModel,
|
|
129
|
+
EventModel,
|
|
130
|
+
EventStreamModel,
|
|
131
|
+
SpanModel,
|
|
132
|
+
TraceModel,
|
|
133
|
+
].map((model) => (model as {deleteMany: (filter: object) => Promise<unknown>}).deleteMany({}))
|
|
134
|
+
);
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
afterEach(async () => {
|
|
138
|
+
// A failed test must not leave a tool hanging while the harness stops.
|
|
139
|
+
for (const release of openGates.splice(0)) {
|
|
140
|
+
release();
|
|
141
|
+
}
|
|
142
|
+
await Promise.all(openHarnesses.splice(0).map((harness) => harness.stop()));
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
it("reads for the owner or an admin, and lists only your own conversations", async () => {
|
|
146
|
+
const {agent, app, conversation, harness, login} = await setup();
|
|
147
|
+
const adminId = String((await UserModel.find({email: ADMIN.email}).lean())[0]?._id);
|
|
148
|
+
const adminOwn = await harness.createConversation({agent, userId: adminId});
|
|
149
|
+
const owner = await login(OWNER);
|
|
150
|
+
const admin = await login(ADMIN);
|
|
151
|
+
const other = await login(OTHER);
|
|
152
|
+
|
|
153
|
+
const read = await owner.get(`/harness/conversations/${conversation.id}`).expect(200);
|
|
154
|
+
expect(read.body.data.agent.name).toBe("test.chat");
|
|
155
|
+
await admin.get(`/harness/conversations/${conversation.id}`).expect(200);
|
|
156
|
+
await other.get(`/harness/conversations/${conversation.id}`).expect(403);
|
|
157
|
+
await supertest(app).get(`/harness/conversations/${conversation.id}`).expect(401);
|
|
158
|
+
|
|
159
|
+
const ownList = await owner.get("/harness/conversations").expect(200);
|
|
160
|
+
expect(ownList.body.data.map((row: {_id: string}) => row._id)).toEqual([conversation.id]);
|
|
161
|
+
const adminList = await admin.get("/harness/conversations").expect(200);
|
|
162
|
+
expect(adminList.body.data.map((row: {_id: string}) => row._id)).toEqual([adminOwn.id]);
|
|
163
|
+
expect((await other.get("/harness/conversations").expect(200)).body.data).toEqual([]);
|
|
164
|
+
await owner.post("/harness/conversations").send({}).expect(405);
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
it("submit refuses a subagent conversation with 409", async () => {
|
|
168
|
+
const {conversation, login} = await setup();
|
|
169
|
+
await ConversationModel.updateOne(
|
|
170
|
+
{_id: conversation.id},
|
|
171
|
+
{$set: {ownership: {id: conversation.document._id, kind: "task"}}}
|
|
172
|
+
);
|
|
173
|
+
const refused = await (await login(OWNER))
|
|
174
|
+
.post(`/harness/conversations/${conversation.id}/submit`)
|
|
175
|
+
.send({content: "Hi", requestId: "r1"})
|
|
176
|
+
.expect(409);
|
|
177
|
+
expect(refused.body.title).toBe("Conversation is run by its owning task");
|
|
178
|
+
expect(await MessageModel.countDocuments({conversationId: conversation.id})).toBe(0);
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
it("submit starts a turn, is idempotent on requestId, and is the owner's alone", async () => {
|
|
182
|
+
const {app, conversation, gated, login} = await setup();
|
|
183
|
+
const owner = await login(OWNER);
|
|
184
|
+
const path = `/harness/conversations/${conversation.id}/submit`;
|
|
185
|
+
|
|
186
|
+
await supertest(app).post(path).send({content: "Hi", requestId: "r1"}).expect(401);
|
|
187
|
+
await (await login(OTHER)).post(path).send({content: "Hi", requestId: "r1"}).expect(403);
|
|
188
|
+
// Messages are sent as the conversation's user, so an admin cannot submit either.
|
|
189
|
+
await (await login(ADMIN)).post(path).send({content: "Hi", requestId: "r1"}).expect(403);
|
|
190
|
+
await owner.post(path).send({content: "", requestId: "r1"}).expect(400);
|
|
191
|
+
await owner.post(path).send({content: "Hi", requestId: "r1", whenBusy: "later"}).expect(400);
|
|
192
|
+
await owner.post(path).send({content: "Hi"}).expect(400);
|
|
193
|
+
|
|
194
|
+
const started = await owner.post(path).send({content: "Hi", requestId: "r1"}).expect(200);
|
|
195
|
+
expect(started.body.data).toEqual({
|
|
196
|
+
conversationId: conversation.id,
|
|
197
|
+
disposition: "started",
|
|
198
|
+
requestId: "r1",
|
|
199
|
+
turnTaskId: started.body.data.turnTaskId,
|
|
200
|
+
});
|
|
201
|
+
// A retry racing the first request gets the same answer and adds nothing.
|
|
202
|
+
const raced = await Promise.all([
|
|
203
|
+
owner.post(path).send({content: "Hi", requestId: "r1"}),
|
|
204
|
+
owner.post(path).send({content: "Hi", requestId: "r1"}),
|
|
205
|
+
]);
|
|
206
|
+
expect(raced.map((res) => res.body.data)).toEqual([started.body.data, started.body.data]);
|
|
207
|
+
const repeat = await owner.post(path).send({content: "Hi again", requestId: "r1"}).expect(200);
|
|
208
|
+
expect(repeat.body.data).toEqual(started.body.data);
|
|
209
|
+
expect(await transcript(conversation.id)).toEqual(["1 user Hi"]);
|
|
210
|
+
expect(await TaskModel.countDocuments({name: "terreno.agent.turn"})).toBe(1);
|
|
211
|
+
|
|
212
|
+
const request = await gated.nextRequest();
|
|
213
|
+
request.text("Hello");
|
|
214
|
+
request.finish();
|
|
215
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "idle");
|
|
216
|
+
const afterTurn = await owner.post(path).send({content: "Hi", requestId: "r1"}).expect(200);
|
|
217
|
+
expect(afterTurn.body.data).toEqual(started.body.data);
|
|
218
|
+
expect(await transcript(conversation.id)).toEqual(["1 user Hi", "2 assistant Hello"]);
|
|
219
|
+
});
|
|
220
|
+
|
|
221
|
+
it("queue: runs each queued message as its own turn after the active one, in order", async () => {
|
|
222
|
+
const {conversation, gated, login} = await setup();
|
|
223
|
+
const owner = await login(OWNER);
|
|
224
|
+
const path = `/harness/conversations/${conversation.id}/submit`;
|
|
225
|
+
const first = await owner.post(path).send({content: "One", requestId: "r1"}).expect(200);
|
|
226
|
+
const firstRequest = await gated.nextRequest();
|
|
227
|
+
|
|
228
|
+
// whenBusy defaults to queue.
|
|
229
|
+
const queued = await owner.post(path).send({content: "Two", requestId: "r2"}).expect(200);
|
|
230
|
+
expect(queued.body.data).toEqual({
|
|
231
|
+
conversationId: conversation.id,
|
|
232
|
+
disposition: "queued",
|
|
233
|
+
requestId: "r2",
|
|
234
|
+
});
|
|
235
|
+
const third = await owner
|
|
236
|
+
.post(path)
|
|
237
|
+
.send({content: "Three", requestId: "r3", whenBusy: "queue"})
|
|
238
|
+
.expect(200);
|
|
239
|
+
expect(third.body.data.disposition).toBe("queued");
|
|
240
|
+
const repeats = await Promise.all([
|
|
241
|
+
owner.post(path).send({content: "Two", requestId: "r2"}),
|
|
242
|
+
owner.post(path).send({content: "Two", requestId: "r2", whenBusy: "queue"}),
|
|
243
|
+
]);
|
|
244
|
+
expect(repeats.map((res) => res.body.data)).toEqual([queued.body.data, queued.body.data]);
|
|
245
|
+
expect(
|
|
246
|
+
(await ConversationModel.findExactlyOne({_id: conversation.id})).queued.map(
|
|
247
|
+
(entry) => entry.requestId
|
|
248
|
+
)
|
|
249
|
+
).toEqual(["r2", "r3"]);
|
|
250
|
+
const announced = await EventModel.find({streamId: conversation.id, type: "message.queued"})
|
|
251
|
+
.sort({seq: 1})
|
|
252
|
+
.lean();
|
|
253
|
+
expect(announced.map((event) => event.payload)).toEqual([
|
|
254
|
+
{content: "Two", requestId: "r2", whenBusy: "queue"},
|
|
255
|
+
{content: "Three", requestId: "r3", whenBusy: "queue"},
|
|
256
|
+
]);
|
|
257
|
+
|
|
258
|
+
firstRequest.text("A1");
|
|
259
|
+
firstRequest.finish();
|
|
260
|
+
const secondRequest = await gated.nextRequest();
|
|
261
|
+
// The queued message is the newest user message of the next turn.
|
|
262
|
+
expect(secondRequest.prompt.at(-1)).toMatchObject({content: [{text: "Two"}], role: "user"});
|
|
263
|
+
const started = await owner.post(path).send({content: "Two", requestId: "r2"}).expect(200);
|
|
264
|
+
expect(started.body.data.disposition).toBe("started");
|
|
265
|
+
expect(started.body.data.turnTaskId).not.toBe(first.body.data.turnTaskId);
|
|
266
|
+
secondRequest.text("A2");
|
|
267
|
+
secondRequest.finish();
|
|
268
|
+
const thirdRequest = await gated.nextRequest();
|
|
269
|
+
thirdRequest.text("A3");
|
|
270
|
+
thirdRequest.finish();
|
|
271
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "drained");
|
|
272
|
+
|
|
273
|
+
expect(await transcript(conversation.id)).toEqual([
|
|
274
|
+
"1 user One",
|
|
275
|
+
"2 assistant A1",
|
|
276
|
+
"3 user Two",
|
|
277
|
+
"4 assistant A2",
|
|
278
|
+
"5 user Three",
|
|
279
|
+
"6 assistant A3",
|
|
280
|
+
]);
|
|
281
|
+
expect((await ConversationModel.findExactlyOne({_id: conversation.id})).queued).toHaveLength(0);
|
|
282
|
+
expect(await TaskModel.countDocuments({name: "terreno.agent.turn", status: "completed"})).toBe(
|
|
283
|
+
3
|
|
284
|
+
);
|
|
285
|
+
});
|
|
286
|
+
|
|
287
|
+
it("a queued message stranded by a crash after its turn ended runs once after restart", async () => {
|
|
288
|
+
const {agent, conversation, gated, harness} = await setup();
|
|
289
|
+
const first = await conversation.submit({content: "One", requestId: "r1"});
|
|
290
|
+
const firstRequest = await gated.nextRequest();
|
|
291
|
+
firstRequest.text("A1");
|
|
292
|
+
firstRequest.finish();
|
|
293
|
+
await harness.waitForTask(first._id, {timeout: {seconds: 10}});
|
|
294
|
+
await harness.stop();
|
|
295
|
+
// The process died after the turn's terminal commit (which set the conversation
|
|
296
|
+
// idle) and before it started the submission queued during that turn.
|
|
297
|
+
await ConversationModel.updateOne(
|
|
298
|
+
{_id: conversation.id},
|
|
299
|
+
{
|
|
300
|
+
$push: {
|
|
301
|
+
queued: {
|
|
302
|
+
content: "Two",
|
|
303
|
+
requestId: "r2",
|
|
304
|
+
submittedAt: DateTime.now().toJSDate(),
|
|
305
|
+
whenBusy: "queue",
|
|
306
|
+
},
|
|
307
|
+
},
|
|
308
|
+
}
|
|
309
|
+
);
|
|
310
|
+
expect(await conversationStatus(conversation.id)).toBe("idle");
|
|
311
|
+
|
|
312
|
+
const restarted = gatedStreamingModel();
|
|
313
|
+
const next = await Harness.open({
|
|
314
|
+
models: () => restarted.model as unknown as LanguageModel,
|
|
315
|
+
registry: [agent],
|
|
316
|
+
runner: new InProcessRunner({pollInterval: {milliseconds: 20}}),
|
|
317
|
+
});
|
|
318
|
+
openHarnesses.push(next);
|
|
319
|
+
await next.start();
|
|
320
|
+
const request = await restarted.nextRequest();
|
|
321
|
+
expect(request.prompt.at(-1)).toMatchObject({content: [{text: "Two"}], role: "user"});
|
|
322
|
+
request.text("A2");
|
|
323
|
+
request.finish();
|
|
324
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "idle");
|
|
325
|
+
// Another sweep interval passes without a second start.
|
|
326
|
+
await pause(1500);
|
|
327
|
+
expect(await transcript(conversation.id)).toEqual([
|
|
328
|
+
"1 user One",
|
|
329
|
+
"2 assistant A1",
|
|
330
|
+
"3 user Two",
|
|
331
|
+
"4 assistant A2",
|
|
332
|
+
]);
|
|
333
|
+
expect(await TaskModel.countDocuments({name: "terreno.agent.turn"})).toBe(2);
|
|
334
|
+
expect(restarted.received).toHaveLength(1);
|
|
335
|
+
expect((await ConversationModel.findExactlyOne({_id: conversation.id})).queued).toHaveLength(0);
|
|
336
|
+
});
|
|
337
|
+
|
|
338
|
+
it("a conversation left busy on a finished turn is freed, and its queue runs, after restart", async () => {
|
|
339
|
+
const {agent, conversation, harness, ownerId} = await setup();
|
|
340
|
+
await harness.stop();
|
|
341
|
+
const emptyQueue = await harness.createConversation({agent, userId: ownerId});
|
|
342
|
+
const stuck = [
|
|
343
|
+
await conversation.submit({content: "One", requestId: "r1"}),
|
|
344
|
+
await emptyQueue.submit({content: "Solo", requestId: "s1"}),
|
|
345
|
+
];
|
|
346
|
+
// Each turn ended, but its conversation was never freed (state from a write that was
|
|
347
|
+
// lost), and one of them has a submission waiting.
|
|
348
|
+
await TaskModel.updateMany(
|
|
349
|
+
{_id: {$in: stuck.map((turn) => turn._id)}},
|
|
350
|
+
{$set: {outcome: {error: "Stopped", status: "aborted"}, status: "aborted"}}
|
|
351
|
+
);
|
|
352
|
+
await ConversationModel.updateOne(
|
|
353
|
+
{_id: conversation.id},
|
|
354
|
+
{
|
|
355
|
+
$push: {
|
|
356
|
+
queued: {
|
|
357
|
+
content: "Two",
|
|
358
|
+
requestId: "r2",
|
|
359
|
+
submittedAt: DateTime.now().toJSDate(),
|
|
360
|
+
whenBusy: "queue",
|
|
361
|
+
},
|
|
362
|
+
},
|
|
363
|
+
}
|
|
364
|
+
);
|
|
365
|
+
expect(await conversationStatus(conversation.id)).toBe("busy");
|
|
366
|
+
expect(await conversationStatus(emptyQueue.id)).toBe("busy");
|
|
367
|
+
|
|
368
|
+
const restarted = gatedStreamingModel();
|
|
369
|
+
const next = await Harness.open({
|
|
370
|
+
models: () => restarted.model as unknown as LanguageModel,
|
|
371
|
+
registry: [agent],
|
|
372
|
+
runner: new InProcessRunner({pollInterval: {milliseconds: 20}}),
|
|
373
|
+
});
|
|
374
|
+
openHarnesses.push(next);
|
|
375
|
+
await next.start();
|
|
376
|
+
const request = await restarted.nextRequest();
|
|
377
|
+
expect(request.prompt.at(-1)).toMatchObject({content: [{text: "Two"}], role: "user"});
|
|
378
|
+
request.text("A2");
|
|
379
|
+
request.finish();
|
|
380
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "idle");
|
|
381
|
+
await waitUntil(async () => (await conversationStatus(emptyQueue.id)) === "idle", "freed");
|
|
382
|
+
expect(await transcript(conversation.id)).toEqual([
|
|
383
|
+
"1 user One",
|
|
384
|
+
"2 user Two",
|
|
385
|
+
"3 assistant A2",
|
|
386
|
+
]);
|
|
387
|
+
expect(restarted.received).toHaveLength(1);
|
|
388
|
+
});
|
|
389
|
+
|
|
390
|
+
it("an aborted turn frees its conversation in the abort commit and starts the queue", async () => {
|
|
391
|
+
const {conversation, gated, login} = await setup();
|
|
392
|
+
const owner = await login(OWNER);
|
|
393
|
+
const path = `/harness/conversations/${conversation.id}/submit`;
|
|
394
|
+
const first = await owner.post(path).send({content: "One", requestId: "r1"}).expect(200);
|
|
395
|
+
await gated.nextRequest();
|
|
396
|
+
await owner.post(path).send({content: "Two", requestId: "r2"}).expect(200);
|
|
397
|
+
await owner
|
|
398
|
+
.post(`/harness/tasks/${first.body.data.turnTaskId}/abort`)
|
|
399
|
+
.send({reason: "Changed my mind"})
|
|
400
|
+
.expect(200);
|
|
401
|
+
const second = await gated.nextRequest();
|
|
402
|
+
expect(second.prompt.at(-1)).toMatchObject({content: [{text: "Two"}], role: "user"});
|
|
403
|
+
second.text("A2");
|
|
404
|
+
second.finish();
|
|
405
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "idle");
|
|
406
|
+
expect(await transcript(conversation.id)).toEqual([
|
|
407
|
+
"1 user One",
|
|
408
|
+
"2 user Two",
|
|
409
|
+
"3 assistant A2",
|
|
410
|
+
]);
|
|
411
|
+
});
|
|
412
|
+
|
|
413
|
+
it("steer: the active turn's next model request includes the message", async () => {
|
|
414
|
+
const {conversation, gate, gated, login} = await setup();
|
|
415
|
+
const owner = await login(OWNER);
|
|
416
|
+
const path = `/harness/conversations/${conversation.id}/submit`;
|
|
417
|
+
const started = await owner.post(path).send({content: "Check it", requestId: "r1"}).expect(200);
|
|
418
|
+
const firstRequest = await gated.nextRequest();
|
|
419
|
+
firstRequest.finish({toolCalls: [{id: "call-1", name: "hold"}]});
|
|
420
|
+
await waitUntil(async () => gate.isStarted(), "tool running");
|
|
421
|
+
|
|
422
|
+
const steered = await owner
|
|
423
|
+
.post(path)
|
|
424
|
+
.send({content: "Also check the labs", requestId: "r2", whenBusy: "steer"})
|
|
425
|
+
.expect(200);
|
|
426
|
+
expect(steered.body.data).toEqual({
|
|
427
|
+
conversationId: conversation.id,
|
|
428
|
+
disposition: "steered",
|
|
429
|
+
requestId: "r2",
|
|
430
|
+
turnTaskId: started.body.data.turnTaskId,
|
|
431
|
+
});
|
|
432
|
+
gate.release();
|
|
433
|
+
const secondRequest = await gated.nextRequest();
|
|
434
|
+
// After the tool result, the steering message joins this request.
|
|
435
|
+
expect(secondRequest.prompt.slice(-2).map((message) => message.role)).toEqual(["tool", "user"]);
|
|
436
|
+
expect(secondRequest.prompt.at(-1)).toMatchObject({content: [{text: "Also check the labs"}]});
|
|
437
|
+
secondRequest.text("Done, labs too");
|
|
438
|
+
secondRequest.finish();
|
|
439
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "idle");
|
|
440
|
+
|
|
441
|
+
expect(await transcript(conversation.id)).toEqual([
|
|
442
|
+
"1 user Check it",
|
|
443
|
+
"2 assistant hold",
|
|
444
|
+
"3 tool hold",
|
|
445
|
+
"4 user Also check the labs",
|
|
446
|
+
"5 assistant Done, labs too",
|
|
447
|
+
]);
|
|
448
|
+
const toolEvents = await EventModel.find({
|
|
449
|
+
streamId: conversation.id,
|
|
450
|
+
type: {$in: ["tool.started", "tool.finished"]},
|
|
451
|
+
})
|
|
452
|
+
.sort({seq: 1})
|
|
453
|
+
.lean();
|
|
454
|
+
expect(toolEvents.map((event) => [event.type, event.payload])).toEqual([
|
|
455
|
+
[
|
|
456
|
+
"tool.started",
|
|
457
|
+
expect.objectContaining({
|
|
458
|
+
status: "pending",
|
|
459
|
+
toolCallId: "call-1",
|
|
460
|
+
toolName: "hold",
|
|
461
|
+
turnTaskId: started.body.data.turnTaskId,
|
|
462
|
+
}),
|
|
463
|
+
],
|
|
464
|
+
[
|
|
465
|
+
"tool.finished",
|
|
466
|
+
expect.objectContaining({
|
|
467
|
+
outcome: expect.objectContaining({status: "completed"}),
|
|
468
|
+
status: "completed",
|
|
469
|
+
toolCallId: "call-1",
|
|
470
|
+
turnTaskId: started.body.data.turnTaskId,
|
|
471
|
+
}),
|
|
472
|
+
],
|
|
473
|
+
]);
|
|
474
|
+
const steerMessage = await MessageModel.findExactlyOne({
|
|
475
|
+
conversationId: conversation.id,
|
|
476
|
+
requestId: "r2",
|
|
477
|
+
});
|
|
478
|
+
expect(String(steerMessage.turnTaskId)).toBe(started.body.data.turnTaskId);
|
|
479
|
+
expect(await TaskModel.countDocuments({name: "terreno.agent.turn"})).toBe(1);
|
|
480
|
+
const repeat = await owner
|
|
481
|
+
.post(path)
|
|
482
|
+
.send({content: "Also check the labs", requestId: "r2", whenBusy: "steer"})
|
|
483
|
+
.expect(200);
|
|
484
|
+
expect(repeat.body.data).toEqual(steered.body.data);
|
|
485
|
+
});
|
|
486
|
+
|
|
487
|
+
it("steer that arrives after the turn's last model request runs as the next turn", async () => {
|
|
488
|
+
const {conversation, gated, login} = await setup();
|
|
489
|
+
const owner = await login(OWNER);
|
|
490
|
+
const path = `/harness/conversations/${conversation.id}/submit`;
|
|
491
|
+
await owner.post(path).send({content: "Hi", requestId: "r1"}).expect(200);
|
|
492
|
+
const firstRequest = await gated.nextRequest();
|
|
493
|
+
const steered = await owner
|
|
494
|
+
.post(path)
|
|
495
|
+
.send({content: "Too late", requestId: "r2", whenBusy: "steer"})
|
|
496
|
+
.expect(200);
|
|
497
|
+
expect(steered.body.data.disposition).toBe("steered");
|
|
498
|
+
firstRequest.text("Hello");
|
|
499
|
+
firstRequest.finish();
|
|
500
|
+
|
|
501
|
+
const next = await gated.nextRequest();
|
|
502
|
+
expect(next.prompt.at(-1)).toMatchObject({content: [{text: "Too late"}], role: "user"});
|
|
503
|
+
next.text("Sure");
|
|
504
|
+
next.finish();
|
|
505
|
+
await waitUntil(async () => (await conversationStatus(conversation.id)) === "idle", "idle");
|
|
506
|
+
expect(await transcript(conversation.id)).toEqual([
|
|
507
|
+
"1 user Hi",
|
|
508
|
+
"2 assistant Hello",
|
|
509
|
+
"3 user Too late",
|
|
510
|
+
"4 assistant Sure",
|
|
511
|
+
]);
|
|
512
|
+
const repeat = await owner
|
|
513
|
+
.post(path)
|
|
514
|
+
.send({content: "Too late", requestId: "r2", whenBusy: "steer"})
|
|
515
|
+
.expect(200);
|
|
516
|
+
expect(repeat.body.data.disposition).toBe("started");
|
|
517
|
+
});
|
|
518
|
+
});
|