@stigmer/server 3.40.1 → 3.41.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/dist/authorization/authorizer.d.ts +16 -10
- package/dist/authorization/authorizer.d.ts.map +1 -1
- package/dist/authorization/authorizer.js +17 -9
- package/dist/authorization/authorizer.js.map +1 -1
- package/dist/authorization/derived-tuples.d.ts +7 -3
- package/dist/authorization/derived-tuples.d.ts.map +1 -1
- package/dist/authorization/derived-tuples.js +62 -6
- package/dist/authorization/derived-tuples.js.map +1 -1
- package/dist/authorization/evaluator.d.ts +11 -7
- package/dist/authorization/evaluator.d.ts.map +1 -1
- package/dist/authorization/evaluator.js +16 -10
- package/dist/authorization/evaluator.js.map +1 -1
- package/dist/authorization/list-read-scope.d.ts +4 -0
- package/dist/authorization/list-read-scope.d.ts.map +1 -1
- package/dist/authorization/list-read-scope.js +1 -0
- package/dist/authorization/list-read-scope.js.map +1 -1
- package/dist/authorization/model/data/authorization-model.json +830 -67
- package/dist/authorization/model/execution-viewer.d.ts.map +1 -1
- package/dist/authorization/model/execution-viewer.js +26 -24
- package/dist/authorization/model/execution-viewer.js.map +1 -1
- package/dist/authorization/model/index.d.ts +4 -1
- package/dist/authorization/model/index.d.ts.map +1 -1
- package/dist/authorization/model/index.js +4 -1
- package/dist/authorization/model/index.js.map +1 -1
- package/dist/authorization/model/rewrite.d.ts +5 -3
- package/dist/authorization/model/rewrite.d.ts.map +1 -1
- package/dist/authorization/organization-directory.d.ts +44 -0
- package/dist/authorization/organization-directory.d.ts.map +1 -1
- package/dist/authorization/organization-directory.js +1 -0
- package/dist/authorization/organization-directory.js.map +1 -1
- package/dist/authorization/person.d.ts +14 -1
- package/dist/authorization/person.d.ts.map +1 -1
- package/dist/authorization/person.js +16 -0
- package/dist/authorization/person.js.map +1 -1
- package/dist/authorization/policy-check.d.ts +52 -0
- package/dist/authorization/policy-check.d.ts.map +1 -0
- package/dist/authorization/policy-check.js +35 -0
- package/dist/authorization/policy-check.js.map +1 -0
- package/dist/authorization/posture.d.ts +30 -4
- package/dist/authorization/posture.d.ts.map +1 -1
- package/dist/authorization/posture.js +58 -0
- package/dist/authorization/posture.js.map +1 -1
- package/dist/authorization/resource-creators.d.ts +4 -0
- package/dist/authorization/resource-creators.d.ts.map +1 -0
- package/dist/authorization/resource-creators.js +44 -0
- package/dist/authorization/resource-creators.js.map +1 -0
- package/dist/authorization/trusted-local-authorizer.d.ts +9 -0
- package/dist/authorization/trusted-local-authorizer.d.ts.map +1 -0
- package/dist/authorization/trusted-local-authorizer.js +70 -0
- package/dist/authorization/trusted-local-authorizer.js.map +1 -0
- package/dist/authorization/tuples.d.ts +12 -0
- package/dist/authorization/tuples.d.ts.map +1 -1
- package/dist/authorization/tuples.js +3 -0
- package/dist/authorization/tuples.js.map +1 -1
- package/dist/boot/compose.d.ts.map +1 -1
- package/dist/boot/compose.js +132 -43
- package/dist/boot/compose.js.map +1 -1
- package/dist/boot/config.d.ts +22 -7
- package/dist/boot/config.d.ts.map +1 -1
- package/dist/boot/config.js +2 -1
- package/dist/boot/config.js.map +1 -1
- package/dist/boot/inprocess.d.ts.map +1 -1
- package/dist/boot/inprocess.js +10 -4
- package/dist/boot/inprocess.js.map +1 -1
- package/dist/boot/list-indexes.d.ts.map +1 -1
- package/dist/boot/list-indexes.js +6 -1
- package/dist/boot/list-indexes.js.map +1 -1
- package/dist/boot/logger.d.ts +3 -1
- package/dist/boot/logger.d.ts.map +1 -1
- package/dist/boot/logger.js +3 -1
- package/dist/boot/logger.js.map +1 -1
- package/dist/boot/oauth-redirect-uri.d.ts +33 -12
- package/dist/boot/oauth-redirect-uri.d.ts.map +1 -1
- package/dist/boot/oauth-redirect-uri.js +43 -14
- package/dist/boot/oauth-redirect-uri.js.map +1 -1
- package/dist/boot/skill-transfer-origin.d.ts +46 -14
- package/dist/boot/skill-transfer-origin.d.ts.map +1 -1
- package/dist/boot/skill-transfer-origin.js +53 -13
- package/dist/boot/skill-transfer-origin.js.map +1 -1
- package/dist/domain/agentchannel/steps.d.ts +8 -6
- package/dist/domain/agentchannel/steps.d.ts.map +1 -1
- package/dist/domain/agentchannel/steps.js +9 -7
- package/dist/domain/agentchannel/steps.js.map +1 -1
- package/dist/domain/agentexecution/controller.d.ts +7 -0
- package/dist/domain/agentexecution/controller.d.ts.map +1 -1
- package/dist/domain/agentexecution/controller.js +1 -1
- package/dist/domain/agentexecution/controller.js.map +1 -1
- package/dist/domain/agentexecution/create-steps.d.ts +26 -12
- package/dist/domain/agentexecution/create-steps.d.ts.map +1 -1
- package/dist/domain/agentexecution/create-steps.js +61 -43
- package/dist/domain/agentexecution/create-steps.js.map +1 -1
- package/dist/domain/agentexecution/submit-approval.d.ts.map +1 -1
- package/dist/domain/agentexecution/submit-approval.js +9 -6
- package/dist/domain/agentexecution/submit-approval.js.map +1 -1
- package/dist/domain/agentexecution/submit-file-decision.d.ts.map +1 -1
- package/dist/domain/agentexecution/submit-file-decision.js +5 -4
- package/dist/domain/agentexecution/submit-file-decision.js.map +1 -1
- package/dist/domain/agentshare/steps.d.ts +5 -3
- package/dist/domain/agentshare/steps.d.ts.map +1 -1
- package/dist/domain/agentshare/steps.js +6 -4
- package/dist/domain/agentshare/steps.js.map +1 -1
- package/dist/domain/apikey/verifier.d.ts +7 -0
- package/dist/domain/apikey/verifier.d.ts.map +1 -1
- package/dist/domain/apikey/verifier.js +34 -1
- package/dist/domain/apikey/verifier.js.map +1 -1
- package/dist/domain/channelapp/controller.d.ts +4 -3
- package/dist/domain/channelapp/controller.d.ts.map +1 -1
- package/dist/domain/channelapp/controller.js.map +1 -1
- package/dist/domain/executioncontext/steps.d.ts +2 -1
- package/dist/domain/executioncontext/steps.d.ts.map +1 -1
- package/dist/domain/executioncontext/steps.js +2 -1
- package/dist/domain/executioncontext/steps.js.map +1 -1
- package/dist/domain/iampolicy/access-lists.d.ts.map +1 -1
- package/dist/domain/iampolicy/access-lists.js +57 -2
- package/dist/domain/iampolicy/access-lists.js.map +1 -1
- package/dist/domain/iampolicy/change.d.ts +53 -0
- package/dist/domain/iampolicy/change.d.ts.map +1 -0
- package/dist/domain/iampolicy/change.js +44 -0
- package/dist/domain/iampolicy/change.js.map +1 -0
- package/dist/domain/iampolicy/constants.d.ts +6 -0
- package/dist/domain/iampolicy/constants.d.ts.map +1 -1
- package/dist/domain/iampolicy/constants.js +6 -0
- package/dist/domain/iampolicy/constants.js.map +1 -1
- package/dist/domain/iampolicy/controller.d.ts.map +1 -1
- package/dist/domain/iampolicy/controller.js +9 -5
- package/dist/domain/iampolicy/controller.js.map +1 -1
- package/dist/domain/iampolicy/grant-path.d.ts +31 -13
- package/dist/domain/iampolicy/grant-path.d.ts.map +1 -1
- package/dist/domain/iampolicy/grant-path.js +216 -19
- package/dist/domain/iampolicy/grant-path.js.map +1 -1
- package/dist/domain/iampolicy/membership.d.ts +11 -3
- package/dist/domain/iampolicy/membership.d.ts.map +1 -1
- package/dist/domain/iampolicy/membership.js +18 -13
- package/dist/domain/iampolicy/membership.js.map +1 -1
- package/dist/domain/iampolicy/resource-store.d.ts.map +1 -1
- package/dist/domain/iampolicy/resource-store.js +4 -0
- package/dist/domain/iampolicy/resource-store.js.map +1 -1
- package/dist/domain/iampolicy/role-lifecycle.d.ts.map +1 -1
- package/dist/domain/iampolicy/role-lifecycle.js +2 -2
- package/dist/domain/iampolicy/role-lifecycle.js.map +1 -1
- package/dist/domain/iampolicy/roles.d.ts.map +1 -1
- package/dist/domain/iampolicy/roles.js +7 -0
- package/dist/domain/iampolicy/roles.js.map +1 -1
- package/dist/domain/iampolicy/steps.d.ts +4 -3
- package/dist/domain/iampolicy/steps.d.ts.map +1 -1
- package/dist/domain/iampolicy/steps.js +7 -7
- package/dist/domain/iampolicy/steps.js.map +1 -1
- package/dist/domain/iampolicy/store-contract.d.ts.map +1 -1
- package/dist/domain/iampolicy/store-contract.js +22 -1
- package/dist/domain/iampolicy/store-contract.js.map +1 -1
- package/dist/domain/iampolicy/store.d.ts +18 -5
- package/dist/domain/iampolicy/store.d.ts.map +1 -1
- package/dist/domain/iampolicy/store.js.map +1 -1
- package/dist/domain/identityaccount/constants.d.ts +15 -0
- package/dist/domain/identityaccount/constants.d.ts.map +1 -1
- package/dist/domain/identityaccount/constants.js +17 -0
- package/dist/domain/identityaccount/constants.js.map +1 -1
- package/dist/domain/identityaccount/controller.d.ts.map +1 -1
- package/dist/domain/identityaccount/controller.js +17 -6
- package/dist/domain/identityaccount/controller.js.map +1 -1
- package/dist/domain/identityaccount/resolve.d.ts +47 -0
- package/dist/domain/identityaccount/resolve.d.ts.map +1 -1
- package/dist/domain/identityaccount/resolve.js +38 -1
- package/dist/domain/identityaccount/resolve.js.map +1 -1
- package/dist/domain/identityaccount/resource-store.d.ts.map +1 -1
- package/dist/domain/identityaccount/resource-store.js +11 -1
- package/dist/domain/identityaccount/resource-store.js.map +1 -1
- package/dist/domain/identityaccount/steps.d.ts +2 -1
- package/dist/domain/identityaccount/steps.d.ts.map +1 -1
- package/dist/domain/identityaccount/steps.js +4 -3
- package/dist/domain/identityaccount/steps.js.map +1 -1
- package/dist/domain/identityaccount/store-contract.js +2 -2
- package/dist/domain/identityaccount/store-contract.js.map +1 -1
- package/dist/domain/identityaccount/store.d.ts +6 -1
- package/dist/domain/identityaccount/store.d.ts.map +1 -1
- package/dist/domain/mcpserver/connect-sandbox.d.ts +67 -0
- package/dist/domain/mcpserver/connect-sandbox.d.ts.map +1 -0
- package/dist/domain/mcpserver/connect-sandbox.js +64 -0
- package/dist/domain/mcpserver/connect-sandbox.js.map +1 -0
- package/dist/domain/mcpserver/connect.d.ts +42 -10
- package/dist/domain/mcpserver/connect.d.ts.map +1 -1
- package/dist/domain/mcpserver/connect.js +147 -40
- package/dist/domain/mcpserver/connect.js.map +1 -1
- package/dist/domain/mcpserver/controller.js +4 -2
- package/dist/domain/mcpserver/controller.js.map +1 -1
- package/dist/domain/mcpserver/engine.d.ts +26 -7
- package/dist/domain/mcpserver/engine.d.ts.map +1 -1
- package/dist/domain/mcpserver/engine.js.map +1 -1
- package/dist/domain/mcpserver/start-connect.d.ts +5 -0
- package/dist/domain/mcpserver/start-connect.d.ts.map +1 -1
- package/dist/domain/mcpserver/start-connect.js +38 -15
- package/dist/domain/mcpserver/start-connect.js.map +1 -1
- package/dist/domain/memory/controller.js +2 -1
- package/dist/domain/memory/controller.js.map +1 -1
- package/dist/domain/memory/list-index.d.ts +2 -0
- package/dist/domain/memory/list-index.d.ts.map +1 -0
- package/dist/domain/memory/list-index.js +31 -0
- package/dist/domain/memory/list-index.js.map +1 -0
- package/dist/domain/memory/queries.d.ts +10 -0
- package/dist/domain/memory/queries.d.ts.map +1 -0
- package/dist/domain/memory/queries.js +54 -0
- package/dist/domain/memory/queries.js.map +1 -0
- package/dist/domain/memory/steps.d.ts +13 -11
- package/dist/domain/memory/steps.d.ts.map +1 -1
- package/dist/domain/memory/steps.js +26 -57
- package/dist/domain/memory/steps.js.map +1 -1
- package/dist/domain/organization/steps.d.ts.map +1 -1
- package/dist/domain/organization/steps.js +1 -1
- package/dist/domain/organization/steps.js.map +1 -1
- package/dist/domain/platformclient/mint.d.ts.map +1 -1
- package/dist/domain/platformclient/mint.js +2 -2
- package/dist/domain/platformclient/mint.js.map +1 -1
- package/dist/domain/platformclient/verifier.d.ts.map +1 -1
- package/dist/domain/platformclient/verifier.js +6 -3
- package/dist/domain/platformclient/verifier.js.map +1 -1
- package/dist/domain/plugin/push.d.ts.map +1 -1
- package/dist/domain/plugin/push.js +1 -0
- package/dist/domain/plugin/push.js.map +1 -1
- package/dist/domain/schedule/steps.d.ts +3 -1
- package/dist/domain/schedule/steps.d.ts.map +1 -1
- package/dist/domain/schedule/steps.js +3 -1
- package/dist/domain/schedule/steps.js.map +1 -1
- package/dist/domain/skill/push.d.ts.map +1 -1
- package/dist/domain/skill/push.js +1 -0
- package/dist/domain/skill/push.js.map +1 -1
- package/dist/domain/workflow/registry/data/task-kind-registry.json +27 -1
- package/dist/domain/workflowexecution/submit-approval.d.ts +5 -2
- package/dist/domain/workflowexecution/submit-approval.d.ts.map +1 -1
- package/dist/domain/workflowexecution/submit-approval.js +1 -1
- package/dist/domain/workflowexecution/submit-approval.js.map +1 -1
- package/dist/domain/workflowexecution/submit-file-decision.d.ts +5 -2
- package/dist/domain/workflowexecution/submit-file-decision.d.ts.map +1 -1
- package/dist/domain/workflowexecution/submit-file-decision.js +1 -1
- package/dist/domain/workflowexecution/submit-file-decision.js.map +1 -1
- package/dist/domain/workflowexecution/submit-workflow-task-approval.d.ts.map +1 -1
- package/dist/domain/workflowexecution/submit-workflow-task-approval.js +12 -1
- package/dist/domain/workflowexecution/submit-workflow-task-approval.js.map +1 -1
- package/dist/domain/workflowinstance/controller.d.ts +6 -3
- package/dist/domain/workflowinstance/controller.d.ts.map +1 -1
- package/dist/domain/workflowinstance/controller.js +12 -7
- package/dist/domain/workflowinstance/controller.js.map +1 -1
- package/dist/domain/workflowinstance/steps.d.ts +31 -0
- package/dist/domain/workflowinstance/steps.d.ts.map +1 -1
- package/dist/domain/workflowinstance/steps.js +88 -1
- package/dist/domain/workflowinstance/steps.js.map +1 -1
- package/dist/extensions/composed-services.d.ts +56 -0
- package/dist/extensions/composed-services.d.ts.map +1 -0
- package/dist/extensions/composed-services.js +2 -0
- package/dist/extensions/composed-services.js.map +1 -0
- package/dist/extensions/drivers.d.ts +32 -1
- package/dist/extensions/drivers.d.ts.map +1 -1
- package/dist/extensions/identity.d.ts +4 -1
- package/dist/extensions/identity.d.ts.map +1 -1
- package/dist/extensions/identity.js +4 -1
- package/dist/extensions/identity.js.map +1 -1
- package/dist/extensions/registry.d.ts +37 -0
- package/dist/extensions/registry.d.ts.map +1 -1
- package/dist/extensions/registry.js +50 -0
- package/dist/extensions/registry.js.map +1 -1
- package/dist/extensions/resource-authorization.d.ts +78 -0
- package/dist/extensions/resource-authorization.d.ts.map +1 -1
- package/dist/extensions/resource-row-reader.d.ts +43 -0
- package/dist/extensions/resource-row-reader.d.ts.map +1 -0
- package/dist/extensions/resource-row-reader.js +2 -0
- package/dist/extensions/resource-row-reader.js.map +1 -0
- package/dist/extensions/visitor-classifier.d.ts +41 -0
- package/dist/extensions/visitor-classifier.d.ts.map +1 -0
- package/dist/extensions/visitor-classifier.js +2 -0
- package/dist/extensions/visitor-classifier.js.map +1 -0
- package/dist/identity/oidc-userinfo.d.ts +6 -1
- package/dist/identity/oidc-userinfo.d.ts.map +1 -1
- package/dist/identity/oidc-userinfo.js.map +1 -1
- package/dist/identity/oidc-verifier.d.ts.map +1 -1
- package/dist/identity/oidc-verifier.js +37 -8
- package/dist/identity/oidc-verifier.js.map +1 -1
- package/dist/index.d.ts +14 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +25 -9
- package/dist/index.js.map +1 -1
- package/dist/pipeline/errors.d.ts +8 -0
- package/dist/pipeline/errors.d.ts.map +1 -1
- package/dist/pipeline/errors.js +25 -16
- package/dist/pipeline/errors.js.map +1 -1
- package/dist/pipeline/interceptors/auth.d.ts +17 -9
- package/dist/pipeline/interceptors/auth.d.ts.map +1 -1
- package/dist/pipeline/interceptors/auth.js +17 -9
- package/dist/pipeline/interceptors/auth.js.map +1 -1
- package/dist/pipeline/steps/authorization-tuples.d.ts +23 -1
- package/dist/pipeline/steps/authorization-tuples.d.ts.map +1 -1
- package/dist/pipeline/steps/authorization-tuples.js +42 -0
- package/dist/pipeline/steps/authorization-tuples.js.map +1 -1
- package/dist/pipeline/steps/authorize.d.ts +6 -5
- package/dist/pipeline/steps/authorize.d.ts.map +1 -1
- package/dist/pipeline/steps/authorize.js +6 -5
- package/dist/pipeline/steps/authorize.js.map +1 -1
- package/dist/pipeline/steps/defaults.d.ts +12 -0
- package/dist/pipeline/steps/defaults.d.ts.map +1 -1
- package/dist/pipeline/steps/defaults.js +42 -7
- package/dist/pipeline/steps/defaults.js.map +1 -1
- package/dist/pipeline/steps/guard-memory-capture.d.ts +13 -15
- package/dist/pipeline/steps/guard-memory-capture.d.ts.map +1 -1
- package/dist/pipeline/steps/guard-memory-capture.js +2 -3
- package/dist/pipeline/steps/guard-memory-capture.js.map +1 -1
- package/dist/runnerauth/built-in-runner-credential-provider.d.ts +0 -2
- package/dist/runnerauth/built-in-runner-credential-provider.d.ts.map +1 -1
- package/dist/runnerauth/built-in-runner-credential-provider.js +8 -17
- package/dist/runnerauth/built-in-runner-credential-provider.js.map +1 -1
- package/dist/runnerauth/runner-credential-provider.d.ts +17 -7
- package/dist/runnerauth/runner-credential-provider.d.ts.map +1 -1
- package/dist/runnerauth/runner-credential-provider.js.map +1 -1
- package/dist/sandbox/docker.d.ts.map +1 -1
- package/dist/sandbox/docker.js +3 -0
- package/dist/sandbox/docker.js.map +1 -1
- package/dist/sandbox/kubernetes.d.ts.map +1 -1
- package/dist/sandbox/kubernetes.js +3 -0
- package/dist/sandbox/kubernetes.js.map +1 -1
- package/dist/sandbox/local-process.d.ts.map +1 -1
- package/dist/sandbox/local-process.js +4 -0
- package/dist/sandbox/local-process.js.map +1 -1
- package/dist/sandbox/provisioner.d.ts +18 -6
- package/dist/sandbox/provisioner.d.ts.map +1 -1
- package/dist/sandbox/provisioner.js.map +1 -1
- package/dist/temporal/manager.d.ts +5 -0
- package/dist/temporal/manager.d.ts.map +1 -1
- package/dist/temporal/manager.js +9 -0
- package/dist/temporal/manager.js.map +1 -1
- package/dist/temporal/mcpserver/engine-client.d.ts +2 -2
- package/dist/temporal/mcpserver/engine-client.d.ts.map +1 -1
- package/dist/temporal/mcpserver/engine-client.js +6 -4
- package/dist/temporal/mcpserver/engine-client.js.map +1 -1
- package/dist/temporal/mcpserver/names.d.ts +13 -2
- package/dist/temporal/mcpserver/names.d.ts.map +1 -1
- package/dist/temporal/mcpserver/names.js +15 -2
- package/dist/temporal/mcpserver/names.js.map +1 -1
- package/dist/temporal/sdk-logger.d.ts +74 -0
- package/dist/temporal/sdk-logger.d.ts.map +1 -0
- package/dist/temporal/sdk-logger.js +143 -0
- package/dist/temporal/sdk-logger.js.map +1 -0
- package/package.json +6 -6
- package/src/authorization/README.md +18 -6
- package/src/authorization/__tests__/authorizer.test.ts +5 -1
- package/src/authorization/__tests__/derived-tuples.test.ts +26 -0
- package/src/authorization/__tests__/evaluator.test.ts +4 -0
- package/src/authorization/__tests__/list-read-scope.test.ts +11 -5
- package/src/authorization/__tests__/store-tests.test.ts +3 -1
- package/src/authorization/__tests__/trusted-local-authorizer.test.ts +155 -0
- package/src/authorization/__tests__/unit-owned-kinds.test.ts +420 -0
- package/src/authorization/__tests__/wire-permissions.test.ts +31 -2
- package/src/authorization/authorizer.ts +21 -10
- package/src/authorization/derived-tuples.ts +92 -18
- package/src/authorization/evaluator.ts +30 -15
- package/src/authorization/list-read-scope.ts +4 -0
- package/src/authorization/model/__tests__/registry.test.ts +23 -0
- package/src/authorization/model/data/authorization-model.json +830 -67
- package/src/authorization/model/execution-viewer.ts +32 -27
- package/src/authorization/model/index.ts +4 -1
- package/src/authorization/model/rewrite.ts +5 -3
- package/src/authorization/organization-directory.ts +4 -0
- package/src/authorization/person.ts +32 -1
- package/src/authorization/policy-check.ts +105 -0
- package/src/authorization/posture.ts +45 -4
- package/src/authorization/resource-creators.ts +48 -0
- package/src/authorization/trusted-local-authorizer.ts +91 -0
- package/src/authorization/tuples.ts +17 -0
- package/src/boot/__tests__/compose.test.ts +120 -4
- package/src/boot/__tests__/list-indexes.test.ts +4 -0
- package/src/boot/__tests__/oauth-redirect-uri.test.ts +121 -10
- package/src/boot/__tests__/skill-transfer-origin.test.ts +96 -25
- package/src/boot/compose.ts +153 -61
- package/src/boot/config.ts +28 -12
- package/src/boot/inprocess.ts +18 -4
- package/src/boot/list-indexes.ts +6 -1
- package/src/boot/logger.ts +3 -1
- package/src/boot/oauth-redirect-uri.ts +62 -17
- package/src/boot/skill-transfer-origin.ts +71 -16
- package/src/domain/agent/__tests__/agent.test.ts +42 -1
- package/src/domain/agentchannel/__tests__/agentchannel.test.ts +9 -0
- package/src/domain/agentchannel/__tests__/channel-runtime.test.ts +2 -0
- package/src/domain/agentchannel/__tests__/create-authorization.test.ts +7 -6
- package/src/domain/agentchannel/steps.ts +9 -7
- package/src/domain/agentexecution/__tests__/agentexecution.test.ts +148 -56
- package/src/domain/agentexecution/__tests__/create-steps.test.ts +175 -12
- package/src/domain/agentexecution/__tests__/file-review-seed.ts +91 -0
- package/src/domain/agentexecution/controller.ts +8 -0
- package/src/domain/agentexecution/create-steps.ts +74 -44
- package/src/domain/agentexecution/submit-approval.ts +9 -6
- package/src/domain/agentexecution/submit-file-decision.ts +5 -4
- package/src/domain/agentinstance/__tests__/agentinstance.test.ts +2 -0
- package/src/domain/agentshare/__tests__/agentshare.test.ts +17 -0
- package/src/domain/agentshare/__tests__/create-authorization.test.ts +5 -4
- package/src/domain/agentshare/steps.ts +6 -4
- package/src/domain/apikey/__tests__/verifier.test.ts +73 -1
- package/src/domain/apikey/verifier.ts +45 -1
- package/src/domain/artifact/__tests__/artifact.test.ts +13 -24
- package/src/domain/channelapp/__tests__/channelapp.test.ts +7 -0
- package/src/domain/channelapp/controller.ts +4 -3
- package/src/domain/environment/__tests__/environment.test.ts +13 -0
- package/src/domain/executioncontext/__tests__/executioncontext.test.ts +2 -0
- package/src/domain/executioncontext/steps.ts +2 -1
- package/src/domain/iampolicy/__tests__/access-lists.test.ts +79 -0
- package/src/domain/iampolicy/__tests__/change.test.ts +63 -0
- package/src/domain/iampolicy/__tests__/controller.test.ts +39 -3
- package/src/domain/iampolicy/__tests__/grant-path.test.ts +595 -27
- package/src/domain/iampolicy/__tests__/iampolicy.test.ts +33 -2
- package/src/domain/iampolicy/__tests__/membership.test.ts +47 -5
- package/src/domain/iampolicy/__tests__/resource-store.test.ts +1 -0
- package/src/domain/iampolicy/__tests__/role-lifecycle.test.ts +41 -8
- package/src/domain/iampolicy/__tests__/roles.test.ts +3 -2
- package/src/domain/iampolicy/__tests__/steps.test.ts +75 -6
- package/src/domain/iampolicy/__tests__/support.ts +68 -4
- package/src/domain/iampolicy/access-lists.ts +70 -2
- package/src/domain/iampolicy/change.ts +109 -0
- package/src/domain/iampolicy/constants.ts +8 -0
- package/src/domain/iampolicy/controller.ts +17 -3
- package/src/domain/iampolicy/grant-path.ts +349 -31
- package/src/domain/iampolicy/membership.ts +32 -12
- package/src/domain/iampolicy/resource-store.ts +4 -0
- package/src/domain/iampolicy/role-lifecycle.ts +2 -0
- package/src/domain/iampolicy/roles.ts +8 -0
- package/src/domain/iampolicy/steps.ts +15 -5
- package/src/domain/iampolicy/store-contract.ts +37 -1
- package/src/domain/iampolicy/store.ts +19 -5
- package/src/domain/identityaccount/__tests__/resolve.test.ts +246 -2
- package/src/domain/identityaccount/__tests__/resource-store.test.ts +1 -1
- package/src/domain/identityaccount/constants.ts +20 -0
- package/src/domain/identityaccount/controller.ts +20 -5
- package/src/domain/identityaccount/resolve.ts +80 -1
- package/src/domain/identityaccount/resource-store.ts +14 -1
- package/src/domain/identityaccount/steps.ts +4 -3
- package/src/domain/identityaccount/store-contract.ts +4 -4
- package/src/domain/identityaccount/store.ts +6 -1
- package/src/domain/mcpserver/__tests__/connect-authorization.test.ts +1 -0
- package/src/domain/mcpserver/__tests__/connect.test.ts +358 -15
- package/src/domain/mcpserver/__tests__/mcpserver.test.ts +2 -0
- package/src/domain/mcpserver/__tests__/oauth-handshake.test.ts +2 -0
- package/src/domain/mcpserver/__tests__/store-faults.test.ts +2 -0
- package/src/domain/mcpserver/connect-sandbox.ts +135 -0
- package/src/domain/mcpserver/connect.ts +226 -56
- package/src/domain/mcpserver/controller.ts +8 -2
- package/src/domain/mcpserver/engine.ts +24 -6
- package/src/domain/mcpserver/start-connect.ts +49 -10
- package/src/domain/memory/__tests__/memory.test.ts +92 -22
- package/src/domain/memory/__tests__/queries.test.ts +173 -0
- package/src/domain/memory/controller.ts +2 -1
- package/src/domain/memory/list-index.ts +32 -0
- package/src/domain/memory/queries.ts +72 -0
- package/src/domain/memory/steps.ts +26 -63
- package/src/domain/oauthapp/__tests__/oauthapp.test.ts +14 -0
- package/src/domain/organization/__tests__/support.ts +41 -0
- package/src/domain/organization/steps.ts +1 -0
- package/src/domain/platformclient/mint.ts +6 -2
- package/src/domain/platformclient/verifier.ts +6 -3
- package/src/domain/plugin/__tests__/plugin.test.ts +11 -24
- package/src/domain/plugin/push.ts +1 -0
- package/src/domain/schedule/__tests__/schedule.composed.test.ts +2 -0
- package/src/domain/schedule/steps.ts +3 -1
- package/src/domain/session/__tests__/session.test.ts +2 -0
- package/src/domain/skill/__tests__/skill.test.ts +7 -25
- package/src/domain/skill/push.ts +1 -0
- package/src/domain/workflow/__tests__/workflow.test.ts +2 -0
- package/src/domain/workflow/registry/data/task-kind-registry.json +27 -1
- package/src/domain/workflowexecution/__tests__/forward-attribution-composed.test.ts +270 -0
- package/src/domain/workflowexecution/__tests__/submit-workflow-task-approval.test.ts +196 -0
- package/src/domain/workflowexecution/__tests__/workflowexecution.test.ts +3 -57
- package/src/domain/workflowexecution/submit-approval.ts +9 -2
- package/src/domain/workflowexecution/submit-file-decision.ts +6 -1
- package/src/domain/workflowexecution/submit-workflow-task-approval.ts +23 -5
- package/src/domain/workflowinstance/controller.ts +27 -9
- package/src/domain/workflowinstance/steps.ts +123 -1
- package/src/extensions/__tests__/apikey-before-sign-in-composed.test.ts +172 -0
- package/src/extensions/__tests__/built-in-authorization-composed.test.ts +80 -1
- package/src/extensions/__tests__/composed-services-composed.test.ts +236 -0
- package/src/extensions/__tests__/extension-composition.test.ts +229 -16
- package/src/extensions/__tests__/identity-account-composed.test.ts +84 -4
- package/src/extensions/__tests__/list-read-scope-composed.test.ts +2 -0
- package/src/extensions/__tests__/registry.test.ts +147 -1
- package/src/extensions/__tests__/secret-cleanup-composed.test.ts +2 -0
- package/src/extensions/__tests__/visitor-classifier-points.test.ts +42 -0
- package/src/extensions/composed-services.ts +61 -0
- package/src/extensions/drivers.ts +33 -1
- package/src/extensions/identity.ts +4 -1
- package/src/extensions/registry.ts +105 -0
- package/src/extensions/resource-authorization.ts +87 -0
- package/src/extensions/resource-row-reader.ts +43 -0
- package/src/extensions/visitor-classifier.ts +41 -0
- package/src/identity/__tests__/oidc-verifier.test.ts +38 -12
- package/src/identity/oidc-userinfo.ts +6 -1
- package/src/identity/oidc-verifier.ts +42 -8
- package/src/index.ts +61 -6
- package/src/pipeline/__tests__/steps.test.ts +31 -4
- package/src/pipeline/errors.ts +30 -16
- package/src/pipeline/interceptors/auth.ts +17 -9
- package/src/pipeline/steps/__tests__/authorization-tuples.test.ts +20 -0
- package/src/pipeline/steps/__tests__/guard-memory-capture.test.ts +72 -15
- package/src/pipeline/steps/authorization-tuples.ts +54 -0
- package/src/pipeline/steps/authorize.ts +6 -5
- package/src/pipeline/steps/defaults.ts +52 -7
- package/src/pipeline/steps/guard-memory-capture.ts +15 -20
- package/src/runnerauth/__tests__/built-in-runner-credential-provider.test.ts +1 -1
- package/src/runnerauth/__tests__/runner-subject-composed.test.ts +13 -0
- package/src/runnerauth/bound-execution.ts +2 -2
- package/src/runnerauth/built-in-runner-credential-provider.ts +8 -21
- package/src/runnerauth/runner-credential-provider.ts +17 -7
- package/src/sandbox/__tests__/docker.integration.test.ts +4 -0
- package/src/sandbox/__tests__/kubernetes.test.ts +18 -1
- package/src/sandbox/__tests__/local-process.integration.test.ts +4 -0
- package/src/sandbox/__tests__/provisioner.test.ts +1 -0
- package/src/sandbox/docker.ts +3 -0
- package/src/sandbox/kubernetes.ts +3 -0
- package/src/sandbox/local-process.ts +4 -0
- package/src/sandbox/provisioner.ts +18 -6
- package/src/store/postgres/__tests__/support.ts +11 -2
- package/src/temporal/README.md +1 -0
- package/src/temporal/__tests__/manager.test.ts +56 -4
- package/src/temporal/__tests__/sdk-log-workflows.ts +26 -0
- package/src/temporal/__tests__/sdk-logger.e2e.test.ts +150 -0
- package/src/temporal/__tests__/sdk-logger.test.ts +238 -0
- package/src/temporal/manager.ts +9 -0
- package/src/temporal/mcpserver/engine-client.ts +8 -3
- package/src/temporal/mcpserver/names.ts +16 -2
- package/src/temporal/sdk-logger.ts +173 -0
- package/dist/authorization/lane-admission.d.ts +0 -50
- package/dist/authorization/lane-admission.d.ts.map +0 -1
- package/dist/authorization/lane-admission.js +0 -13
- package/dist/authorization/lane-admission.js.map +0 -1
- package/src/authorization/__tests__/lane-admission.test.ts +0 -115
- package/src/authorization/lane-admission.ts +0 -73
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { unavailableError } from "../../pipeline/errors.js";
|
|
2
|
+
import { mintSandboxToken } from "../../sandbox/lane.js";
|
|
3
|
+
import { connectTaskQueueFor } from "../../temporal/mcpserver/names.js";
|
|
4
|
+
/** The refusal when a connect sandbox cannot be provisioned. */
|
|
5
|
+
export const CONNECT_SANDBOX_PROVISIONING_FAILED = "failed to provision connect sandbox";
|
|
6
|
+
const SHARED_RUNNER_ROUTE = Object.freeze({
|
|
7
|
+
taskQueue: Object.freeze({ kind: "runner" }),
|
|
8
|
+
release: async () => { },
|
|
9
|
+
});
|
|
10
|
+
/**
|
|
11
|
+
* Resolves where a connect runs, provisioning its sandbox when a lane is
|
|
12
|
+
* composed. Throws Unavailable when provisioning fails; the caller has not
|
|
13
|
+
* started a run yet, so nothing else needs undoing but its own
|
|
14
|
+
* ExecutionContext.
|
|
15
|
+
*/
|
|
16
|
+
export async function acquireConnectRoute(lane, logger, request) {
|
|
17
|
+
if (!lane.enabled) {
|
|
18
|
+
return SHARED_RUNNER_ROUTE;
|
|
19
|
+
}
|
|
20
|
+
const { connectExecutionId, org, caller } = request;
|
|
21
|
+
const taskQueue = connectTaskQueueFor(connectExecutionId);
|
|
22
|
+
let sandboxId;
|
|
23
|
+
try {
|
|
24
|
+
sandboxId = await lane.provisioner.createConnectSandbox(connectExecutionId, {
|
|
25
|
+
taskQueue,
|
|
26
|
+
stigmerToken: mintSandboxToken(lane, {
|
|
27
|
+
scope: "connect",
|
|
28
|
+
sessionId: "",
|
|
29
|
+
executionId: connectExecutionId,
|
|
30
|
+
org,
|
|
31
|
+
callerIdentityId: caller.identityId,
|
|
32
|
+
}, logger),
|
|
33
|
+
callerClass: caller.callerClass,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
catch (error) {
|
|
37
|
+
logger.error("Connect sandbox provisioning failed - refusing the connect", {
|
|
38
|
+
execution_id: connectExecutionId,
|
|
39
|
+
error: error instanceof Error ? error.message : String(error),
|
|
40
|
+
});
|
|
41
|
+
throw unavailableError(CONNECT_SANDBOX_PROVISIONING_FAILED);
|
|
42
|
+
}
|
|
43
|
+
let released = false;
|
|
44
|
+
return {
|
|
45
|
+
taskQueue: { kind: "sandbox", name: taskQueue },
|
|
46
|
+
async release() {
|
|
47
|
+
if (released) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
released = true;
|
|
51
|
+
try {
|
|
52
|
+
await lane.provisioner.deprovisionConnectSandbox(sandboxId);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
logger.warn("Failed to deprovision connect sandbox (non-fatal)", {
|
|
56
|
+
execution_id: connectExecutionId,
|
|
57
|
+
sandbox_id: sandboxId,
|
|
58
|
+
error: error instanceof Error ? error.message : String(error),
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=connect-sandbox.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-sandbox.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect-sandbox.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAoB,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,gEAAgE;AAChE,MAAM,CAAC,MAAM,mCAAmC,GAC9C,qCAAqC,CAAC;AAkBxC,MAAM,mBAAmB,GAAiB,MAAM,CAAC,MAAM,CAAC;IACtD,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAiB,EAAE,CAAC;IACrD,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;CACxB,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAiB,EACjB,MAAc,EACd,OAA4B;IAE5B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,SAAS,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IAC1D,IAAI,SAAiB,CAAC;IACtB,IAAI,CAAC;QACH,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CACrD,kBAAkB,EAClB;YACE,SAAS;YACT,YAAY,EAAE,gBAAgB,CAC5B,IAAI,EACJ;gBACE,KAAK,EAAE,SAAS;gBAChB,SAAS,EAAE,EAAE;gBACb,WAAW,EAAE,kBAAkB;gBAC/B,GAAG;gBACH,gBAAgB,EAAE,MAAM,CAAC,UAAU;aACpC,EACD,MAAM,CACP;YACD,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,4DAA4D,EAAE;YACzE,YAAY,EAAE,kBAAkB;YAChC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC,CAAC;QACH,MAAM,gBAAgB,CAAC,mCAAmC,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,OAAO;QACL,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QAC/C,KAAK,CAAC,OAAO;YACX,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CAAC,mDAAmD,EAAE;oBAC/D,YAAY,EAAE,kBAAkB;oBAChC,UAAU,EAAE,SAAS;oBACrB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC9D,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -9,7 +9,9 @@
|
|
|
9
9
|
*
|
|
10
10
|
* Discovery runs on the RUNNER: this module starts the runner's
|
|
11
11
|
* stigmer/mcp-server/connect workflow through the engine seam
|
|
12
|
-
* (engine.ts) and never registers a worker.
|
|
12
|
+
* (engine.ts) and never registers a worker. Which runner serves it — the
|
|
13
|
+
* shared queue's, or a connect sandbox provisioned for this connect alone
|
|
14
|
+
* — is connect-sandbox.ts's decision (stigmer/stigmer#1474).
|
|
13
15
|
*
|
|
14
16
|
* Proven by mcpserver-connect.conformance.test.ts
|
|
15
17
|
* (CONFORMANCE_TARGET=local-execution), __tests__/connect.test.ts and
|
|
@@ -31,7 +33,9 @@ import type { Authorizer } from "../../extensions/authorizer.js";
|
|
|
31
33
|
import type { CallerIdentity } from "../../extensions/identity.js";
|
|
32
34
|
import type { SecretService } from "../../encryption/encryption.js";
|
|
33
35
|
import type { RunnerCredentialProvider } from "../../runnerauth/runner-credential-provider.js";
|
|
36
|
+
import type { SandboxLane } from "../../sandbox/lane.js";
|
|
34
37
|
import type { OAuthGrantStore, PendingOAuthStateStore, Store } from "../../store/interface.js";
|
|
38
|
+
import type { ConnectRoute, ConnectRouteRequest } from "./connect-sandbox.js";
|
|
35
39
|
import type { ConnectRunFailure, ConnectWorkflowInput, McpServerEngineStateProvider } from "./engine.js";
|
|
36
40
|
import type { ManagedEnvironmentService } from "./oauth/managed-env.js";
|
|
37
41
|
/**
|
|
@@ -148,6 +152,13 @@ export interface McpServerConnectDeps {
|
|
|
148
152
|
readonly pendingOAuthStates: PendingOAuthStateStore;
|
|
149
153
|
readonly secretService: SecretService;
|
|
150
154
|
readonly oauthRedirectUri: string;
|
|
155
|
+
/**
|
|
156
|
+
* The composed sandbox lane (sandbox/lane.ts): disabled, a connect runs
|
|
157
|
+
* on the shared runner queue; enabled, every connect provisions its own
|
|
158
|
+
* connect sandbox and always creates its ExecutionContext row, the
|
|
159
|
+
* binding its sandbox's credential acts through (connect-sandbox.ts).
|
|
160
|
+
*/
|
|
161
|
+
readonly sandboxLane: SandboxLane;
|
|
151
162
|
/**
|
|
152
163
|
* The ONE fetch this slice dials user-supplied URLs with: the MCP
|
|
153
164
|
* endpoint probed at save time and the login server reached on Sign in
|
|
@@ -179,6 +190,13 @@ interface PreparedConnect {
|
|
|
179
190
|
* RPC's response can outlive browser transport limits.
|
|
180
191
|
*/
|
|
181
192
|
export declare function connect(deps: McpServerConnectDeps, input: ConnectInput, identity: CallerIdentity): Promise<McpServer>;
|
|
193
|
+
/**
|
|
194
|
+
* Resolves a connect's route (connect-sandbox.ts) for every lane alike: a
|
|
195
|
+
* sandbox that cannot be provisioned is recorded on connect_status as the
|
|
196
|
+
* connect's failure before the refusal propagates, so the server's page
|
|
197
|
+
* says why instead of waiting on a run that was never started.
|
|
198
|
+
*/
|
|
199
|
+
export declare function acquireConnectRouteFor(deps: McpServerConnectDeps, mcpServerId: string, request: ConnectRouteRequest): Promise<ConnectRoute>;
|
|
182
200
|
/**
|
|
183
201
|
* The caller-context half of a connect: the OAuth refresh pre-flight,
|
|
184
202
|
* ephemeral ExecutionContext creation, and decrypt-lane token minting
|
|
@@ -202,10 +220,17 @@ export declare function connect(deps: McpServerConnectDeps, input: ConnectInput,
|
|
|
202
220
|
* bound to this connect's ExecutionContext, and under the built-in
|
|
203
221
|
* posture the runner-subject verifier resolves its bearer to the person
|
|
204
222
|
* that row was created by — which is why the row is created as `identity`
|
|
205
|
-
* and not as the server.
|
|
206
|
-
*
|
|
207
|
-
*
|
|
208
|
-
*
|
|
223
|
+
* and not as the server.
|
|
224
|
+
*
|
|
225
|
+
* With a sandbox lane composed there is no operator key: the connect
|
|
226
|
+
* sandbox's runner acts as the person on EVERY RPC of its discovery, with
|
|
227
|
+
* a credential bound to this connect (connect-sandbox.ts). That binding
|
|
228
|
+
* resolves through the ExecutionContext row, so on the lane the row is
|
|
229
|
+
* always created, as `identity`, even for a server that declares no env
|
|
230
|
+
* (an empty `data` map; stigmer/stigmer#1474). Such a binding-only row
|
|
231
|
+
* carries nothing to read, so the workflow input names no context for it
|
|
232
|
+
* and no payload token: the runner's discovery takes the same no-env path
|
|
233
|
+
* it takes today. Without a lane an env-less connect still creates no row.
|
|
209
234
|
*/
|
|
210
235
|
export declare function prepareConnect(deps: McpServerConnectDeps, mcpServer: McpServer, input: ConnectInput, identity: CallerIdentity): Promise<PreparedConnect>;
|
|
211
236
|
/**
|
|
@@ -275,11 +300,18 @@ export declare function tokenAuthMethodFromSpec(method: TokenEndpointAuthMethod)
|
|
|
275
300
|
*
|
|
276
301
|
* A disconnected engine returns SILENTLY — byte parity with Go's
|
|
277
302
|
* nil-temporalClient no-op (connect.go:1048). Servers that declare env
|
|
278
|
-
* vars are skipped:
|
|
279
|
-
*
|
|
280
|
-
*
|
|
281
|
-
*
|
|
303
|
+
* vars are skipped: resolving their credentials needs the connecting
|
|
304
|
+
* person's own environments, which an apply does not stand for. If the
|
|
305
|
+
* server is deleted before the workflow completes, persistence is skipped
|
|
306
|
+
* — expected for best-effort.
|
|
307
|
+
*
|
|
308
|
+
* `applier` is the caller whose apply fired this connect. Without a
|
|
309
|
+
* sandbox lane it is unused: the shared runner's own credential reads the
|
|
310
|
+
* server, exactly as before. With one, the connect runs in a connect
|
|
311
|
+
* sandbox acting as the applier (connect-sandbox.ts), so the lane first
|
|
312
|
+
* creates the binding-only ExecutionContext row as the applier
|
|
313
|
+
* (prepareConnect) and deletes it when the run settles.
|
|
282
314
|
*/
|
|
283
|
-
export declare function startBestEffortConnect(deps: McpServerConnectDeps, mcpServer: McpServer): Promise<void>;
|
|
315
|
+
export declare function startBestEffortConnect(deps: McpServerConnectDeps, mcpServer: McpServer, applier: CallerIdentity): Promise<void>;
|
|
284
316
|
export {};
|
|
285
317
|
//# sourceMappingURL=connect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { ExecutionContextSchema } from "@stigmer/protos/ai/stigmer/agentic/execu
|
|
|
5
5
|
import { ExecutionValueSchema } from "@stigmer/protos/ai/stigmer/agentic/executioncontext/v1/spec_pb";
|
|
6
6
|
import { McpServerSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/api_pb";
|
|
7
7
|
import { McpServerCommandController } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/command_pb";
|
|
8
|
+
import { ConnectInputSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/io_pb";
|
|
8
9
|
import { ApiResourceKind } from "@stigmer/protos/ai/stigmer/commons/apiresource/apiresourcekind/api_resource_kind_pb";
|
|
9
10
|
import { TokenEndpointAuthMethod } from "@stigmer/protos/ai/stigmer/iam/oauthapp/v1/spec_pb";
|
|
10
11
|
import { resolveDeclaredFromPersonalEnvironment } from "../environment/personal.js";
|
|
@@ -14,6 +15,7 @@ import { TOKEN_TYPE_EXECUTION_SCOPED } from "../../runnerauth/runnerauth.js";
|
|
|
14
15
|
import { ResourceNotFoundError } from "../../store/interface.js";
|
|
15
16
|
import { resolveOAuthAppRef } from "../oauthapp/refresolution.js";
|
|
16
17
|
import { newConnectExecutionId } from "./connect-execution-id.js";
|
|
18
|
+
import { acquireConnectRoute } from "./connect-sandbox.js";
|
|
17
19
|
import { persistConnectFailure, persistConnectResult, persistConnectStarting, } from "./connect-status.js";
|
|
18
20
|
import { refreshTokenIfExpired } from "./oauth/refresh.js";
|
|
19
21
|
import { TOKEN_AUTH_METHOD_BASIC, TOKEN_AUTH_METHOD_POST, } from "./oauth/token.js";
|
|
@@ -113,10 +115,16 @@ export async function connect(deps, input, identity) {
|
|
|
113
115
|
throw failedPreconditionError("connect is not available: Temporal not configured");
|
|
114
116
|
}
|
|
115
117
|
const prepared = await prepareConnect(deps, mcpServer, input, identity);
|
|
118
|
+
let route;
|
|
116
119
|
try {
|
|
120
|
+
route = await acquireConnectRouteFor(deps, mcpServerId, {
|
|
121
|
+
connectExecutionId: prepared.executionId,
|
|
122
|
+
org: input.org,
|
|
123
|
+
caller: identity,
|
|
124
|
+
});
|
|
117
125
|
let run;
|
|
118
126
|
try {
|
|
119
|
-
run = await engineState.engine.startOrAttachConnect(mcpServerId, prepared.workflowInput, CONNECT_TIMEOUT.ms);
|
|
127
|
+
run = await engineState.engine.startOrAttachConnect(mcpServerId, prepared.workflowInput, CONNECT_TIMEOUT.ms, route.taskQueue);
|
|
120
128
|
}
|
|
121
129
|
catch (error) {
|
|
122
130
|
deps.logger.error("Failed to start MCP connect workflow", {
|
|
@@ -125,6 +133,12 @@ export async function connect(deps, input, identity) {
|
|
|
125
133
|
});
|
|
126
134
|
throw internalError(error, "failed to start connect workflow");
|
|
127
135
|
}
|
|
136
|
+
// An attached run is served by the sandbox of the lane that started
|
|
137
|
+
// it: this lane's own sandbox, if one was provisioned, is given back
|
|
138
|
+
// now rather than held idle for the other lane's whole run.
|
|
139
|
+
if (run.attached) {
|
|
140
|
+
await route.release();
|
|
141
|
+
}
|
|
128
142
|
// Record the operation on connect_status. Skipped when attached: the
|
|
129
143
|
// lane that started the run already recorded it, and overwriting
|
|
130
144
|
// would reset its started_at. Best-effort — the blocking caller
|
|
@@ -171,11 +185,30 @@ export async function connect(deps, input, identity) {
|
|
|
171
185
|
return persisted;
|
|
172
186
|
}
|
|
173
187
|
finally {
|
|
188
|
+
// Idempotent: a no-op when the attach arm already released it.
|
|
189
|
+
await route?.release();
|
|
174
190
|
if (prepared.ecResourceId !== "") {
|
|
175
191
|
await deleteConnectExecutionContext(deps, prepared.ecResourceId, prepared.executionId);
|
|
176
192
|
}
|
|
177
193
|
}
|
|
178
194
|
}
|
|
195
|
+
/**
|
|
196
|
+
* Resolves a connect's route (connect-sandbox.ts) for every lane alike: a
|
|
197
|
+
* sandbox that cannot be provisioned is recorded on connect_status as the
|
|
198
|
+
* connect's failure before the refusal propagates, so the server's page
|
|
199
|
+
* says why instead of waiting on a run that was never started.
|
|
200
|
+
*/
|
|
201
|
+
export async function acquireConnectRouteFor(deps, mcpServerId, request) {
|
|
202
|
+
try {
|
|
203
|
+
return await acquireConnectRoute(deps.sandboxLane, deps.logger, request);
|
|
204
|
+
}
|
|
205
|
+
catch (error) {
|
|
206
|
+
if (error instanceof ConnectError) {
|
|
207
|
+
await persistConnectFailure(deps.store, deps.logger, mcpServerId, error);
|
|
208
|
+
}
|
|
209
|
+
throw error;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
179
212
|
/**
|
|
180
213
|
* The caller-context half of a connect: the OAuth refresh pre-flight,
|
|
181
214
|
* ephemeral ExecutionContext creation, and decrypt-lane token minting
|
|
@@ -199,10 +232,17 @@ export async function connect(deps, input, identity) {
|
|
|
199
232
|
* bound to this connect's ExecutionContext, and under the built-in
|
|
200
233
|
* posture the runner-subject verifier resolves its bearer to the person
|
|
201
234
|
* that row was created by — which is why the row is created as `identity`
|
|
202
|
-
* and not as the server.
|
|
203
|
-
*
|
|
204
|
-
*
|
|
205
|
-
*
|
|
235
|
+
* and not as the server.
|
|
236
|
+
*
|
|
237
|
+
* With a sandbox lane composed there is no operator key: the connect
|
|
238
|
+
* sandbox's runner acts as the person on EVERY RPC of its discovery, with
|
|
239
|
+
* a credential bound to this connect (connect-sandbox.ts). That binding
|
|
240
|
+
* resolves through the ExecutionContext row, so on the lane the row is
|
|
241
|
+
* always created, as `identity`, even for a server that declares no env
|
|
242
|
+
* (an empty `data` map; stigmer/stigmer#1474). Such a binding-only row
|
|
243
|
+
* carries nothing to read, so the workflow input names no context for it
|
|
244
|
+
* and no payload token: the runner's discovery takes the same no-env path
|
|
245
|
+
* it takes today. Without a lane an env-less connect still creates no row.
|
|
206
246
|
*/
|
|
207
247
|
export async function prepareConnect(deps, mcpServer, input, identity) {
|
|
208
248
|
const mcpServerId = mcpServer.metadata?.id ?? "";
|
|
@@ -215,10 +255,17 @@ export async function prepareConnect(deps, mcpServer, input, identity) {
|
|
|
215
255
|
await refreshOAuthTokenIfNeeded(deps, mcpServer, callerOrg);
|
|
216
256
|
}
|
|
217
257
|
const executionId = newConnectExecutionId(mcpServerId);
|
|
218
|
-
const
|
|
258
|
+
const ecRow = await createConnectExecutionContext(deps, mcpServer, executionId, callerOrg, input.runtimeEnv, identity, deps.sandboxLane.enabled);
|
|
259
|
+
const ecResourceId = ecRow?.resourceId ?? "";
|
|
219
260
|
const workflowInput = {
|
|
220
261
|
mcp_server_id: mcpServerId,
|
|
221
|
-
|
|
262
|
+
};
|
|
263
|
+
if (ecRow === undefined || ecRow.bindingOnly) {
|
|
264
|
+
return { workflowInput, ecResourceId, executionId };
|
|
265
|
+
}
|
|
266
|
+
const withContext = {
|
|
267
|
+
...workflowInput,
|
|
268
|
+
execution_context_id: executionId,
|
|
222
269
|
};
|
|
223
270
|
// Mint the decrypt-lane token for the EC just created (oss#535) — see
|
|
224
271
|
// the engine.ts ConnectWorkflowInput doc for why this rides the
|
|
@@ -226,13 +273,12 @@ export async function prepareConnect(deps, mcpServer, input, identity) {
|
|
|
226
273
|
// with declared credentials will refuse the redacted read with an
|
|
227
274
|
// actionable error, and credential-less servers connect fine without
|
|
228
275
|
// the token.
|
|
229
|
-
if (
|
|
230
|
-
deps.runnerAuth.isEnabled(TOKEN_TYPE_EXECUTION_SCOPED)) {
|
|
276
|
+
if (deps.runnerAuth.isEnabled(TOKEN_TYPE_EXECUTION_SCOPED)) {
|
|
231
277
|
try {
|
|
232
278
|
const minted = deps.runnerAuth.mint(TOKEN_TYPE_EXECUTION_SCOPED, executionId, 0);
|
|
233
279
|
return {
|
|
234
280
|
workflowInput: {
|
|
235
|
-
...
|
|
281
|
+
...withContext,
|
|
236
282
|
execution_context_token: minted.token,
|
|
237
283
|
},
|
|
238
284
|
ecResourceId,
|
|
@@ -246,7 +292,7 @@ export async function prepareConnect(deps, mcpServer, input, identity) {
|
|
|
246
292
|
});
|
|
247
293
|
}
|
|
248
294
|
}
|
|
249
|
-
return { workflowInput, ecResourceId, executionId };
|
|
295
|
+
return { workflowInput: withContext, ecResourceId, executionId };
|
|
250
296
|
}
|
|
251
297
|
/**
|
|
252
298
|
* Builds and persists an ephemeral ExecutionContext for the connect
|
|
@@ -255,15 +301,18 @@ export async function prepareConnect(deps, mcpServer, input, identity) {
|
|
|
255
301
|
* When runtime_env is provided, the values are used directly (one-time
|
|
256
302
|
* use). When runtime_env is empty, variables are resolved from two
|
|
257
303
|
* sources: OAuth-managed variables from the grant's managed environment,
|
|
258
|
-
* the remainder from the user's personal environment.
|
|
259
|
-
*
|
|
304
|
+
* the remainder from the user's personal environment. When nothing
|
|
305
|
+
* resolves (no env declarations and no runtime_env, or no values) it
|
|
306
|
+
* creates no row and returns undefined, unless `bindingRowRequired`: the
|
|
307
|
+
* sandbox lane's connect needs the row as its credential's binding, so it
|
|
308
|
+
* is created with empty `data` and reported binding-only.
|
|
260
309
|
*
|
|
261
310
|
* The row is created as `caller`, the person connecting (see the
|
|
262
311
|
* ConnectExecutionContextClient doc): its creator stamp is the connect
|
|
263
312
|
* token's person under the built-in posture.
|
|
264
313
|
*/
|
|
265
|
-
async function createConnectExecutionContext(deps, mcpServer, executionId, callerOrg, runtimeEnv, caller) {
|
|
266
|
-
let ecData;
|
|
314
|
+
async function createConnectExecutionContext(deps, mcpServer, executionId, callerOrg, runtimeEnv, caller, bindingRowRequired) {
|
|
315
|
+
let ecData = {};
|
|
267
316
|
if (Object.keys(runtimeEnv).length > 0) {
|
|
268
317
|
ecData = runtimeEnv;
|
|
269
318
|
deps.logger.info("Using runtime_env for connect ExecutionContext (one-time use)", {
|
|
@@ -273,26 +322,17 @@ async function createConnectExecutionContext(deps, mcpServer, executionId, calle
|
|
|
273
322
|
}
|
|
274
323
|
else {
|
|
275
324
|
const envDecls = mcpServer.spec?.env ?? {};
|
|
276
|
-
if (Object.keys(envDecls).length
|
|
277
|
-
|
|
278
|
-
return "";
|
|
325
|
+
if (Object.keys(envDecls).length > 0) {
|
|
326
|
+
ecData = await resolveConnectEnvironment(deps, mcpServer, executionId, callerOrg, envDecls);
|
|
279
327
|
}
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
let personalVars = {};
|
|
284
|
-
if (Object.keys(remainingDecls).length > 0) {
|
|
285
|
-
personalVars = await resolveFromPersonalEnvironment(deps, callerOrg, remainingDecls);
|
|
328
|
+
else if (!bindingRowRequired) {
|
|
329
|
+
deps.logger.debug("MCP server has no env declarations — skipping ExecutionContext creation", { execution_id: executionId });
|
|
330
|
+
return undefined;
|
|
286
331
|
}
|
|
287
|
-
ecData = { ...personalVars, ...oauthVars };
|
|
288
|
-
deps.logger.info("Resolved env vars for connect ExecutionContext", {
|
|
289
|
-
execution_id: executionId,
|
|
290
|
-
oauth_count: Object.keys(oauthVars).length,
|
|
291
|
-
personal_count: Object.keys(personalVars).length,
|
|
292
|
-
});
|
|
293
332
|
}
|
|
294
|
-
|
|
295
|
-
|
|
333
|
+
const bindingOnly = Object.keys(ecData).length === 0;
|
|
334
|
+
if (bindingOnly && !bindingRowRequired) {
|
|
335
|
+
return undefined;
|
|
296
336
|
}
|
|
297
337
|
let created;
|
|
298
338
|
try {
|
|
@@ -318,7 +358,28 @@ async function createConnectExecutionContext(deps, mcpServer, executionId, calle
|
|
|
318
358
|
execution_id: executionId,
|
|
319
359
|
data_entries: Object.keys(ecData).length,
|
|
320
360
|
});
|
|
321
|
-
return resourceId;
|
|
361
|
+
return { resourceId, bindingOnly };
|
|
362
|
+
}
|
|
363
|
+
/**
|
|
364
|
+
* Resolves a server's declared env for its connect: OAuth-managed
|
|
365
|
+
* variables from the grant's managed environment, the remainder from the
|
|
366
|
+
* caller's personal environment (Go createConnectExecutionContext's
|
|
367
|
+
* resolution half).
|
|
368
|
+
*/
|
|
369
|
+
async function resolveConnectEnvironment(deps, mcpServer, executionId, callerOrg, envDecls) {
|
|
370
|
+
const mcpServerId = mcpServer.metadata?.id ?? "";
|
|
371
|
+
// Split resolution: OAuth vars from managed env, rest from personal.
|
|
372
|
+
const { oauthVars, remainingDecls } = await resolveOAuthVarsFromManagedEnv(deps, mcpServerId, callerOrg, envDecls);
|
|
373
|
+
let personalVars = {};
|
|
374
|
+
if (Object.keys(remainingDecls).length > 0) {
|
|
375
|
+
personalVars = await resolveFromPersonalEnvironment(deps, callerOrg, remainingDecls);
|
|
376
|
+
}
|
|
377
|
+
deps.logger.info("Resolved env vars for connect ExecutionContext", {
|
|
378
|
+
execution_id: executionId,
|
|
379
|
+
oauth_count: Object.keys(oauthVars).length,
|
|
380
|
+
personal_count: Object.keys(personalVars).length,
|
|
381
|
+
});
|
|
382
|
+
return { ...personalVars, ...oauthVars };
|
|
322
383
|
}
|
|
323
384
|
/**
|
|
324
385
|
* Reads OAuth-managed variables from the grant's managed environment and
|
|
@@ -675,12 +736,19 @@ export function tokenAuthMethodFromSpec(method) {
|
|
|
675
736
|
*
|
|
676
737
|
* A disconnected engine returns SILENTLY — byte parity with Go's
|
|
677
738
|
* nil-temporalClient no-op (connect.go:1048). Servers that declare env
|
|
678
|
-
* vars are skipped:
|
|
679
|
-
*
|
|
680
|
-
*
|
|
681
|
-
*
|
|
739
|
+
* vars are skipped: resolving their credentials needs the connecting
|
|
740
|
+
* person's own environments, which an apply does not stand for. If the
|
|
741
|
+
* server is deleted before the workflow completes, persistence is skipped
|
|
742
|
+
* — expected for best-effort.
|
|
743
|
+
*
|
|
744
|
+
* `applier` is the caller whose apply fired this connect. Without a
|
|
745
|
+
* sandbox lane it is unused: the shared runner's own credential reads the
|
|
746
|
+
* server, exactly as before. With one, the connect runs in a connect
|
|
747
|
+
* sandbox acting as the applier (connect-sandbox.ts), so the lane first
|
|
748
|
+
* creates the binding-only ExecutionContext row as the applier
|
|
749
|
+
* (prepareConnect) and deletes it when the run settles.
|
|
682
750
|
*/
|
|
683
|
-
export async function startBestEffortConnect(deps, mcpServer) {
|
|
751
|
+
export async function startBestEffortConnect(deps, mcpServer, applier) {
|
|
684
752
|
const engineState = deps.engineState();
|
|
685
753
|
if (!engineState.connected) {
|
|
686
754
|
return;
|
|
@@ -693,10 +761,46 @@ export async function startBestEffortConnect(deps, mcpServer) {
|
|
|
693
761
|
});
|
|
694
762
|
return;
|
|
695
763
|
}
|
|
764
|
+
const mcpServerId = mcpServer.metadata?.id ?? "";
|
|
765
|
+
const org = mcpServer.metadata?.org ?? "";
|
|
766
|
+
let prepared;
|
|
767
|
+
let route;
|
|
768
|
+
try {
|
|
769
|
+
if (deps.sandboxLane.enabled) {
|
|
770
|
+
prepared = await prepareConnect(deps, mcpServer, create(ConnectInputSchema, { mcpServerId, org }), applier);
|
|
771
|
+
route = await acquireConnectRouteFor(deps, mcpServerId, {
|
|
772
|
+
connectExecutionId: prepared.executionId,
|
|
773
|
+
org,
|
|
774
|
+
caller: applier,
|
|
775
|
+
});
|
|
776
|
+
}
|
|
777
|
+
await runBestEffortConnect(deps, engineState.engine, mcpServer, prepared?.workflowInput ?? { mcp_server_id: mcpServerId }, route);
|
|
778
|
+
}
|
|
779
|
+
catch (error) {
|
|
780
|
+
deps.logger.warn("Best-effort connect could not start (non-fatal)", {
|
|
781
|
+
mcp_server_id: mcpServerId,
|
|
782
|
+
error: error instanceof Error ? error.message : String(error),
|
|
783
|
+
});
|
|
784
|
+
}
|
|
785
|
+
finally {
|
|
786
|
+
await route?.release();
|
|
787
|
+
if (prepared !== undefined && prepared.ecResourceId !== "") {
|
|
788
|
+
await deleteConnectExecutionContext(deps, prepared.ecResourceId, prepared.executionId);
|
|
789
|
+
}
|
|
790
|
+
}
|
|
791
|
+
}
|
|
792
|
+
/**
|
|
793
|
+
* The run half of the best-effort connect: start or attach, record
|
|
794
|
+
* CONNECTING, await, and persist the outcome. Every arm is non-fatal and
|
|
795
|
+
* returns. The caller owns the route (undefined: the shared runner queue)
|
|
796
|
+
* and the ExecutionContext; an attach gives the route's sandbox back at
|
|
797
|
+
* once, since the other lane's run is served by its own.
|
|
798
|
+
*/
|
|
799
|
+
async function runBestEffortConnect(deps, engine, mcpServer, workflowInput, route) {
|
|
696
800
|
const mcpServerId = mcpServer.metadata?.id ?? "";
|
|
697
801
|
let run;
|
|
698
802
|
try {
|
|
699
|
-
run = await
|
|
803
|
+
run = await engine.startOrAttachConnect(mcpServerId, workflowInput, CONNECT_TIMEOUT.ms, route?.taskQueue ?? { kind: "runner" });
|
|
700
804
|
}
|
|
701
805
|
catch (error) {
|
|
702
806
|
deps.logger.warn("Failed to start best-effort connect workflow (non-fatal)", {
|
|
@@ -709,7 +813,10 @@ export async function startBestEffortConnect(deps, mcpServer) {
|
|
|
709
813
|
// applied server sees the auto-connect in progress rather than
|
|
710
814
|
// nothing. Skipped when attached (the starting lane's record stands);
|
|
711
815
|
// failures stay non-fatal like everything else on this path.
|
|
712
|
-
if (
|
|
816
|
+
if (run.attached) {
|
|
817
|
+
await route?.release();
|
|
818
|
+
}
|
|
819
|
+
else {
|
|
713
820
|
try {
|
|
714
821
|
await persistConnectStarting(deps.store, mcpServerId, run.workflowId, "");
|
|
715
822
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -197,7 +197,9 @@ async function update(deps, server, ctx) {
|
|
|
197
197
|
* `go StartBestEffortConnect(result)` (apply.go:76), auto discovery
|
|
198
198
|
* through the runner's connect workflow. Fire-and-forget on purpose: the
|
|
199
199
|
* gRPC response must not wait on a discovery run; a disconnected engine
|
|
200
|
-
* makes it a silent no-op (byte parity with Go's nil-client return).
|
|
200
|
+
* makes it a silent no-op (byte parity with Go's nil-client return). The
|
|
201
|
+
* applier rides along: with a sandbox lane composed the discovery's
|
|
202
|
+
* sandbox acts as the person who applied (connect-sandbox.ts).
|
|
201
203
|
*/
|
|
202
204
|
async function apply(deps, server, ctx) {
|
|
203
205
|
const reqCtx = new RequestContext(McpServerSchema, server, callerIdentityOf(ctx), kindOf(ctx));
|
|
@@ -217,7 +219,7 @@ async function apply(deps, server, ctx) {
|
|
|
217
219
|
: await update(deps, withResolvedApplyId(McpServerSchema, server, reqCtx), ctx);
|
|
218
220
|
// startBestEffortConnect's arms never throw by design; the catch is
|
|
219
221
|
// the process-safety net an unhandled rejection would pierce.
|
|
220
|
-
void startBestEffortConnect(deps.connect, result).catch((error) => {
|
|
222
|
+
void startBestEffortConnect(deps.connect, result, callerIdentityOf(ctx)).catch((error) => {
|
|
221
223
|
deps.logger.warn("Best-effort connect task failed unexpectedly", {
|
|
222
224
|
mcp_server_id: result.metadata?.id ?? "",
|
|
223
225
|
error: error instanceof Error ? error.message : String(error),
|